From 0f841d262359f3e9d6e215ed9a6b0ab7984c965a Mon Sep 17 00:00:00 2001
From: Quentin Devos <4972091+Okhoshi@users.noreply.github.com>
Date: Tue, 30 Jul 2024 08:49:28 +0200
Subject: [PATCH 01/49] [TwigBundle] Use `kernel.build_dir` to store the
 templates known at build time

Signed-off-by: Quentin Devos <4972091+Okhoshi@users.noreply.github.com>
---
 src/Symfony/Bundle/TwigBundle/CHANGELOG.md    |  2 +
 .../CacheWarmer/TemplateCacheWarmer.php       | 44 ++++++++---
 .../DependencyInjection/Configuration.php     |  2 +-
 .../DependencyInjection/TwigExtension.php     | 30 +++++++-
 .../TwigBundle/Resources/config/twig.php      | 20 ++++-
 .../DependencyInjection/Fixtures/php/full.php |  3 +-
 .../Fixtures/php/no-cache.php                 |  5 ++
 .../Fixtures/php/path-cache.php               |  5 ++
 .../Fixtures/php/prod-cache.php               |  6 ++
 .../Fixtures/xml/extra.xml                    |  2 +-
 .../DependencyInjection/Fixtures/xml/full.xml |  2 +-
 .../Fixtures/xml/no-cache.xml                 | 10 +++
 .../Fixtures/xml/path-cache.xml               | 10 +++
 .../Fixtures/xml/prod-cache.xml               | 10 +++
 .../DependencyInjection/Fixtures/yml/full.yml |  3 +-
 .../Fixtures/yml/no-cache.yml                 |  2 +
 .../Fixtures/yml/path-cache.yml               |  2 +
 .../Fixtures/yml/prod-cache.yml               |  3 +
 .../DependencyInjection/TwigExtensionTest.php | 77 +++++++++++++++++--
 19 files changed, 210 insertions(+), 28 deletions(-)
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/no-cache.php
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/path-cache.php
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/prod-cache.php
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/no-cache.xml
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/path-cache.xml
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/prod-cache.xml
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/no-cache.yml
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/path-cache.yml
 create mode 100644 src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/prod-cache.yml

diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
index 32a1c9aef64e5..40d5be350afe7 100644
--- a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
@@ -7,6 +7,8 @@ CHANGELOG
  * Enable `#[AsTwigFilter]`, `#[AsTwigFunction]` and `#[AsTwigTest]` attributes
    to configure extensions on runtime classes
  * Add support for a `twig` validator
+ * Use `ChainCache` to store warmed-up cache in `kernel.build_dir` and runtime cache in `kernel.cache_dir`
+ * Make `TemplateCacheWarmer` use `kernel.build_dir` instead of `kernel.cache_dir`
 
 7.1
 ---
diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
index 868dc076cfd9e..3bb89760f3a6f 100644
--- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
+++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
@@ -14,6 +14,8 @@
 use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
+use Twig\Cache\CacheInterface;
+use Twig\Cache\NullCache;
 use Twig\Environment;
 use Twig\Error\Error;
 
@@ -34,6 +36,7 @@ class TemplateCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInte
     public function __construct(
         private ContainerInterface $container,
         private iterable $iterator,
+        private ?CacheInterface $cache = null,
     ) {
     }
 
@@ -41,19 +44,40 @@ public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         $this->twig ??= $this->container->get('twig');
 
-        foreach ($this->iterator as $template) {
-            try {
-                $this->twig->load($template);
-            } catch (Error) {
+        $originalCache = $this->twig->getCache();
+        if ($originalCache instanceof NullCache) {
+            // There's no point to warm up a cache that won't be used afterward
+            return [];
+        }
+
+        if (null !== $this->cache) {
+            if (!$buildDir) {
                 /*
-                 * Problem during compilation, give up for this template (e.g. syntax errors).
-                 * Failing silently here allows to ignore templates that rely on functions that aren't available in
-                 * the current environment. For example, the WebProfilerBundle shouldn't be available in the prod
-                 * environment, but some templates that are never used in prod might rely on functions the bundle provides.
-                 * As we can't detect which templates are "really" important, we try to load all of them and ignore
-                 * errors. Error checks may be performed by calling the lint:twig command.
+                 * The cache has already been warmup during the build of the container, when $buildDir was set.
                  */
+                return [];
+            }
+            // Swap the cache for the warmup as the Twig Environment has the ChainCache injected
+            $this->twig->setCache($this->cache);
+        }
+
+        try {
+            foreach ($this->iterator as $template) {
+                try {
+                    $this->twig->load($template);
+                } catch (Error) {
+                    /*
+                     * Problem during compilation, give up for this template (e.g. syntax errors).
+                     * Failing silently here allows to ignore templates that rely on functions that aren't available in
+                     * the current environment. For example, the WebProfilerBundle shouldn't be available in the prod
+                     * environment, but some templates that are never used in prod might rely on functions the bundle provides.
+                     * As we can't detect which templates are "really" important, we try to load all of them and ignore
+                     * errors. Error checks may be performed by calling the lint:twig command.
+                     */
+                }
             }
+        } finally {
+            $this->twig->setCache($originalCache);
         }
 
         return [];
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
index 32a4bb318fea4..5b363cc5e020c 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -134,7 +134,7 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode): void
                     ->example('Twig\Template')
                     ->cannotBeEmpty()
                 ->end()
-                ->scalarNode('cache')->defaultValue('%kernel.cache_dir%/twig')->end()
+                ->scalarNode('cache')->defaultTrue()->end()
                 ->scalarNode('charset')->defaultValue('%kernel.charset%')->end()
                 ->booleanNode('debug')->defaultValue('%kernel.debug%')->end()
                 ->booleanNode('strict_variables')->defaultValue('%kernel.debug%')->end()
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index db508873387b2..418172956391b 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -30,6 +30,7 @@
 use Twig\Attribute\AsTwigFilter;
 use Twig\Attribute\AsTwigFunction;
 use Twig\Attribute\AsTwigTest;
+use Twig\Cache\FilesystemCache;
 use Twig\Environment;
 use Twig\Extension\ExtensionInterface;
 use Twig\Extension\RuntimeExtensionInterface;
@@ -167,6 +168,31 @@ public function load(array $configs, ContainerBuilder $container): void
             }
         }
 
+        if (true === $config['cache']) {
+            $autoReloadOrDefault = $container->getParameterBag()->resolveValue($config['auto_reload'] ?? $config['debug']);
+            $buildDir = $container->getParameter('kernel.build_dir');
+            $cacheDir = $container->getParameter('kernel.cache_dir');
+
+            if ($autoReloadOrDefault || $cacheDir === $buildDir) {
+                $config['cache'] = '%kernel.cache_dir%/twig';
+            }
+        }
+
+        if (true === $config['cache']) {
+            $config['cache'] = new Reference('twig.template_cache.chain');
+        } else {
+            $container->removeDefinition('twig.template_cache.chain');
+            $container->removeDefinition('twig.template_cache.runtime_cache');
+            $container->removeDefinition('twig.template_cache.readonly_cache');
+            $container->removeDefinition('twig.template_cache.warmup_cache');
+
+            if (false === $config['cache']) {
+                $container->removeDefinition('twig.template_cache_warmer');
+            } else {
+                $container->getDefinition('twig.template_cache_warmer')->replaceArgument(2, null);
+            }
+        }
+
         if (isset($config['autoescape_service'])) {
             $config['autoescape'] = [new Reference($config['autoescape_service']), $config['autoescape_service_method'] ?? '__invoke'];
         } else {
@@ -191,10 +217,6 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->registerAttributeForAutoconfiguration(AsTwigFilter::class, AttributeExtensionPass::autoconfigureFromAttribute(...));
         $container->registerAttributeForAutoconfiguration(AsTwigFunction::class, AttributeExtensionPass::autoconfigureFromAttribute(...));
         $container->registerAttributeForAutoconfiguration(AsTwigTest::class, AttributeExtensionPass::autoconfigureFromAttribute(...));
-
-        if (false === $config['cache']) {
-            $container->removeDefinition('twig.template_cache_warmer');
-        }
     }
 
     private function getBundleTemplatePaths(ContainerBuilder $container, array $config): array
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
index 02631d28c39a4..812ac1f666978 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
@@ -36,7 +36,9 @@
 use Symfony\Bundle\TwigBundle\CacheWarmer\TemplateCacheWarmer;
 use Symfony\Bundle\TwigBundle\DependencyInjection\Configurator\EnvironmentConfigurator;
 use Symfony\Bundle\TwigBundle\TemplateIterator;
+use Twig\Cache\ChainCache;
 use Twig\Cache\FilesystemCache;
+use Twig\Cache\ReadOnlyFilesystemCache;
 use Twig\Environment;
 use Twig\Extension\CoreExtension;
 use Twig\Extension\DebugExtension;
@@ -79,8 +81,24 @@
         ->set('twig.template_iterator', TemplateIterator::class)
             ->args([service('kernel'), abstract_arg('Twig paths'), param('twig.default_path'), abstract_arg('File name pattern')])
 
+        ->set('twig.template_cache.runtime_cache', FilesystemCache::class)
+            ->args([param('kernel.cache_dir').'/twig'])
+
+        ->set('twig.template_cache.readonly_cache', ReadOnlyFilesystemCache::class)
+            ->args([param('kernel.build_dir').'/twig'])
+
+        ->set('twig.template_cache.warmup_cache', FilesystemCache::class)
+            ->args([param('kernel.build_dir').'/twig'])
+
+        ->set('twig.template_cache.chain', ChainCache::class)
+            ->args([[service('twig.template_cache.readonly_cache'), service('twig.template_cache.runtime_cache')]])
+
         ->set('twig.template_cache_warmer', TemplateCacheWarmer::class)
-            ->args([service(ContainerInterface::class), service('twig.template_iterator')])
+            ->args([
+                service(ContainerInterface::class),
+                service('twig.template_iterator'),
+                service('twig.template_cache.warmup_cache'),
+            ])
             ->tag('kernel.cache_warmer')
             ->tag('container.service_subscriber', ['id' => 'twig'])
 
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
index f87af5a1baba4..68c7f5a304218 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
@@ -10,8 +10,7 @@
         'pi' => 3.14,
         'bad' => ['key' => 'foo'],
     ],
-    'auto_reload' => true,
-    'cache' => '/tmp',
+    'auto_reload' => false,
     'charset' => 'ISO-8859-1',
     'debug' => true,
     'strict_variables' => true,
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/no-cache.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/no-cache.php
new file mode 100644
index 0000000000000..df1ae5c6bd63b
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/no-cache.php
@@ -0,0 +1,5 @@
+<?php
+
+$container->loadFromExtension('twig', [
+    'cache' => false,
+]);
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/path-cache.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/path-cache.php
new file mode 100644
index 0000000000000..f0701a57d8c88
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/path-cache.php
@@ -0,0 +1,5 @@
+<?php
+
+$container->loadFromExtension('twig', [
+    'cache' => 'random-path',
+]);
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/prod-cache.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/prod-cache.php
new file mode 100644
index 0000000000000..628854601a960
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/prod-cache.php
@@ -0,0 +1,6 @@
+<?php
+
+$container->loadFromExtension('twig', [
+    'cache' => true,
+    'auto_reload' => false,
+]);
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/extra.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/extra.xml
index f1cf8985329d0..df02c9dc05f91 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/extra.xml
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/extra.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/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
-    <twig:config auto-reload="true" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true">
+    <twig:config auto-reload="true" charset="ISO-8859-1" debug="true" strict-variables="true">
         <twig:path namespace="namespace3">namespaced_path3</twig:path>
     </twig:config>
 </container>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
index 528a466b0452c..3349e0d5fa744 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/full.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/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
 
-    <twig:config auto-reload="true" cache="/tmp" charset="ISO-8859-1" debug="true" strict-variables="true" default-path="%kernel.project_dir%/Fixtures/templates">
+    <twig:config auto-reload="false" charset="ISO-8859-1" debug="true" strict-variables="true" default-path="%kernel.project_dir%/Fixtures/templates">
         <twig:form-theme>MyBundle::form.html.twig</twig:form-theme>
         <twig:global key="foo" id="bar" type="service" />
         <twig:global key="baz">@@qux</twig:global>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/no-cache.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/no-cache.xml
new file mode 100644
index 0000000000000..f6fa72c747893
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/no-cache.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:twig="http://symfony.com/schema/dic/twig"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+    <twig:config cache="false" />
+</container>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/path-cache.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/path-cache.xml
new file mode 100644
index 0000000000000..9caf2fc0452b0
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/path-cache.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:twig="http://symfony.com/schema/dic/twig"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+    <twig:config cache="random-path" />
+</container>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/prod-cache.xml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/prod-cache.xml
new file mode 100644
index 0000000000000..6ee9f38506252
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/prod-cache.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:twig="http://symfony.com/schema/dic/twig"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/twig https://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+    <twig:config cache="true" auto-reload="false" />
+</container>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
index 6c249d378ff22..ab19cbf0bff8f 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -6,8 +6,7 @@ twig:
         baz: "@@qux"
         pi:  3.14
         bad: {key: foo}
-    auto_reload:         true
-    cache:               /tmp
+    auto_reload:         false
     charset:             ISO-8859-1
     debug:               true
     strict_variables:    true
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/no-cache.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/no-cache.yml
new file mode 100644
index 0000000000000..c1e9f184bd336
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/no-cache.yml
@@ -0,0 +1,2 @@
+twig:
+  cache: false
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/path-cache.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/path-cache.yml
new file mode 100644
index 0000000000000..04e9d1dc61b06
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/path-cache.yml
@@ -0,0 +1,2 @@
+twig:
+  cache: random-path
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/prod-cache.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/prod-cache.yml
new file mode 100644
index 0000000000000..82a1dd9e100d3
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/prod-cache.yml
@@ -0,0 +1,3 @@
+twig:
+  cache: true
+  auto_reload: false
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
index ffe772a28861d..9189f6244f7e3 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -57,11 +57,11 @@ public function testLoadEmptyConfiguration()
     }
 
     /**
-     * @dataProvider getFormats
+     * @dataProvider getFormatsAndBuildDir
      */
-    public function testLoadFullConfiguration(string $format)
+    public function testLoadFullConfiguration(string $format, ?string $buildDir)
     {
-        $container = $this->createContainer();
+        $container = $this->createContainer($buildDir);
         $container->registerExtension(new TwigExtension());
         $this->loadFromFile($container, 'full', $format);
         $this->compileContainer($container);
@@ -92,13 +92,64 @@ public function testLoadFullConfiguration(string $format)
 
         // Twig options
         $options = $container->getDefinition('twig')->getArgument(1);
-        $this->assertTrue($options['auto_reload'], '->load() sets the auto_reload option');
+        $this->assertFalse($options['auto_reload'], '->load() sets the auto_reload option');
         $this->assertSame('name', $options['autoescape'], '->load() sets the autoescape option');
         $this->assertArrayNotHasKey('base_template_class', $options, '->load() does not set the base_template_class if none is provided');
-        $this->assertEquals('/tmp', $options['cache'], '->load() sets the cache option');
         $this->assertEquals('ISO-8859-1', $options['charset'], '->load() sets the charset option');
         $this->assertTrue($options['debug'], '->load() sets the debug option');
         $this->assertTrue($options['strict_variables'], '->load() sets the strict_variables option');
+        $this->assertEquals($buildDir !== null ? new Reference('twig.template_cache.chain') : '%kernel.cache_dir%/twig', $options['cache'], '->load() sets the cache option');
+    }
+
+    /**
+     * @dataProvider getFormatsAndBuildDir
+     */
+    public function testLoadNoCacheConfiguration(string $format, ?string $buildDir)
+    {
+        $container = $this->createContainer($buildDir);
+        $container->registerExtension(new TwigExtension());
+        $this->loadFromFile($container, 'no-cache', $format);
+        $this->compileContainer($container);
+
+        $this->assertEquals(Environment::class, $container->getDefinition('twig')->getClass(), '->load() loads the twig.xml file');
+
+        // Twig options
+        $options = $container->getDefinition('twig')->getArgument(1);
+        $this->assertFalse($options['cache'], '->load() sets cache option to false');
+    }
+
+    /**
+     * @dataProvider getFormatsAndBuildDir
+     */
+    public function testLoadPathCacheConfiguration(string $format, ?string $buildDir)
+    {
+        $container = $this->createContainer($buildDir);
+        $container->registerExtension(new TwigExtension());
+        $this->loadFromFile($container, 'path-cache', $format);
+        $this->compileContainer($container);
+
+        $this->assertEquals(Environment::class, $container->getDefinition('twig')->getClass(), '->load() loads the twig.xml file');
+
+        // Twig options
+        $options = $container->getDefinition('twig')->getArgument(1);
+        $this->assertSame('random-path', $options['cache'], '->load() sets cache option to string path');
+    }
+
+    /**
+     * @dataProvider getFormatsAndBuildDir
+     */
+    public function testLoadProdCacheConfiguration(string $format, ?string $buildDir)
+    {
+        $container = $this->createContainer($buildDir);
+        $container->registerExtension(new TwigExtension());
+        $this->loadFromFile($container, 'prod-cache', $format);
+        $this->compileContainer($container);
+
+        $this->assertEquals(Environment::class, $container->getDefinition('twig')->getClass(), '->load() loads the twig.xml file');
+
+        // Twig options
+        $options = $container->getDefinition('twig')->getArgument(1);
+        $this->assertEquals($buildDir !== null ? new Reference('twig.template_cache.chain') : '%kernel.cache_dir%/twig', $options['cache'], '->load() sets cache option to CacheChain reference');
     }
 
     /**
@@ -238,6 +289,19 @@ public static function getFormats(): array
         ];
     }
 
+    public static function getFormatsAndBuildDir(): array
+    {
+        return [
+            ['php', null],
+            ['php', __DIR__.'/build'],
+            ['yml', null],
+            ['yml', __DIR__.'/build'],
+            ['xml', null],
+            ['xml', __DIR__.'/build'],
+        ];
+    }
+
+
     /**
      * @dataProvider stopwatchExtensionAvailabilityProvider
      */
@@ -312,10 +376,11 @@ public function testCustomHtmlToTextConverterService(string $format)
         $this->assertEquals(new Reference('my_converter'), $bodyRenderer->getArgument('$converter'));
     }
 
-    private function createContainer(): ContainerBuilder
+    private function createContainer(?string $buildDir = null): ContainerBuilder
     {
         $container = new ContainerBuilder(new ParameterBag([
             'kernel.cache_dir' => __DIR__,
+            'kernel.build_dir' => $buildDir ?? __DIR__,
             'kernel.project_dir' => __DIR__,
             'kernel.charset' => 'UTF-8',
             'kernel.debug' => false,

From 4efe401008b365e27967b547b190c4aba33c2baa Mon Sep 17 00:00:00 2001
From: wkania <wojciech.kania+github@gmail.com>
Date: Sun, 27 Apr 2025 01:21:45 +0200
Subject: [PATCH 02/49] [DoctrineBridge] Undefined variable

---
 .../Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
index 93e9818f4383c..6619f911ae1e0 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
@@ -41,7 +41,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform): ?str
             throw new ConversionException(sprintf('Expected "%s", got "%s"', 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\Foo', get_debug_type($value)));
         }
 
-        return $foo->bar;
+        return $value->bar;
     }
 
     public function convertToPHPValue($value, AbstractPlatform $platform): ?Foo

From d49a058bd4d7a2aa29764309dd36cd2b0756fcfa Mon Sep 17 00:00:00 2001
From: wkania <wojciech.kania+github@gmail.com>
Date: Sun, 27 Apr 2025 16:24:15 +0200
Subject: [PATCH 03/49] Fix overwriting an array element

---
 src/Symfony/Component/Form/Extension/Core/Type/WeekType.php | 1 -
 src/Symfony/Component/HttpFoundation/Tests/RequestTest.php  | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
index 8027a41a99cd8..778cc2aeb0b7b 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/WeekType.php
@@ -42,7 +42,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         } else {
             $yearOptions = $weekOptions = [
                 'error_bubbling' => true,
-                'empty_data' => '',
             ];
             // when the form is compound the entries of the array are ignored in favor of children data
             // so we need to handle the cascade setting here
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index 7a4807ecf721e..f1aa0ebeab928 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -604,7 +604,6 @@ public function testGetUri()
 
         $server['REDIRECT_QUERY_STRING'] = 'query=string';
         $server['REDIRECT_URL'] = '/path/info';
-        $server['SCRIPT_NAME'] = '/index.php';
         $server['QUERY_STRING'] = 'query=string';
         $server['REQUEST_URI'] = '/path/info?toto=test&1=1';
         $server['SCRIPT_NAME'] = '/index.php';
@@ -731,7 +730,6 @@ public function testGetUriForPath()
 
         $server['REDIRECT_QUERY_STRING'] = 'query=string';
         $server['REDIRECT_URL'] = '/path/info';
-        $server['SCRIPT_NAME'] = '/index.php';
         $server['QUERY_STRING'] = 'query=string';
         $server['REQUEST_URI'] = '/path/info?toto=test&1=1';
         $server['SCRIPT_NAME'] = '/index.php';

From 2654acb6f4c54fc846df04718c333edb60a152a6 Mon Sep 17 00:00:00 2001
From: wkania <wojciech.kania+github@gmail.com>
Date: Sun, 27 Apr 2025 18:08:38 +0200
Subject: [PATCH 04/49] Fix return type is non-nullable

---
 src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php     | 2 +-
 src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php b/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php
index 44725a69c71a5..2704ee5303ad2 100644
--- a/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php
+++ b/src/Symfony/Component/Form/Tests/Fixtures/TestExtension.php
@@ -34,7 +34,7 @@ public function addType(FormTypeInterface $type)
 
     public function getType($name): FormTypeInterface
     {
-        return $this->types[$name] ?? null;
+        return $this->types[$name];
     }
 
     public function hasType($name): bool
diff --git a/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php
index f3536f1fc56d8..18d8c919a2d73 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/ObjectLoaderTest.php
@@ -104,7 +104,7 @@ public function supports(mixed $resource, ?string $type = null): bool
 
     protected function getObject(string $id): object
     {
-        return $this->loaderMap[$id] ?? null;
+        return $this->loaderMap[$id];
     }
 }
 

From fbc4c3420223111ec15a61be4a0f604a1afd3de2 Mon Sep 17 00:00:00 2001
From: wkania <wojciech.kania+github@gmail.com>
Date: Sun, 27 Apr 2025 20:39:23 +0200
Subject: [PATCH 05/49] [VarDumper] Remove unused code

---
 src/Symfony/Component/VarDumper/Cloner/VarCloner.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
index 170c8b40aada3..6a7ec2826cb7f 100644
--- a/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/VarCloner.php
@@ -28,14 +28,12 @@ protected function doClone(mixed $var): array
         $objRefs = [];                  // Map of original object handles to their stub object counterpart
         $objects = [];                  // Keep a ref to objects to ensure their handle cannot be reused while cloning
         $resRefs = [];                  // Map of original resource handles to their stub object counterpart
-        $values = [];                   // Map of stub objects' ids to original values
         $maxItems = $this->maxItems;
         $maxString = $this->maxString;
         $minDepth = $this->minDepth;
         $currentDepth = 0;              // Current tree depth
         $currentDepthFinalIndex = 0;    // Final $queue index for current tree depth
         $minimumDepthReached = 0 === $minDepth; // Becomes true when minimum tree depth has been reached
-        $cookie = (object) [];          // Unique object used to detect hard references
         $a = null;                      // Array cast for nested structures
         $stub = null;                   // Stub capturing the main properties of an original item value
                                         // or null if the original value is used directly
@@ -53,7 +51,7 @@ protected function doClone(mixed $var): array
                 }
             }
 
-            $refs = $vals = $queue[$i];
+            $vals = $queue[$i];
             foreach ($vals as $k => $v) {
                 // $v is the original value or a stub object in case of hard references
 
@@ -215,10 +213,6 @@ protected function doClone(mixed $var): array
             $queue[$i] = $vals;
         }
 
-        foreach ($values as $h => $v) {
-            $hardRefs[$h] = $v;
-        }
-
         return $queue;
     }
 }

From 64211e67d96dee2a0863ff4c4479b57f4d7260d0 Mon Sep 17 00:00:00 2001
From: W0rma <beck.worma@gmail.com>
Date: Mon, 28 Apr 2025 15:10:27 +0200
Subject: [PATCH 06/49] fix asking for the retry option although --force was
 used

---
 .../Messenger/Command/FailedMessagesRetryCommand.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
index 47bcd1463a915..15dbe84a37da3 100644
--- a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
+++ b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
@@ -224,8 +224,8 @@ private function runWorker(string $failureTransportName, ReceiverInterface $rece
 
             $this->forceExit = true;
             try {
-                $choice = $io->choice('Please select an action', ['retry', 'delete', 'skip'], 'retry');
-                $shouldHandle = $shouldForce || 'retry' === $choice;
+                $choice = $shouldForce ? 'retry' : $io->choice('Please select an action', ['retry', 'delete', 'skip'], 'retry');
+                $shouldHandle = 'retry' === $choice;
             } finally {
                 $this->forceExit = false;
             }

From b766607ddbb3173c749f251dba449066fae5534b Mon Sep 17 00:00:00 2001
From: HypeMC <hypemc@gmail.com>
Date: Thu, 1 May 2025 03:07:40 +0200
Subject: [PATCH 07/49] [Messenger] Fix integration with newer version of
 Pheanstalk

---
 .../Tests/Transport/ConnectionTest.php        | 95 ++++++++++++++++++-
 .../Beanstalkd/Transport/Connection.php       | 65 ++++++++-----
 2 files changed, 134 insertions(+), 26 deletions(-)

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 c36270d81498e..9ebea2d115439 100644
--- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/ConnectionTest.php
@@ -16,6 +16,7 @@
 use Pheanstalk\Contract\PheanstalkSubscriberInterface;
 use Pheanstalk\Exception;
 use Pheanstalk\Exception\ClientException;
+use Pheanstalk\Exception\ConnectionException;
 use Pheanstalk\Exception\DeadlineSoonException;
 use Pheanstalk\Exception\ServerException;
 use Pheanstalk\Pheanstalk;
@@ -131,6 +132,7 @@ public function testItThrowsAnExceptionIfAnExtraOptionIsDefinedInDSN()
     public function testGet()
     {
         $id = '1234';
+        $id2 = '1235';
         $beanstalkdEnvelope = [
             'body' => 'foo',
             'headers' => 'bar',
@@ -140,13 +142,52 @@ public function testGet()
         $timeout = 44;
 
         $tubeList = new TubeList($tubeName = new TubeName($tube), $tubeNameDefault = new TubeName('default'));
-        $job = new Job(new JobId($id), json_encode($beanstalkdEnvelope));
 
         $client = $this->createMock(PheanstalkInterface::class);
         $client->expects($this->once())->method('watch')->with($tubeName)->willReturn(2);
         $client->expects($this->once())->method('listTubesWatched')->willReturn($tubeList);
         $client->expects($this->once())->method('ignore')->with($tubeNameDefault)->willReturn(1);
-        $client->expects($this->once())->method('reserveWithTimeout')->with($timeout)->willReturn($job);
+        $client->expects($this->exactly(2))->method('reserveWithTimeout')->with($timeout)->willReturnOnConsecutiveCalls(
+            new Job(new JobId($id), json_encode($beanstalkdEnvelope)),
+            new Job(new JobId($id2), json_encode($beanstalkdEnvelope)),
+        );
+
+        $connection = new Connection(['tube_name' => $tube, 'timeout' => $timeout], $client);
+
+        $envelope = $connection->get();
+
+        $this->assertSame($id, $envelope['id']);
+        $this->assertSame($beanstalkdEnvelope['body'], $envelope['body']);
+        $this->assertSame($beanstalkdEnvelope['headers'], $envelope['headers']);
+
+        $envelope = $connection->get();
+
+        $this->assertSame($id2, $envelope['id']);
+        $this->assertSame($beanstalkdEnvelope['body'], $envelope['body']);
+        $this->assertSame($beanstalkdEnvelope['headers'], $envelope['headers']);
+    }
+
+    public function testGetOnReconnect()
+    {
+        $id = '1234';
+        $beanstalkdEnvelope = [
+            'body' => 'foo',
+            'headers' => 'bar',
+        ];
+
+        $tube = 'baz';
+        $timeout = 44;
+
+        $tubeList = new TubeList($tubeName = new TubeName($tube), $tubeNameDefault = new TubeName('default'));
+
+        $client = $this->createMock(PheanstalkInterface::class);
+        $client->expects($this->exactly(2))->method('watch')->with($tubeName)->willReturn(2);
+        $client->expects($this->exactly(2))->method('listTubesWatched')->willReturn($tubeList);
+        $client->expects($this->exactly(2))->method('ignore')->with($tubeNameDefault)->willReturn(1);
+        $client->expects($this->exactly(2))->method('reserveWithTimeout')->with($timeout)->willReturnOnConsecutiveCalls(
+            $this->throwException(new ConnectionException('123', 'foobar')),
+            new Job(new JobId($id), json_encode($beanstalkdEnvelope)),
+        );
 
         $connection = new Connection(['tube_name' => $tube, 'timeout' => $timeout], $client);
 
@@ -370,10 +411,11 @@ public function testSend()
         $expectedDelay = $delay / 1000;
 
         $id = '110';
+        $id2 = '111';
 
         $client = $this->createMock(PheanstalkInterface::class);
         $client->expects($this->once())->method('useTube')->with(new TubeName($tube));
-        $client->expects($this->once())->method('put')->with(
+        $client->expects($this->exactly(2))->method('put')->with(
             $this->callback(function (string $data) use ($body, $headers): bool {
                 $expectedMessage = json_encode([
                     'body' => $body,
@@ -385,7 +427,51 @@ public function testSend()
             1024,
             $expectedDelay,
             90
-        )->willReturn(new Job(new JobId($id), 'foobar'));
+        )->willReturnOnConsecutiveCalls(
+            new Job(new JobId($id), 'foobar'),
+            new Job(new JobId($id2), 'foobar'),
+        );
+
+        $connection = new Connection(['tube_name' => $tube], $client);
+
+        $returnedId = $connection->send($body, $headers, $delay);
+
+        $this->assertSame($id, $returnedId);
+
+        $returnedId = $connection->send($body, $headers, $delay);
+
+        $this->assertSame($id2, $returnedId);
+    }
+
+    public function testSendOnReconnect()
+    {
+        $tube = 'xyz';
+
+        $body = 'foo';
+        $headers = ['test' => 'bar'];
+        $delay = 1000;
+        $expectedDelay = $delay / 1000;
+
+        $id = '110';
+
+        $client = $this->createMock(PheanstalkInterface::class);
+        $client->expects($this->exactly(2))->method('useTube')->with(new TubeName($tube));
+        $client->expects($this->exactly(2))->method('put')->with(
+            $this->callback(function (string $data) use ($body, $headers): bool {
+                $expectedMessage = json_encode([
+                    'body' => $body,
+                    'headers' => $headers,
+                ]);
+
+                return $expectedMessage === $data;
+            }),
+            1024,
+            $expectedDelay,
+            90
+        )->willReturnOnConsecutiveCalls(
+            $this->throwException(new ConnectionException('123', 'foobar')),
+            new Job(new JobId($id), 'foobar'),
+        );
 
         $connection = new Connection(['tube_name' => $tube], $client);
 
@@ -520,4 +606,5 @@ public function testSendWithRoundedDelay()
 
 interface PheanstalkInterface extends PheanstalkPublisherInterface, PheanstalkSubscriberInterface, PheanstalkManagerInterface
 {
+    public function disconnect(): void;
 }
diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php
index 232d8596336cf..380186445889f 100644
--- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php
@@ -18,7 +18,6 @@
 use Pheanstalk\Exception;
 use Pheanstalk\Exception\ConnectionException;
 use Pheanstalk\Pheanstalk;
-use Pheanstalk\Values\Job as PheanstalkJob;
 use Pheanstalk\Values\JobId;
 use Pheanstalk\Values\TubeName;
 use Symfony\Component\Messenger\Exception\InvalidArgumentException;
@@ -45,6 +44,9 @@ class Connection
     private int $ttr;
     private bool $buryOnReject;
 
+    private bool $usingTube = false;
+    private bool $watchingTube = false;
+
     /**
      * Constructor.
      *
@@ -139,7 +141,7 @@ public function send(string $body, array $headers, int $delay = 0, ?int $priorit
         }
 
         return $this->withReconnect(function () use ($message, $delay, $priority) {
-            $this->client->useTube($this->tube);
+            $this->useTube();
             $job = $this->client->put(
                 $message,
                 $priority ?? PheanstalkPublisherInterface::DEFAULT_PRIORITY,
@@ -153,7 +155,11 @@ public function send(string $body, array $headers, int $delay = 0, ?int $priorit
 
     public function get(): ?array
     {
-        $job = $this->getFromTube();
+        $job = $this->withReconnect(function () {
+            $this->watchTube();
+
+            return $this->client->reserveWithTimeout($this->timeout);
+        });
 
         if (null === $job) {
             return null;
@@ -174,25 +180,10 @@ public function get(): ?array
         ];
     }
 
-    private function getFromTube(): ?PheanstalkJob
-    {
-        return $this->withReconnect(function () {
-            if ($this->client->watch($this->tube) > 1) {
-                foreach ($this->client->listTubesWatched() as $tube) {
-                    if ((string) $tube !== (string) $this->tube) {
-                        $this->client->ignore($tube);
-                    }
-                }
-            }
-
-            return $this->client->reserveWithTimeout($this->timeout);
-        });
-    }
-
     public function ack(string $id): void
     {
         $this->withReconnect(function () use ($id) {
-            $this->client->useTube($this->tube);
+            $this->useTube();
             $this->client->delete(new JobId($id));
         });
     }
@@ -200,7 +191,7 @@ public function ack(string $id): void
     public function reject(string $id, ?int $priority = null, bool $forceDelete = false): void
     {
         $this->withReconnect(function () use ($id, $priority, $forceDelete) {
-            $this->client->useTube($this->tube);
+            $this->useTube();
 
             if (!$forceDelete && $this->buryOnReject) {
                 $this->client->bury(new JobId($id), $priority ?? PheanstalkPublisherInterface::DEFAULT_PRIORITY);
@@ -213,7 +204,7 @@ public function reject(string $id, ?int $priority = null, bool $forceDelete = fa
     public function keepalive(string $id): void
     {
         $this->withReconnect(function () use ($id) {
-            $this->client->useTube($this->tube);
+            $this->useTube();
             $this->client->touch(new JobId($id));
         });
     }
@@ -221,7 +212,7 @@ public function keepalive(string $id): void
     public function getMessageCount(): int
     {
         return $this->withReconnect(function () {
-            $this->client->useTube($this->tube);
+            $this->useTube();
             $tubeStats = $this->client->statsTube($this->tube);
 
             return $tubeStats->currentJobsReady;
@@ -237,6 +228,33 @@ public function getMessagePriority(string $id): int
         });
     }
 
+    private function useTube(): void
+    {
+        if ($this->usingTube) {
+            return;
+        }
+
+        $this->client->useTube($this->tube);
+        $this->usingTube = true;
+    }
+
+    private function watchTube(): void
+    {
+        if ($this->watchingTube) {
+            return;
+        }
+
+        if ($this->client->watch($this->tube) > 1) {
+            foreach ($this->client->listTubesWatched() as $tube) {
+                if ((string) $tube !== (string) $this->tube) {
+                    $this->client->ignore($tube);
+                }
+            }
+        }
+
+        $this->watchingTube = true;
+    }
+
     private function withReconnect(callable $command): mixed
     {
         try {
@@ -245,6 +263,9 @@ private function withReconnect(callable $command): mixed
             } catch (ConnectionException) {
                 $this->client->disconnect();
 
+                $this->usingTube = false;
+                $this->watchingTube = false;
+
                 return $command();
             }
         } catch (Exception $exception) {

From 406e68a9c3fe3b6a50fb005e823f3ba21ce92443 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Fri, 2 May 2025 07:43:50 +0200
Subject: [PATCH 08/49] drop the limiters option for non-compound rater
 limiters

---
 .../DependencyInjection/FrameworkExtension.php      |  2 ++
 .../PhpFrameworkExtensionTest.php                   | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index f5111cd1096f9..2dd6ed95ee808 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -3255,6 +3255,8 @@ private function registerRateLimiterConfiguration(array $config, ContainerBuilde
                 continue;
             }
 
+            unset($limiterConfig['limiters']);
+
             $limiters[] = $name;
 
             // default configuration (when used by other DI extensions)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
index a7606b683a85f..60a1765f7c964 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -314,6 +314,19 @@ public function testRateLimiterCompoundPolicy()
             ]);
         });
 
+        $this->assertSame([
+            'policy' => 'fixed_window',
+            'limit' => 10,
+            'interval' => '1 hour',
+            'id' => 'first',
+        ], $container->getDefinition('limiter.first')->getArgument(0));
+        $this->assertSame([
+            'policy' => 'sliding_window',
+            'limit' => 10,
+            'interval' => '1 hour',
+            'id' => 'second',
+        ], $container->getDefinition('limiter.second')->getArgument(0));
+
         $definition = $container->getDefinition('limiter.compound');
         $this->assertSame(CompoundRateLimiterFactory::class, $definition->getClass());
         $this->assertEquals(

From 4d7f43a6b62486f4405665faed695334fa5d21da Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 2 May 2025 10:46:33 +0200
Subject: [PATCH 09/49] Update CHANGELOG for 6.4.21

---
 CHANGELOG-6.4.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG-6.4.md b/CHANGELOG-6.4.md
index dc52e3c7b4c0d..7eb354e2603a5 100644
--- a/CHANGELOG-6.4.md
+++ b/CHANGELOG-6.4.md
@@ -7,6 +7,27 @@ in 6.4 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.4.0...v6.4.1
 
+* 6.4.21 (2025-05-02)
+
+ * bug #60288 [VarExporter] dump default value for property hooks if present (xabbuh)
+ * bug #60268 [Contracts] Fix `ServiceSubscriberTrait` for nullable service (StevenRenaux)
+ * bug #60256 [Mailer][Postmark] drop the `Date` header using the API transport (xabbuh)
+ * bug #60258 [VarExporter] Fix: Use correct closure call for property-specific logic in $notByRef (Hakayashii, denjas)
+ * bug #60269 [Notifier] [Discord] Fix value limits (norkunas)
+ * bug #60248 [Messenger] Revert " Add call to `gc_collect_cycles()` after each message is handled" (jwage)
+ * bug #60236 [String] Support nexus -> nexuses pluralization (KorvinSzanto)
+ * bug #60194 [Workflow] Fix dispatch of entered event when the subject is already in this marking (lyrixx)
+ * bug #60172 [Cache] Fix invalidating on save failures with Array|ApcuAdapter (nicolas-grekas)
+ * bug #60122 [Cache] ArrayAdapter serialization exception clean $expiries (bastien-wink)
+ * bug #60167 [Cache] Fix proxying third party PSR-6 cache items (Dmitry Danilson)
+ * bug #60165 [HttpKernel] Do not ignore enum in controller arguments when it has an `#[Autowire]` attribute (ruudk)
+ * bug #60168 [Console] Correctly convert `SIGSYS` to its name (cs278)
+ * bug #60166 [Security] fix(security): fix OIDC user identifier (vincentchalamon)
+ * bug #60124 [Validator] : fix url validation when punycode is on tld but not on domain (joelwurtz)
+ * bug #60057 [Mailer] Fix `Trying to access array offset on value of type null` error by adding null checking (khushaalan)
+ * bug #60094 [DoctrineBridge] Fix support for entities that leverage native lazy objects (nicolas-grekas)
+ * bug #60094 [DoctrineBridge] Fix support for entities that leverage native lazy objects (nicolas-grekas)
+
 * 6.4.20 (2025-03-28)
 
  * bug #60054 [Form] Use duplicate_preferred_choices to set value of ChoiceType (aleho)

From 89f9f6e8625ab22f0fa8e23d9d070098f7026356 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 2 May 2025 10:46:37 +0200
Subject: [PATCH 10/49] Update CONTRIBUTORS for 6.4.21

---
 CONTRIBUTORS.md | 57 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ffc3b6feae6fd..ee2cb2a40889b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -38,8 +38,8 @@ The Symfony Connect username in parenthesis allows to get more information
  - Samuel ROZE (sroze)
  - Pascal Borreli (pborreli)
  - Romain Neutron
- - Joseph Bielawski (stloyd)
  - Kevin Bond (kbond)
+ - Joseph Bielawski (stloyd)
  - Drak (drak)
  - Abdellatif Ait boudad (aitboudad)
  - Lukas Kahwe Smith (lsmith)
@@ -79,8 +79,8 @@ The Symfony Connect username in parenthesis allows to get more information
  - Iltar van der Berg
  - Miha Vrhovnik (mvrhov)
  - Gary PEGEOT (gary-p)
- - Saša Stamenković (umpirsky)
  - Alexander Schranz (alexander-schranz)
+ - Saša Stamenković (umpirsky)
  - Allison Guilhem (a_guilhem)
  - Mathieu Piot (mpiot)
  - Vasilij Duško (staff)
@@ -94,8 +94,8 @@ The Symfony Connect username in parenthesis allows to get more information
  - Vladimir Reznichenko (kalessil)
  - Peter Rehm (rpet)
  - Henrik Bjørnskov (henrikbjorn)
- - David Buchmann (dbu)
  - Ruud Kamphuis (ruudk)
+ - David Buchmann (dbu)
  - Andrej Hudec (pulzarraider)
  - Tomas Norkūnas (norkunas)
  - Jáchym Toušek (enumag)
@@ -111,14 +111,14 @@ The Symfony Connect username in parenthesis allows to get more information
  - Frank A. Fiebig (fafiebig)
  - Baldini
  - Fran Moreno (franmomu)
+ - Antoine Makdessi (amakdessi)
  - Charles Sarrazin (csarrazi)
  - Henrik Westphal (snc)
  - Dariusz Górecki (canni)
- - Antoine Makdessi (amakdessi)
  - Ener-Getick
  - Graham Campbell (graham)
- - Massimiliano Arione (garak)
  - Joel Wurtz (brouznouf)
+ - Massimiliano Arione (garak)
  - Tugdual Saunier (tucksaun)
  - Lee McDermott
  - Brandon Turner
@@ -175,6 +175,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Dāvis Zālītis (k0d3r1s)
  - Gordon Franke (gimler)
  - Malte Schlüter (maltemaltesich)
+ - soyuka
  - jeremyFreeAgent (jeremyfreeagent)
  - Michael Babker (mbabker)
  - Alexis Lefebvre
@@ -195,7 +196,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Niels Keurentjes (curry684)
  - OGAWA Katsuhiro (fivestar)
  - Jhonny Lidfors (jhonne)
- - soyuka
  - Juti Noppornpitak (shiroyuki)
  - Gregor Harlan (gharlan)
  - Anthony MARTIN
@@ -277,6 +277,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Sébastien Alfaiate (seb33300)
  - James Halsall (jaitsu)
  - Christian Scheb
+ - Alex Hofbauer (alexhofbauer)
  - Mikael Pajunen
  - Warnar Boekkooi (boekkooi)
  - Justin Hileman (bobthecow)
@@ -285,6 +286,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Clément JOBEILI (dator)
  - Andreas Möller (localheinz)
  - Marek Štípek (maryo)
+ - matlec
  - Daniel Espendiller
  - Arnaud PETITPAS (apetitpa)
  - Michael Käfer (michael_kaefer)
@@ -302,6 +304,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - DQNEO
  - Chi-teck
  - Marko Kaznovac (kaznovac)
+ - Stiven Llupa (sllupa)
  - Andre Rømcke (andrerom)
  - Bram Leeda (bram123)
  - Patrick Landolt (scube)
@@ -327,8 +330,8 @@ The Symfony Connect username in parenthesis allows to get more information
  - Stadly
  - Stepan Anchugov (kix)
  - bronze1man
- - matlec
  - sun (sun)
+ - Filippo Tessarotto (slamdunk)
  - Larry Garfield (crell)
  - Leo Feyer
  - Nikolay Labinskiy (e-moe)
@@ -337,10 +340,10 @@ The Symfony Connect username in parenthesis allows to get more information
  - Guilliam Xavier
  - Pierre Minnieur (pminnieur)
  - Dominique Bongiraud
- - Stiven Llupa (sllupa)
  - Hugo Monteiro (monteiro)
  - Dmitrii Poddubnyi (karser)
  - Julien Pauli
+ - Jonathan H. Wage
  - Michael Lee (zerustech)
  - Florian Lonqueu-Brochard (florianlb)
  - Joe Bennett (kralos)
@@ -364,11 +367,9 @@ The Symfony Connect username in parenthesis allows to get more information
  - Arjen van der Meijden
  - Sven Paulus (subsven)
  - Peter Kruithof (pkruithof)
- - Alex Hofbauer (alexhofbauer)
  - Maxime Veber (nek-)
  - Valentine Boineau (valentineboineau)
  - Rui Marinho (ruimarinho)
- - Filippo Tessarotto (slamdunk)
  - Jeroen Noten (jeroennoten)
  - Possum
  - Jérémie Augustin (jaugustin)
@@ -386,7 +387,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - dFayet
  - Rob Frawley 2nd (robfrawley)
  - Renan (renanbr)
- - Jonathan H. Wage
  - Nikita Konstantinov (unkind)
  - Dariusz
  - Daniel Gorgan
@@ -395,6 +395,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Daniel Tschinder
  - Christian Schmidt
  - Alexander Kotynia (olden)
+ - Matthieu Lempereur (mryamous)
  - Elnur Abdurrakhimov (elnur)
  - Manuel Reinhard (sprain)
  - Zan Baldwin (zanbaldwin)
@@ -426,6 +427,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Sullivan SENECHAL (soullivaneuh)
  - Uwe Jäger (uwej711)
  - javaDeveloperKid
+ - Chris Smith (cs278)
  - W0rma
  - Lynn van der Berg (kjarli)
  - Michaël Perrin (michael.perrin)
@@ -461,7 +463,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - renanbr
  - Sébastien Lavoie (lavoiesl)
  - Alex Rock (pierstoval)
- - Matthieu Lempereur (mryamous)
  - Wodor Wodorski
  - Beau Simensen (simensen)
  - Magnus Nordlander (magnusnordlander)
@@ -489,9 +490,9 @@ The Symfony Connect username in parenthesis allows to get more information
  - Bohan Yang (brentybh)
  - Vilius Grigaliūnas
  - Jordane VASPARD (elementaire)
- - Chris Smith (cs278)
  - Thomas Bisignani (toma)
  - Florian Klein (docteurklein)
+ - Pierre Ambroise (dotordu)
  - Raphaël Geffroy (raphael-geffroy)
  - Damien Alexandre (damienalexandre)
  - Manuel Kießling (manuelkiessling)
@@ -542,6 +543,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Ahmed Raafat
  - Philippe Segatori
  - Thibaut Cheymol (tcheymol)
+ - Vincent Chalamon
  - Raffaele Carelle
  - Erin Millard
  - Matthew Lewinski (lewinski)
@@ -583,6 +585,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Daniel STANCU
  - Kristen Gilden
  - Robbert Klarenbeek (robbertkl)
+ - Dalibor Karlović
  - Hamza Makraz (makraz)
  - Eric Masoero (eric-masoero)
  - Vitalii Ekert (comrade42)
@@ -635,7 +638,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Ivan Sarastov (isarastov)
  - flack (flack)
  - Shein Alexey
- - Pierre Ambroise (dotordu)
  - Joe Lencioni
  - Daniel Tschinder
  - Diego Agulló (aeoris)
@@ -658,6 +660,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - a.dmitryuk
  - Anthon Pang (robocoder)
  - Julien Galenski (ruian)
+ - Benjamin Morel
  - Ben Scott (bpscott)
  - Shyim
  - Pablo Lozano (arkadis)
@@ -697,7 +700,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Neil Peyssard (nepey)
  - Niklas Fiekas
  - Mark Challoner (markchalloner)
- - Vincent Chalamon
  - Andreas Hennings
  - Markus Bachmann (baachi)
  - Gunnstein Lye (glye)
@@ -713,6 +715,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Ivan Nikolaev (destillat)
  - Gildas Quéméner (gquemener)
  - Ioan Ovidiu Enache (ionutenache)
+ - Mokhtar Tlili (sf-djuba)
  - Maxim Dovydenok (dovydenok-maxim)
  - Laurent Masforné (heisenberg)
  - Claude Khedhiri (ck-developer)
@@ -762,7 +765,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Tristan Pouliquen
  - Miro Michalicka
  - Hans Mackowiak
- - Dalibor Karlović
  - M. Vondano
  - Dominik Zogg
  - Maximilian Zumbansen
@@ -936,7 +938,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Forfarle (forfarle)
  - Johnny Robeson (johnny)
  - Disquedur
- - Benjamin Morel
  - Guilherme Ferreira
  - Geoffrey Tran (geoff)
  - Jannik Zschiesche
@@ -1003,6 +1004,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Alexandre Dupuy (satchette)
  - Michel Hunziker
  - Malte Blättermann
+ - Ilya Levin (ilyachase)
  - Simeon Kolev (simeon_kolev9)
  - Joost van Driel (j92)
  - Jonas Elfering
@@ -1101,6 +1103,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Kevin SCHNEKENBURGER
  - Geordie
  - Fabien Salles (blacked)
+ - Tim Düsterhus
  - Andreas Erhard (andaris)
  - alexpozzi
  - Michael Devery (mickadoo)
@@ -1112,6 +1115,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Luca Saba (lucasaba)
  - Sascha Grossenbacher (berdir)
  - Guillaume Aveline
+ - nathanpage
  - Robin Lehrmann
  - Szijarto Tamas
  - Thomas P
@@ -1491,7 +1495,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Johnson Page (jwpage)
  - Kuba Werłos (kuba)
  - Ruben Gonzalez (rubenruateltek)
- - Mokhtar Tlili (sf-djuba)
  - Michael Roterman (wtfzdotnet)
  - Philipp Keck
  - Pavol Tuka
@@ -1507,6 +1510,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Dominik Ulrich
  - den
  - Gábor Tóth
+ - Bastien THOMAS
  - ouardisoft
  - Daniel Cestari
  - Matt Janssen
@@ -1672,13 +1676,13 @@ The Symfony Connect username in parenthesis allows to get more information
  - Chris de Kok
  - Eduard Bulava (nonanerz)
  - Andreas Kleemann (andesk)
- - Ilya Levin (ilyachase)
  - Hubert Moreau (hmoreau)
  - Nicolas Appriou
  - Silas Joisten (silasjoisten)
  - Igor Timoshenko (igor.timoshenko)
  - Pierre-Emmanuel CAPEL
  - Manuele Menozzi
+ - Yevhen Sidelnyk
  - “teerasak”
  - Anton Babenko (antonbabenko)
  - Irmantas Šiupšinskas (irmantas)
@@ -1707,6 +1711,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - hamza
  - dantleech
  - Kajetan Kołtuniak (kajtii)
+ - Dan (dantleech)
  - Sander Goossens (sandergo90)
  - Rudy Onfroy
  - Tero Alén (tero)
@@ -1964,6 +1969,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Peter Trebaticky
  - Moza Bogdan (bogdan_moza)
  - Viacheslav Sychov
+ - Zuruuh
  - Nicolas Sauveur (baishu)
  - Helmut Hummel (helhum)
  - Matt Brunt
@@ -2015,6 +2021,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Rémi Leclerc
  - Jan Vernarsky
  - Ionut Cioflan
+ - John Edmerson Pizarra
  - Sergio
  - Jonas Hünig
  - Mehrdad
@@ -2367,6 +2374,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Tom Corrigan (tomcorrigan)
  - Luis Galeas
  - Bogdan Scordaliu
+ - Sven Scholz
  - Martin Pärtel
  - Daniel Rotter (danrot)
  - Frédéric Bouchery (fbouchery)
@@ -2572,6 +2580,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Benhssaein Youssef
  - Benoit Leveque
  - bill moll
+ - chillbram
  - Benjamin Bender
  - PaoRuby
  - Holger Lösken
@@ -2866,7 +2875,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - fabi
  - Grayson Koonce
  - Ruben Jansen
- - nathanpage
  - Wissame MEKHILEF
  - Mihai Stancu
  - shreypuranik
@@ -3161,6 +3169,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Ashura
  - Götz Gottwald
  - Alessandra Lai
+ - timesince
  - alangvazq
  - Christoph Krapp
  - Ernest Hymel
@@ -3197,7 +3206,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Buster Neece
  - Albert Prat
  - Alessandro Loffredo
- - Tim Düsterhus
  - Ian Phillips
  - Carlos Tasada
  - Remi Collet
@@ -3357,11 +3365,14 @@ The Symfony Connect username in parenthesis allows to get more information
  - Pavel Barton
  - Exploit.cz
  - GuillaumeVerdon
+ - Dmitry Danilson
  - Marien Fressinaud
  - ureimers
  - akimsko
  - Youpie
  - Jason Stephens
+ - Korvin Szanto
+ - wkania
  - srsbiz
  - Taylan Kasap
  - Michael Orlitzky
@@ -3392,6 +3403,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Evgeniy Koval
  - Lars Moelleken
  - dasmfm
+ - Karel Syrový
  - Claas Augner
  - Mathias Geat
  - neodevcode
@@ -3445,6 +3457,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Sylvain Lorinet
  - Pavol Tuka
  - klyk50
+ - Colin Michoudet
  - jc
  - BenjaminBeck
  - Aurelijus Rožėnas
@@ -3474,6 +3487,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Philipp
  - lol768
  - jamogon
+ - Tom Hart
  - Vyacheslav Slinko
  - Benjamin Laugueux
  - guangwu
@@ -3580,7 +3594,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - andrey-tech
  - David Ronchaud
  - Chris McGehee
- - Bastien THOMAS
  - Shaun Simmons
  - Pierre-Louis LAUNAY
  - Arseny Razin

From 90fb40b0afca79f118212424333a1b8d80e5cfc5 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 2 May 2025 10:46:38 +0200
Subject: [PATCH 11/49] Update VERSION for 6.4.21

---
 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 dd80ab6175429..3ea14b47ed5e1 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.4.21-DEV';
+    public const VERSION = '6.4.21';
     public const VERSION_ID = 60421;
     public const MAJOR_VERSION = 6;
     public const MINOR_VERSION = 4;
     public const RELEASE_VERSION = 21;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = '';
 
     public const END_OF_MAINTENANCE = '11/2026';
     public const END_OF_LIFE = '11/2027';

From 1efd768f20fd09538eba0a2526cd0ab176640468 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 2 May 2025 11:01:42 +0200
Subject: [PATCH 12/49] Bump Symfony version to 6.4.22

---
 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 3ea14b47ed5e1..c30785f1ba758 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.4.21';
-    public const VERSION_ID = 60421;
+    public const VERSION = '6.4.22-DEV';
+    public const VERSION_ID = 60422;
     public const MAJOR_VERSION = 6;
     public const MINOR_VERSION = 4;
-    public const RELEASE_VERSION = 21;
-    public const EXTRA_VERSION = '';
+    public const RELEASE_VERSION = 22;
+    public const EXTRA_VERSION = 'DEV';
 
     public const END_OF_MAINTENANCE = '11/2026';
     public const END_OF_LIFE = '11/2027';

From ca613dd00e04f222f007303182ea92f0d0979940 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 2 May 2025 11:03:59 +0200
Subject: [PATCH 13/49] Update CHANGELOG for 7.2.6

---
 CHANGELOG-7.2.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG-7.2.md b/CHANGELOG-7.2.md
index 0bb8758194576..93c489ae487bd 100644
--- a/CHANGELOG-7.2.md
+++ b/CHANGELOG-7.2.md
@@ -7,6 +7,32 @@ in 7.2 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/v7.2.0...v7.2.1
 
+* 7.2.6 (2025-05-02)
+
+ * bug #60288 [VarExporter] dump default value for property hooks if present (xabbuh)
+ * bug #60267 [Contracts] Fix `ServiceMethodsSubscriberTrait` for nullable service (StevenRenaux)
+ * bug #60268 [Contracts] Fix `ServiceSubscriberTrait` for nullable service (StevenRenaux)
+ * bug #60256 [Mailer][Postmark] drop the `Date` header using the API transport (xabbuh)
+ * bug #60258 [VarExporter] Fix: Use correct closure call for property-specific logic in $notByRef (Hakayashii, denjas)
+ * bug #60269 [Notifier] [Discord] Fix value limits (norkunas)
+ * bug #60270 [Validator] [WordCount] Treat 0 as one character word and do not exclude it (sidz)
+ * bug #60248 [Messenger] Revert " Add call to `gc_collect_cycles()` after each message is handled" (jwage)
+ * bug #60236 [String] Support nexus -> nexuses pluralization (KorvinSzanto)
+ * bug #60238 [Lock] read (possible) error from Redis instance where evalSha() was called (xabbuh)
+ * bug #60194 [Workflow] Fix dispatch of entered event when the subject is already in this marking (lyrixx)
+ * bug #60174 [PhpUnitBridge] properly clean up mocked features after tests have run (xabbuh)
+ * bug #60172 [Cache] Fix invalidating on save failures with Array|ApcuAdapter (nicolas-grekas)
+ * bug #60122 [Cache] ArrayAdapter serialization exception clean $expiries (bastien-wink)
+ * bug #60167 [Cache] Fix proxying third party PSR-6 cache items (Dmitry Danilson)
+ * bug #60165 [HttpKernel] Do not ignore enum in controller arguments when it has an `#[Autowire]` attribute (ruudk)
+ * bug #60168 [Console] Correctly convert `SIGSYS` to its name (cs278)
+ * bug #60166 [Security] fix(security): fix OIDC user identifier (vincentchalamon)
+ * bug #60124 [Validator] : fix url validation when punycode is on tld but not on domain (joelwurtz)
+ * bug #60137 [Config] ResourceCheckerConfigCache metadata unserialize emits warning (Colin Michoudet)
+ * bug #60057 [Mailer] Fix `Trying to access array offset on value of type null` error by adding null checking (khushaalan)
+ * bug #60094 [DoctrineBridge] Fix support for entities that leverage native lazy objects (nicolas-grekas)
+ * bug #60094 [DoctrineBridge] Fix support for entities that leverage native lazy objects (nicolas-grekas)
+
 * 7.2.5 (2025-03-28)
 
  * bug #60054 [Form] Use duplicate_preferred_choices to set value of ChoiceType (aleho)

From e227175cb944616090a8979ebc14c2b63482e207 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 2 May 2025 11:04:03 +0200
Subject: [PATCH 14/49] Update VERSION for 7.2.6

---
 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 79b84228d2b5f..12f65d3a89c15 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -73,12 +73,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     private static array $freshCache = [];
 
-    public const VERSION = '7.2.6-DEV';
+    public const VERSION = '7.2.6';
     public const VERSION_ID = 70206;
     public const MAJOR_VERSION = 7;
     public const MINOR_VERSION = 2;
     public const RELEASE_VERSION = 6;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = '';
 
     public const END_OF_MAINTENANCE = '07/2025';
     public const END_OF_LIFE = '07/2025';

From d5ed928c57352fe1bf9420e117d962353cb75d26 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 2 May 2025 11:13:32 +0200
Subject: [PATCH 15/49] Bump Symfony version to 7.2.7

---
 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 12f65d3a89c15..39964de47497f 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -73,12 +73,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     private static array $freshCache = [];
 
-    public const VERSION = '7.2.6';
-    public const VERSION_ID = 70206;
+    public const VERSION = '7.2.7-DEV';
+    public const VERSION_ID = 70207;
     public const MAJOR_VERSION = 7;
     public const MINOR_VERSION = 2;
-    public const RELEASE_VERSION = 6;
-    public const EXTRA_VERSION = '';
+    public const RELEASE_VERSION = 7;
+    public const EXTRA_VERSION = 'DEV';
 
     public const END_OF_MAINTENANCE = '07/2025';
     public const END_OF_LIFE = '07/2025';

From 25e04aefad04e89cbfaa60c4ba9e64835bce937f Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 2 May 2025 11:26:21 +0200
Subject: [PATCH 16/49] Bump Symfony version to 7.3.0

---
 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 8c3a0e527cbd1..b5a41236d1899 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -73,12 +73,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     private static array $freshCache = [];
 
-    public const VERSION = '7.3.0-BETA1';
+    public const VERSION = '7.3.0-DEV';
     public const VERSION_ID = 70300;
     public const MAJOR_VERSION = 7;
     public const MINOR_VERSION = 3;
     public const RELEASE_VERSION = 0;
-    public const EXTRA_VERSION = 'BETA1';
+    public const EXTRA_VERSION = 'DEV';
 
     public const END_OF_MAINTENANCE = '05/2025';
     public const END_OF_LIFE = '01/2026';

From 6678e91b14ac8e31c0bf7c174bba2b610232b885 Mon Sep 17 00:00:00 2001
From: Florent Morselli <florent.morselli@spomky-labs.com>
Date: Fri, 2 May 2025 20:47:36 +0200
Subject: [PATCH 17/49] [Mailer][Mime] Update SMIME repository node description
 in configuration

Clarified the documentation for the S/MIME certificate repository configuration. It now specifies that the repository should be a service implementing `SmimeCertificateRepositoryInterface`.
---
 .../FrameworkBundle/DependencyInjection/Configuration.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 6b168a2d4a0fd..51db3896388f2 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -2350,7 +2350,7 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
                             ->info('S/MIME encrypter configuration')
                             ->children()
                                 ->scalarNode('repository')
-                                    ->info('Path to the S/MIME certificate repository. Shall implement the `Symfony\Component\Mailer\EventListener\SmimeCertificateRepositoryInterface`.')
+                                    ->info('S/MIME certificate repository service. This service shall implement the `Symfony\Component\Mailer\EventListener\SmimeCertificateRepositoryInterface`.')
                                     ->defaultValue('')
                                     ->cannotBeEmpty()
                                 ->end()

From 19df3db39c7fa8de2ff543f0264269d4cf602be3 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Sun, 4 May 2025 13:00:11 +0200
Subject: [PATCH 18/49] fix EmojiTransliterator return type compatibility with
 PHP 8.5

---
 .github/expected-missing-return-types.diff      | 17 +++++++++++++++++
 .../Transliterator/EmojiTransliteratorTest.php  |  2 +-
 .../Intl/Transliterator/EmojiTransliterator.php | 10 +++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index d48f4ff600dbe..a9b6f3b22ca03 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -8923,6 +8923,23 @@ diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface
 -    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/Transliterator/EmojiTransliterator.php b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
+--- a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
++++ b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
+@@ -74,5 +74,5 @@ if (!class_exists(\Transliterator::class)) {
+          */
+         #[\ReturnTypeWillChange]
+-        public function getErrorCode(): int|false
++        public function getErrorCode(): int
+         {
+             return isset($this->transliterator) ? $this->transliterator->getErrorCode() : 0;
+@@ -83,5 +83,5 @@ if (!class_exists(\Transliterator::class)) {
+          */
+         #[\ReturnTypeWillChange]
+-        public function getErrorMessage(): string|false
++        public function getErrorMessage(): string
+         {
+             return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : '';
 diff --git a/src/Symfony/Component/Intl/Util/IntlTestHelper.php b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
 --- a/src/Symfony/Component/Intl/Util/IntlTestHelper.php
 +++ b/src/Symfony/Component/Intl/Util/IntlTestHelper.php
diff --git a/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php b/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
index a01bb0d2f9b8e..38b218db7225b 100644
--- a/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
+++ b/src/Symfony/Component/Intl/Tests/Transliterator/EmojiTransliteratorTest.php
@@ -189,6 +189,6 @@ public function testGetErrorMessageWithUninitializedTransliterator()
     {
         $transliterator = EmojiTransliterator::create('emoji-en');
 
-        $this->assertFalse($transliterator->getErrorMessage());
+        $this->assertSame('', $transliterator->getErrorMessage());
     }
 }
diff --git a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
index 7b8391ca43e0d..b28f5441c8951 100644
--- a/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
+++ b/src/Symfony/Component/Intl/Transliterator/EmojiTransliterator.php
@@ -70,14 +70,22 @@ public function createInverse(): self
             return self::create($this->id, self::REVERSE);
         }
 
+        /**
+         * @return int
+         */
+        #[\ReturnTypeWillChange]
         public function getErrorCode(): int|false
         {
             return isset($this->transliterator) ? $this->transliterator->getErrorCode() : 0;
         }
 
+        /**
+         * @return string
+         */
+        #[\ReturnTypeWillChange]
         public function getErrorMessage(): string|false
         {
-            return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : false;
+            return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : '';
         }
 
         public static function listIDs(): array

From a1ce16ae273cebcdba5cdfa476fbe9e8a656b8db Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Sun, 4 May 2025 15:17:29 +0200
Subject: [PATCH 19/49] fix merge

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

diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
index 47236c0690a98..d838ce9f7c759 100644
--- a/.github/expected-missing-return-types.diff
+++ b/.github/expected-missing-return-types.diff
@@ -180,20 +180,20 @@ diff --git a/src/Symfony/Component/DependencyInjection/Extension/PrependExtensio
 diff --git a/src/Symfony/Component/Emoji/EmojiTransliterator.php b/src/Symfony/Component/Emoji/EmojiTransliterator.php
 --- a/src/Symfony/Component/Emoji/EmojiTransliterator.php
 +++ b/src/Symfony/Component/Emoji/EmojiTransliterator.php
-@@ -74,5 +74,5 @@ if (!class_exists(\Transliterator::class)) {
-          */
-         #[\ReturnTypeWillChange]
--        public function getErrorCode(): int|false
-+        public function getErrorCode(): int
-         {
-             return isset($this->transliterator) ? $this->transliterator->getErrorCode() : 0;
-@@ -83,5 +83,5 @@ if (!class_exists(\Transliterator::class)) {
-          */
-         #[\ReturnTypeWillChange]
--        public function getErrorMessage(): string|false
-+        public function getErrorMessage(): string
-         {
-             return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : '';
+@@ -88,5 +88,5 @@ final class EmojiTransliterator extends \Transliterator
+      */
+     #[\ReturnTypeWillChange]
+-    public function getErrorCode(): int|false
++    public function getErrorCode(): int
+     {
+         return isset($this->transliterator) ? $this->transliterator->getErrorCode() : 0;
+@@ -97,5 +97,5 @@ final class EmojiTransliterator extends \Transliterator
+      */
+     #[\ReturnTypeWillChange]
+-    public function getErrorMessage(): string|false
++    public function getErrorMessage(): string
+     {
+         return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : '';
 diff --git a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
 --- a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
 +++ b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php

From 28d1a83b8e5ab14075e897a1baa767c082395c31 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Sun, 4 May 2025 14:37:22 +0200
Subject: [PATCH 20/49] require the 7.3+ of the Config component

---
 src/Symfony/Bundle/DebugBundle/composer.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json
index 7756b7fd73014..31b480091abdc 100644
--- a/src/Symfony/Bundle/DebugBundle/composer.json
+++ b/src/Symfony/Bundle/DebugBundle/composer.json
@@ -19,19 +19,15 @@
         "php": ">=8.2",
         "ext-xml": "*",
         "composer-runtime-api": ">=2.1",
+        "symfony/config": "^7.3",
         "symfony/dependency-injection": "^6.4|^7.0",
         "symfony/http-kernel": "^6.4|^7.0",
         "symfony/twig-bridge": "^6.4|^7.0",
         "symfony/var-dumper": "^6.4|^7.0"
     },
     "require-dev": {
-        "symfony/config": "^7.3",
         "symfony/web-profiler-bundle": "^6.4|^7.0"
     },
-    "conflict": {
-        "symfony/config": "<6.4",
-        "symfony/dependency-injection": "<6.4"
-    },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\DebugBundle\\": "" },
         "exclude-from-classmap": [

From 84c0e5b01b020bf2b63e922298312a76658d0b1f Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Mon, 5 May 2025 01:49:22 +0200
Subject: [PATCH 21/49] [Console] Use kebab-case for auto-guessed input
 arguments/options names

---
 .../Component/Console/Attribute/Argument.php       |  3 ++-
 src/Symfony/Component/Console/Attribute/Option.php |  3 ++-
 .../Console/Tests/Command/InvokableCommandTest.php | 14 +++++++-------
 src/Symfony/Component/Console/composer.json        |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/Console/Attribute/Argument.php b/src/Symfony/Component/Console/Attribute/Argument.php
index 099d49676e033..b5e45be3fe06a 100644
--- a/src/Symfony/Component/Console/Attribute/Argument.php
+++ b/src/Symfony/Component/Console/Attribute/Argument.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\String\UnicodeString;
 
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
 class Argument
@@ -65,7 +66,7 @@ public static function tryFrom(\ReflectionParameter $parameter): ?self
         }
 
         if (!$self->name) {
-            $self->name = $name;
+            $self->name = (new UnicodeString($name))->kebab();
         }
 
         $self->default = $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null;
diff --git a/src/Symfony/Component/Console/Attribute/Option.php b/src/Symfony/Component/Console/Attribute/Option.php
index 02002a5ad1256..a526b672389e3 100644
--- a/src/Symfony/Component/Console/Attribute/Option.php
+++ b/src/Symfony/Component/Console/Attribute/Option.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\String\UnicodeString;
 
 #[\Attribute(\Attribute::TARGET_PARAMETER)]
 class Option
@@ -73,7 +74,7 @@ public static function tryFrom(\ReflectionParameter $parameter): ?self
         }
 
         if (!$self->name) {
-            $self->name = $name;
+            $self->name = (new UnicodeString($name))->kebab();
         }
 
         $self->default = $parameter->getDefaultValue();
diff --git a/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php b/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
index b0a337fb0a64b..65c386345179b 100644
--- a/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
@@ -29,7 +29,7 @@ public function testCommandInputArgumentDefinition()
     {
         $command = new Command('foo');
         $command->setCode(function (
-            #[Argument(name: 'first-name')] string $name,
+            #[Argument(name: 'very-first-name')] string $name,
             #[Argument] ?string $firstName,
             #[Argument] string $lastName = '',
             #[Argument(description: 'Short argument description')] string $bio = '',
@@ -38,17 +38,17 @@ public function testCommandInputArgumentDefinition()
             return 0;
         });
 
-        $nameInputArgument = $command->getDefinition()->getArgument('first-name');
-        self::assertSame('first-name', $nameInputArgument->getName());
+        $nameInputArgument = $command->getDefinition()->getArgument('very-first-name');
+        self::assertSame('very-first-name', $nameInputArgument->getName());
         self::assertTrue($nameInputArgument->isRequired());
 
-        $lastNameInputArgument = $command->getDefinition()->getArgument('firstName');
-        self::assertSame('firstName', $lastNameInputArgument->getName());
+        $lastNameInputArgument = $command->getDefinition()->getArgument('first-name');
+        self::assertSame('first-name', $lastNameInputArgument->getName());
         self::assertFalse($lastNameInputArgument->isRequired());
         self::assertNull($lastNameInputArgument->getDefault());
 
-        $lastNameInputArgument = $command->getDefinition()->getArgument('lastName');
-        self::assertSame('lastName', $lastNameInputArgument->getName());
+        $lastNameInputArgument = $command->getDefinition()->getArgument('last-name');
+        self::assertSame('last-name', $lastNameInputArgument->getName());
         self::assertFalse($lastNameInputArgument->isRequired());
         self::assertSame('', $lastNameInputArgument->getDefault());
 
diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
index 6247ee94e9a1d..b565f86e3615f 100644
--- a/src/Symfony/Component/Console/composer.json
+++ b/src/Symfony/Component/Console/composer.json
@@ -20,7 +20,7 @@
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/service-contracts": "^2.5|^3",
-        "symfony/string": "^6.4|^7.0"
+        "symfony/string": "^7.2"
     },
     "require-dev": {
         "symfony/config": "^6.4|^7.0",

From a5698aaf88f87f4c6539d6fd9bddd9d56882b262 Mon Sep 17 00:00:00 2001
From: soyuka <soyuka@users.noreply.github.com>
Date: Wed, 2 Apr 2025 09:54:43 +0200
Subject: [PATCH 22/49] [ObjectMapper] Condition to target a specific class

---
 .../ObjectMapper/TransformCallable.php        |  2 +-
 .../ObjectMapper/Condition/TargetClass.php    | 34 +++++++++++++++++++
 .../ConditionCallableInterface.php            |  4 ++-
 .../Component/ObjectMapper/ObjectMapper.php   | 24 ++++++-------
 .../Fixtures/MultipleTargetProperty/A.php     | 26 ++++++++++++++
 .../Fixtures/MultipleTargetProperty/B.php     | 17 ++++++++++
 .../Fixtures/MultipleTargetProperty/C.php     | 19 +++++++++++
 .../ServiceLocator/ConditionCallable.php      |  2 +-
 .../ServiceLocator/TransformCallable.php      |  2 +-
 .../ObjectMapper/Tests/ObjectMapperTest.php   | 18 ++++++++++
 .../TransformCallableInterface.php            |  4 ++-
 11 files changed, 135 insertions(+), 17 deletions(-)
 create mode 100644 src/Symfony/Component/ObjectMapper/Condition/TargetClass.php
 create mode 100644 src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/A.php
 create mode 100644 src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/B.php
 create mode 100644 src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/C.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ObjectMapper/TransformCallable.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ObjectMapper/TransformCallable.php
index da4f26a2dd4e6..3321e28d1ac67 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ObjectMapper/TransformCallable.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/ObjectMapper/TransformCallable.php
@@ -18,7 +18,7 @@
  */
 final class TransformCallable implements TransformCallableInterface
 {
-    public function __invoke(mixed $value, object $object): mixed
+    public function __invoke(mixed $value, object $source, ?object $target): mixed
     {
         return 'transformed';
     }
diff --git a/src/Symfony/Component/ObjectMapper/Condition/TargetClass.php b/src/Symfony/Component/ObjectMapper/Condition/TargetClass.php
new file mode 100644
index 0000000000000..c44dccc840d24
--- /dev/null
+++ b/src/Symfony/Component/ObjectMapper/Condition/TargetClass.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\ObjectMapper\Condition;
+
+use Symfony\Component\ObjectMapper\ConditionCallableInterface;
+
+/**
+ * @template T of object
+ *
+ * @implements ConditionCallableInterface<object, T>
+ */
+final class TargetClass implements ConditionCallableInterface
+{
+    /**
+     * @param class-string<T> $className
+     */
+    public function __construct(private readonly string $className)
+    {
+    }
+
+    public function __invoke(mixed $value, object $source, ?object $target): bool
+    {
+        return $target instanceof $this->className;
+    }
+}
diff --git a/src/Symfony/Component/ObjectMapper/ConditionCallableInterface.php b/src/Symfony/Component/ObjectMapper/ConditionCallableInterface.php
index 778e917d66f38..05084591e1fbd 100644
--- a/src/Symfony/Component/ObjectMapper/ConditionCallableInterface.php
+++ b/src/Symfony/Component/ObjectMapper/ConditionCallableInterface.php
@@ -15,6 +15,7 @@
  * Service used by "Map::if".
  *
  * @template T of object
+ * @template T2 of object
  *
  * @experimental
  *
@@ -25,6 +26,7 @@ interface ConditionCallableInterface
     /**
      * @param mixed $value  The value being mapped
      * @param T     $source The object we're working on
+     * @param T2|null $target The target we're mapping to
      */
-    public function __invoke(mixed $value, object $source): bool;
+    public function __invoke(mixed $value, object $source, ?object $target): bool;
 }
diff --git a/src/Symfony/Component/ObjectMapper/ObjectMapper.php b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
index aa276e8f06995..7624a05f7bfe0 100644
--- a/src/Symfony/Component/ObjectMapper/ObjectMapper.php
+++ b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
@@ -50,7 +50,7 @@ public function map(object $source, object|string|null $target = null): object
         }
 
         $metadata = $this->metadataFactory->create($source);
-        $map = $this->getMapTarget($metadata, null, $source);
+        $map = $this->getMapTarget($metadata, null, $source, null);
         $target ??= $map?->target;
         $mappingToObject = \is_object($target);
 
@@ -70,7 +70,7 @@ public function map(object $source, object|string|null $target = null): object
 
         $mappedTarget = $mappingToObject ? $target : $targetRefl->newInstanceWithoutConstructor();
         if ($map && $map->transform) {
-            $mappedTarget = $this->applyTransforms($map, $mappedTarget, $mappedTarget);
+            $mappedTarget = $this->applyTransforms($map, $mappedTarget, $mappedTarget, null);
 
             if (!\is_object($mappedTarget)) {
                 throw new MappingTransformException(\sprintf('Cannot map "%s" to a non-object target of type "%s".', get_debug_type($source), get_debug_type($mappedTarget)));
@@ -123,7 +123,7 @@ public function map(object $source, object|string|null $target = null): object
                 }
 
                 $value = $this->getRawValue($source, $sourcePropertyName);
-                if (($if = $mapping->if) && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source)) {
+                if (($if = $mapping->if) && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source, $mappedTarget)) {
                     continue;
                 }
 
@@ -173,16 +173,16 @@ private function getRawValue(object $source, string $propertyName): mixed
     private function getSourceValue(object $source, object $target, mixed $value, \SplObjectStorage $objectMap, ?Mapping $mapping = null): mixed
     {
         if ($mapping?->transform) {
-            $value = $this->applyTransforms($mapping, $value, $source);
+            $value = $this->applyTransforms($mapping, $value, $source, $target);
         }
 
         if (
             \is_object($value)
             && ($innerMetadata = $this->metadataFactory->create($value))
-            && ($mapTo = $this->getMapTarget($innerMetadata, $value, $source))
+            && ($mapTo = $this->getMapTarget($innerMetadata, $value, $source, $target))
             && (\is_string($mapTo->target) && class_exists($mapTo->target))
         ) {
-            $value = $this->applyTransforms($mapTo, $value, $source);
+            $value = $this->applyTransforms($mapTo, $value, $source, $target);
 
             if ($value === $source) {
                 $value = $target;
@@ -216,23 +216,23 @@ private function storeValue(string $propertyName, array &$mapToProperties, array
     /**
      * @param callable(): mixed $fn
      */
-    private function call(callable $fn, mixed $value, object $object): mixed
+    private function call(callable $fn, mixed $value, object $source, ?object $target = null): mixed
     {
         if (\is_string($fn)) {
             return \call_user_func($fn, $value);
         }
 
-        return $fn($value, $object);
+        return $fn($value, $source, $target);
     }
 
     /**
      * @param Mapping[] $metadata
      */
-    private function getMapTarget(array $metadata, mixed $value, object $source): ?Mapping
+    private function getMapTarget(array $metadata, mixed $value, object $source, ?object $target): ?Mapping
     {
         $mapTo = null;
         foreach ($metadata as $mapAttribute) {
-            if (($if = $mapAttribute->if) && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source)) {
+            if (($if = $mapAttribute->if) && ($fn = $this->getCallable($if, $this->conditionCallableLocator)) && !$this->call($fn, $value, $source, $target)) {
                 continue;
             }
 
@@ -242,7 +242,7 @@ private function getMapTarget(array $metadata, mixed $value, object $source): ?M
         return $mapTo;
     }
 
-    private function applyTransforms(Mapping $map, mixed $value, object $object): mixed
+    private function applyTransforms(Mapping $map, mixed $value, object $source, ?object $target): mixed
     {
         if (!$transforms = $map->transform) {
             return $value;
@@ -256,7 +256,7 @@ private function applyTransforms(Mapping $map, mixed $value, object $object): mi
 
         foreach ($transforms as $transform) {
             if ($fn = $this->getCallable($transform, $this->transformCallableLocator)) {
-                $value = $this->call($fn, $value, $object);
+                $value = $this->call($fn, $value, $source, $target);
             }
         }
 
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/A.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/A.php
new file mode 100644
index 0000000000000..34ff470a1cf17
--- /dev/null
+++ b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/A.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\ObjectMapper\Tests\Fixtures\MultipleTargetProperty;
+
+use Symfony\Component\ObjectMapper\Attribute\Map;
+use Symfony\Component\ObjectMapper\Condition\TargetClass;
+
+#[Map(target: B::class)]
+#[Map(target: C::class)]
+class A
+{
+    #[Map(target: 'foo', transform: 'strtoupper', if: new TargetClass(B::class))]
+    #[Map(target: 'bar')]
+    public string $something = 'test';
+
+    public string $doesNotExistInTargetB = 'foo';
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/B.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/B.php
new file mode 100644
index 0000000000000..c49094b7c549c
--- /dev/null
+++ b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/B.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\ObjectMapper\Tests\Fixtures\MultipleTargetProperty;
+
+class B
+{
+    public string $foo;
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/C.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/C.php
new file mode 100644
index 0000000000000..71a390cda5c54
--- /dev/null
+++ b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/MultipleTargetProperty/C.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\ObjectMapper\Tests\Fixtures\MultipleTargetProperty;
+
+class C
+{
+    public string $foo = 'donotmap';
+    public string $bar;
+    public string $doesNotExistInTargetB;
+}
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/ConditionCallable.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/ConditionCallable.php
index b7d42889e3742..bc7c9314f9886 100644
--- a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/ConditionCallable.php
+++ b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/ConditionCallable.php
@@ -18,7 +18,7 @@
  */
 class ConditionCallable implements ConditionCallableInterface
 {
-    public function __invoke(mixed $value, object $object): bool
+    public function __invoke(mixed $value, object $source, ?object $target): bool
     {
         return 'ok' === $value;
     }
diff --git a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/TransformCallable.php b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/TransformCallable.php
index 2d34e696e8fc4..5ba5c66705e34 100644
--- a/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/TransformCallable.php
+++ b/src/Symfony/Component/ObjectMapper/Tests/Fixtures/ServiceLocator/TransformCallable.php
@@ -18,7 +18,7 @@
  */
 class TransformCallable implements TransformCallableInterface
 {
-    public function __invoke(mixed $value, object $object): mixed
+    public function __invoke(mixed $value, object $source, ?object $target): mixed
     {
         return "transformed$value";
     }
diff --git a/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php b/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php
index 40f781a05974e..a416abd47933b 100644
--- a/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php
+++ b/src/Symfony/Component/ObjectMapper/Tests/ObjectMapperTest.php
@@ -40,6 +40,9 @@
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MapStruct\Target;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MapTargetToSource\A as MapTargetToSourceA;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MapTargetToSource\B as MapTargetToSourceB;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargetProperty\A as MultipleTargetPropertyA;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargetProperty\B as MultipleTargetPropertyB;
+use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargetProperty\C as MultipleTargetPropertyC;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargets\A as MultipleTargetsA;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\MultipleTargets\C as MultipleTargetsC;
 use Symfony\Component\ObjectMapper\Tests\Fixtures\Recursion\AB;
@@ -273,4 +276,19 @@ public function testMapTargetToSource()
         $this->assertInstanceOf(MapTargetToSourceB::class, $b);
         $this->assertSame('str', $b->target);
     }
+
+    public function testMultipleTargetMapProperty()
+    {
+        $u = new MultipleTargetPropertyA();
+
+        $mapper = new ObjectMapper();
+        $b = $mapper->map($u, MultipleTargetPropertyB::class);
+        $this->assertInstanceOf(MultipleTargetPropertyB::class, $b);
+        $this->assertEquals($b->foo, 'TEST');
+        $c = $mapper->map($u, MultipleTargetPropertyC::class);
+        $this->assertInstanceOf(MultipleTargetPropertyC::class, $c);
+        $this->assertEquals($c->bar, 'test');
+        $this->assertEquals($c->foo, 'donotmap');
+        $this->assertEquals($c->doesNotExistInTargetB, 'foo');
+    }
 }
diff --git a/src/Symfony/Component/ObjectMapper/TransformCallableInterface.php b/src/Symfony/Component/ObjectMapper/TransformCallableInterface.php
index 401df932de2ae..f8c296b4c26d5 100644
--- a/src/Symfony/Component/ObjectMapper/TransformCallableInterface.php
+++ b/src/Symfony/Component/ObjectMapper/TransformCallableInterface.php
@@ -15,6 +15,7 @@
  * Service used by "Map::transform".
  *
  * @template T of object
+ * @template T2 of object
  *
  * @experimental
  *
@@ -25,6 +26,7 @@ interface TransformCallableInterface
     /**
      * @param mixed $value  The value being mapped
      * @param T     $source The object we're working on
+     * @param T2|null $target The target we're mapping to
      */
-    public function __invoke(mixed $value, object $source): mixed;
+    public function __invoke(mixed $value, object $source, ?object $target): mixed;
 }

From 3213d880bfa3b603c291b4e6dadf93bd32553933 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Tue, 6 May 2025 11:08:27 +0200
Subject: [PATCH 23/49] don't hardcode OS-depending constant values

The values of the SIG* constants depend on the OS.
---
 .../Console/Tests/SignalRegistry/SignalMapTest.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Console/Tests/SignalRegistry/SignalMapTest.php b/src/Symfony/Component/Console/Tests/SignalRegistry/SignalMapTest.php
index f4e320477d4be..73619049d6f4a 100644
--- a/src/Symfony/Component/Console/Tests/SignalRegistry/SignalMapTest.php
+++ b/src/Symfony/Component/Console/Tests/SignalRegistry/SignalMapTest.php
@@ -18,17 +18,21 @@ class SignalMapTest extends TestCase
 {
     /**
      * @requires extension pcntl
-     *
-     * @testWith [2, "SIGINT"]
-     *           [9, "SIGKILL"]
-     *           [15, "SIGTERM"]
-     *           [31, "SIGSYS"]
+     * @dataProvider provideSignals
      */
     public function testSignalExists(int $signal, string $expected)
     {
         $this->assertSame($expected, SignalMap::getSignalName($signal));
     }
 
+    public function provideSignals()
+    {
+        yield [\SIGINT, 'SIGINT'];
+        yield [\SIGKILL, 'SIGKILL'];
+        yield [\SIGTERM, 'SIGTERM'];
+        yield [\SIGSYS, 'SIGSYS'];
+    }
+
     public function testSignalDoesNotExist()
     {
         $this->assertNull(SignalMap::getSignalName(999999));

From 0dc4d0b98b52b5c3cc7c117cbee2d7de679067ce Mon Sep 17 00:00:00 2001
From: David Szkiba <david.szkiba@gmx.at>
Date: Tue, 6 May 2025 13:49:37 +0200
Subject: [PATCH 24/49] [Security][LoginLink] Throw InvalidLoginLinkException
 on invalid parameters

---
 .../Http/LoginLink/LoginLinkHandler.php       |  7 ++++++
 .../Tests/LoginLink/LoginLinkHandlerTest.php  | 24 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php
index 176d316607506..02ca251106471 100644
--- a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php
+++ b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php
@@ -86,9 +86,16 @@ public function consumeLoginLink(Request $request): UserInterface
         if (!$hash = $request->get('hash')) {
             throw new InvalidLoginLinkException('Missing "hash" parameter.');
         }
+        if (!is_string($hash)) {
+            throw new InvalidLoginLinkException('Invalid "hash" parameter.');
+        }
+
         if (!$expires = $request->get('expires')) {
             throw new InvalidLoginLinkException('Missing "expires" parameter.');
         }
+        if (preg_match('/^\d+$/', $expires) !== 1) {
+            throw new InvalidLoginLinkException('Invalid "expires" parameter.');
+        }
 
         try {
             $this->signatureHasher->acceptSignatureHash($userIdentifier, $expires, $hash);
diff --git a/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php
index 98ff60d43992c..350ecde4290a0 100644
--- a/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/LoginLink/LoginLinkHandlerTest.php
@@ -240,6 +240,30 @@ public function testConsumeLoginLinkWithMissingExpiration()
         $linker->consumeLoginLink($request);
     }
 
+    public function testConsumeLoginLinkWithInvalidExpiration()
+    {
+        $user = new TestLoginLinkHandlerUser('weaverryan', 'ryan@symfonycasts.com', 'pwhash');
+        $this->userProvider->createUser($user);
+
+        $this->expectException(InvalidLoginLinkException::class);
+        $request = Request::create('/login/verify?user=weaverryan&hash=thehash&expires=%E2%80%AA1000000000%E2%80%AC');
+
+        $linker = $this->createLinker();
+        $linker->consumeLoginLink($request);
+    }
+
+    public function testConsumeLoginLinkWithInvalidHash()
+    {
+        $user = new TestLoginLinkHandlerUser('weaverryan', 'ryan@symfonycasts.com', 'pwhash');
+        $this->userProvider->createUser($user);
+
+        $this->expectException(InvalidLoginLinkException::class);
+        $request = Request::create('/login/verify?user=weaverryan&hash[]=an&hash[]=array&expires=1000000000');
+
+        $linker = $this->createLinker();
+        $linker->consumeLoginLink($request);
+    }
+
     private function createSignatureHash(string $username, int $expires, array $extraFields = ['emailProperty' => 'ryan@symfonycasts.com', 'passwordProperty' => 'pwhash']): string
     {
         $hasher = new SignatureHasher($this->propertyAccessor, array_keys($extraFields), 's3cret');

From 80842419360df479aa6237403592ad600bb28303 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Tue, 6 May 2025 14:12:18 +0200
Subject: [PATCH 25/49] remove conflict rule

---
 src/Symfony/Component/Console/composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
index b565f86e3615f..65d69913aa218 100644
--- a/src/Symfony/Component/Console/composer.json
+++ b/src/Symfony/Component/Console/composer.json
@@ -43,8 +43,7 @@
         "symfony/dotenv": "<6.4",
         "symfony/event-dispatcher": "<6.4",
         "symfony/lock": "<6.4",
-        "symfony/process": "<6.4",
-        "symfony/runtime": "<7.3"
+        "symfony/process": "<6.4"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Console\\": "" },

From f77c4034ddcc15eaccf920727cea5d62865e5dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= <jerome@tamarelle.net>
Date: Tue, 6 May 2025 15:45:12 +0200
Subject: [PATCH 26/49] Ensure overriding Command::execute() keep priority over
 __invoke

---
 .../Component/Console/Command/Command.php     |  2 +-
 .../Tests/Command/InvokableCommandTest.php    | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index f79475d56be73..c93340a77ad95 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -134,7 +134,7 @@ public function __construct(?string $name = null)
             $this->setHelp($attribute?->help ?? '');
         }
 
-        if (\is_callable($this)) {
+        if (\is_callable($this) && (new \ReflectionMethod($this, 'execute'))->getDeclaringClass()->name === self::class) {
             $this->code = new InvokableCommand($this, $this(...));
         }
 
diff --git a/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php b/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
index 65c386345179b..d355c44ce5f9b 100644
--- a/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
@@ -21,7 +21,9 @@
 use Symfony\Component\Console\Exception\InvalidOptionException;
 use Symfony\Component\Console\Exception\LogicException;
 use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\NullOutput;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class InvokableCommandTest extends TestCase
 {
@@ -142,6 +144,45 @@ public function testInvalidOptionType()
         $command->getDefinition();
     }
 
+    public function testExecuteHasPriorityOverInvokeMethod()
+    {
+        $command = new class extends Command {
+            public string $called;
+            protected function execute(InputInterface $input, OutputInterface $output): int
+            {
+                $this->called = __FUNCTION__;
+
+                return 0;
+            }
+
+            public function __invoke(): int
+            {
+                $this->called = __FUNCTION__;
+
+                return 0;
+            }
+        };
+
+        $command->run(new ArrayInput([]), new NullOutput());
+        $this->assertSame('execute', $command->called);
+    }
+
+    public function testCallInvokeMethodWhenExtendingCommandClass()
+    {
+        $command = new class extends Command {
+            public string $called;
+            public function __invoke(): int
+            {
+                $this->called = __FUNCTION__;
+
+                return 0;
+            }
+        };
+
+        $command->run(new ArrayInput([]), new NullOutput());
+        $this->assertSame('__invoke', $command->called);
+    }
+
     public function testInvalidReturnType()
     {
         $command = new Command('foo');

From fe4f1ee2c2beb870ebdcbc531f22d168b6ceeb6f Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Tue, 6 May 2025 20:24:47 +0200
Subject: [PATCH 27/49] bump min constraint for the ObjectMapper 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 2ecedbc45660e..bc312827ffa14 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -54,7 +54,7 @@
         "symfony/messenger": "^6.4|^7.0",
         "symfony/mime": "^6.4|^7.0",
         "symfony/notifier": "^6.4|^7.0",
-        "symfony/object-mapper": "^7.3",
+        "symfony/object-mapper": "^v7.3.0-beta2",
         "symfony/process": "^6.4|^7.0",
         "symfony/rate-limiter": "^6.4|^7.0",
         "symfony/scheduler": "^6.4.4|^7.0.4",

From 41ea779ebb5808ff0e55f8dcda26f1c6ad7b2004 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Tue, 6 May 2025 20:55:03 +0200
Subject: [PATCH 28/49] choose the correctly cased class name for the SQLite
 platform

---
 .../Component/Cache/Adapter/DoctrineDbalAdapter.php      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
index c3a4909e211df..8e52dfee240a0 100644
--- a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php
@@ -359,9 +359,16 @@ private function getPlatformName(): string
 
         $platform = $this->conn->getDatabasePlatform();
 
+        if (interface_exists(DBALException::class)) {
+            // DBAL 4+
+            $sqlitePlatformClass = 'Doctrine\DBAL\Platforms\SQLitePlatform';
+        } else {
+            $sqlitePlatformClass = 'Doctrine\DBAL\Platforms\SqlitePlatform';
+        }
+
         return $this->platformName = match (true) {
             $platform instanceof \Doctrine\DBAL\Platforms\AbstractMySQLPlatform => 'mysql',
-            $platform instanceof \Doctrine\DBAL\Platforms\SqlitePlatform => 'sqlite',
+            $platform instanceof $sqlitePlatformClass => 'sqlite',
             $platform instanceof \Doctrine\DBAL\Platforms\PostgreSQLPlatform => 'pgsql',
             $platform instanceof \Doctrine\DBAL\Platforms\OraclePlatform => 'oci',
             $platform instanceof \Doctrine\DBAL\Platforms\SQLServerPlatform => 'sqlsrv',

From b8b3c37f3feda9b5327a7958e93b833d922e8a28 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Tue, 6 May 2025 22:43:17 +0200
Subject: [PATCH 29/49] ensure that all supported e-mail validation modes can
 be configured

---
 .../DependencyInjection/Configuration.php     |  3 +-
 .../PhpFrameworkExtensionTest.php             | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index cb52a0704fd99..4d44c469fabe1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -45,6 +45,7 @@
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Uid\Factory\UuidFactory;
+use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Validation;
 use Symfony\Component\Webhook\Controller\WebhookController;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
@@ -1066,7 +1067,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
                             ->validate()->castToArray()->end()
                         ->end()
                         ->scalarNode('translation_domain')->defaultValue('validators')->end()
-                        ->enumNode('email_validation_mode')->values(['html5', 'loose', 'strict'])->end()
+                        ->enumNode('email_validation_mode')->values(Email::VALIDATION_MODES + ['loose'])->end()
                         ->arrayNode('mapping')
                             ->addDefaultsIfNotSet()
                             ->fixXmlConfig('path')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
index 53268ffd283d8..eae45736186b3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -17,6 +17,7 @@
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Exception\OutOfBoundsException;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Workflow\Exception\InvalidDefinitionException;
 
 class PhpFrameworkExtensionTest extends FrameworkExtensionTestCase
@@ -245,4 +246,31 @@ public function testRateLimiterLockFactory()
 
         $container->getDefinition('limiter.without_lock')->getArgument(2);
     }
+
+    /**
+     * @dataProvider emailValidationModeProvider
+     */
+    public function testValidatorEmailValidationMode(string $mode)
+    {
+        $this->expectNotToPerformAssertions();
+
+        $this->createContainerFromClosure(function (ContainerBuilder $container) use ($mode) {
+            $container->loadFromExtension('framework', [
+                'annotations' => false,
+                'http_method_override' => false,
+                'handle_all_throwables' => true,
+                'php_errors' => ['log' => true],
+                'validation' => [
+                    'email_validation_mode' => $mode,
+                ],
+            ]);
+        });
+    }
+
+    public function emailValidationModeProvider()
+    {
+        foreach (Email::VALIDATION_MODES as $mode) {
+            yield [$mode];
+        }
+    }
 }

From 6763e777eca221c76f700f009c78f2ed0a27eccb Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Tue, 6 May 2025 23:56:38 +0200
Subject: [PATCH 30/49] [Console] Set description as first parameter to
 Argument and Option attributes

---
 src/Symfony/Component/Console/Attribute/Argument.php | 2 +-
 src/Symfony/Component/Console/Attribute/Option.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Console/Attribute/Argument.php b/src/Symfony/Component/Console/Attribute/Argument.php
index b5e45be3fe06a..22bfbf48b762d 100644
--- a/src/Symfony/Component/Console/Attribute/Argument.php
+++ b/src/Symfony/Component/Console/Attribute/Argument.php
@@ -35,8 +35,8 @@ class Argument
      * @param array<string|Suggestion>|callable(CompletionInput):list<string|Suggestion> $suggestedValues The values used for input completion
      */
     public function __construct(
-        public string $name = '',
         public string $description = '',
+        public string $name = '',
         array|callable $suggestedValues = [],
     ) {
         $this->suggestedValues = \is_callable($suggestedValues) ? $suggestedValues(...) : $suggestedValues;
diff --git a/src/Symfony/Component/Console/Attribute/Option.php b/src/Symfony/Component/Console/Attribute/Option.php
index a526b672389e3..099c7d0c23149 100644
--- a/src/Symfony/Component/Console/Attribute/Option.php
+++ b/src/Symfony/Component/Console/Attribute/Option.php
@@ -38,9 +38,9 @@ class Option
      * @param array<string|Suggestion>|callable(CompletionInput):list<string|Suggestion> $suggestedValues The values used for input completion
      */
     public function __construct(
+        public string $description = '',
         public string $name = '',
         public array|string|null $shortcut = null,
-        public string $description = '',
         array|callable $suggestedValues = [],
     ) {
         $this->suggestedValues = \is_callable($suggestedValues) ? $suggestedValues(...) : $suggestedValues;

From b3cc19472e292252033573cb7d73beff0c24059f Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Wed, 7 May 2025 09:05:04 +0200
Subject: [PATCH 31/49] properly skip signal test if the pcntl extension is not
 installed

---
 .../Tests/SignalRegistry/SignalMapTest.php       | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Symfony/Component/Console/Tests/SignalRegistry/SignalMapTest.php b/src/Symfony/Component/Console/Tests/SignalRegistry/SignalMapTest.php
index 73619049d6f4a..3a0c49bb01e21 100644
--- a/src/Symfony/Component/Console/Tests/SignalRegistry/SignalMapTest.php
+++ b/src/Symfony/Component/Console/Tests/SignalRegistry/SignalMapTest.php
@@ -18,19 +18,13 @@ class SignalMapTest extends TestCase
 {
     /**
      * @requires extension pcntl
-     * @dataProvider provideSignals
      */
-    public function testSignalExists(int $signal, string $expected)
+    public function testSignalExists()
     {
-        $this->assertSame($expected, SignalMap::getSignalName($signal));
-    }
-
-    public function provideSignals()
-    {
-        yield [\SIGINT, 'SIGINT'];
-        yield [\SIGKILL, 'SIGKILL'];
-        yield [\SIGTERM, 'SIGTERM'];
-        yield [\SIGSYS, 'SIGSYS'];
+        $this->assertSame('SIGINT', SignalMap::getSignalName(\SIGINT));
+        $this->assertSame('SIGKILL', SignalMap::getSignalName(\SIGKILL));
+        $this->assertSame('SIGTERM', SignalMap::getSignalName(\SIGTERM));
+        $this->assertSame('SIGSYS', SignalMap::getSignalName(\SIGSYS));
     }
 
     public function testSignalDoesNotExist()

From 680da0c11c15965c21b4fda6344a6c1d9dcdfac0 Mon Sep 17 00:00:00 2001
From: Hugo Alliaume <hugo@alliau.me>
Date: Thu, 8 May 2025 00:10:13 +0900
Subject: [PATCH 32/49] [FrameworkBundle] Ensure `Email` class exists before
 using it

---
 .../FrameworkBundle/DependencyInjection/Configuration.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 4d44c469fabe1..bae8967a8b723 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1067,7 +1067,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
                             ->validate()->castToArray()->end()
                         ->end()
                         ->scalarNode('translation_domain')->defaultValue('validators')->end()
-                        ->enumNode('email_validation_mode')->values(Email::VALIDATION_MODES + ['loose'])->end()
+                        ->enumNode('email_validation_mode')->values((class_exists(Email::class) ? Email::VALIDATION_MODES : ['html5-allow-no-tld', 'html5', 'strict']) + ['loose'])->end()
                         ->arrayNode('mapping')
                             ->addDefaultsIfNotSet()
                             ->fixXmlConfig('path')

From 152df5435b0cf3e049915fc25a1d90013dd3874f Mon Sep 17 00:00:00 2001
From: Ruud Seberechts <ruud.seberechts@uniweb.eu>
Date: Wed, 7 May 2025 17:39:53 +0200
Subject: [PATCH 33/49] [PropertyAccess] Improve PropertyAccessor::setValue
 param docs

Added param-out for the $objectOrArray argument so static code analysis
does not assume the passed object can change type or become an array
---
 src/Symfony/Component/PropertyAccess/PropertyAccessor.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index 9a2c82d0dcf61..8685407861ed1 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -109,6 +109,11 @@ public function getValue(object|array $objectOrArray, string|PropertyPathInterfa
         return $propertyValues[\count($propertyValues) - 1][self::VALUE];
     }
 
+    /**
+     * @template T of object|array
+     * @param T $objectOrArray
+     * @param-out ($objectOrArray is array ? array : T) $objectOrArray
+     */
     public function setValue(object|array &$objectOrArray, string|PropertyPathInterface $propertyPath, mixed $value): void
     {
         if (\is_object($objectOrArray) && (false === strpbrk((string) $propertyPath, '.[') || $objectOrArray instanceof \stdClass && property_exists($objectOrArray, $propertyPath))) {

From 0b3d980d553552fe9c010e0db5d1a1237af0c8f9 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Wed, 7 May 2025 23:08:36 +0200
Subject: [PATCH 34/49] fix tests

Since #60076 using a closure as the command code that does not return an
integer is deprecated. This means that our tests can trigger deprecations
on older branches when the high deps job is run. This usually is not an
issue as we silence them with the `SYMFONY_DEPRECATIONS_HELPER` env var.
However, phpt tests are run in a child process where the deprecation error
handler of the PHPUnit bridge doesn't step in. Thus, for them deprecations
are not silenced leading to failures.
---
 src/Symfony/Component/Runtime/Tests/phpt/application.php      | 4 +++-
 src/Symfony/Component/Runtime/Tests/phpt/command.php          | 4 +++-
 .../phpt/dotenv_overload_command_debug_exists_0_to_1.php      | 4 +++-
 .../phpt/dotenv_overload_command_debug_exists_1_to_0.php      | 4 +++-
 .../Runtime/Tests/phpt/dotenv_overload_command_env_exists.php | 4 +++-
 .../Runtime/Tests/phpt/dotenv_overload_command_no_debug.php   | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Runtime/Tests/phpt/application.php b/src/Symfony/Component/Runtime/Tests/phpt/application.php
index 1e1014e9f3e5a..ca2de555edfb7 100644
--- a/src/Symfony/Component/Runtime/Tests/phpt/application.php
+++ b/src/Symfony/Component/Runtime/Tests/phpt/application.php
@@ -18,8 +18,10 @@
 
 return function (array $context) {
     $command = new Command('go');
-    $command->setCode(function (InputInterface $input, OutputInterface $output) use ($context) {
+    $command->setCode(function (InputInterface $input, OutputInterface $output) use ($context): int {
         $output->write('OK Application '.$context['SOME_VAR']);
+
+        return 0;
     });
 
     $app = new Application();
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/command.php b/src/Symfony/Component/Runtime/Tests/phpt/command.php
index 3a5fa11e00000..e307d195b113e 100644
--- a/src/Symfony/Component/Runtime/Tests/phpt/command.php
+++ b/src/Symfony/Component/Runtime/Tests/phpt/command.php
@@ -19,7 +19,9 @@
 return function (Command $command, InputInterface $input, OutputInterface $output, array $context) {
     $command->addOption('hello', 'e', InputOption::VALUE_REQUIRED, 'How should I greet?', 'OK');
 
-    return $command->setCode(function () use ($input, $output, $context) {
+    return $command->setCode(function () use ($input, $output, $context): int {
         $output->write($input->getOption('hello').' Command '.$context['SOME_VAR']);
+
+        return 0;
     });
 };
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 af6409dda62bc..2968e37ea02f4 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,6 +20,8 @@
 
 require __DIR__.'/autoload.php';
 
-return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): int {
     $output->writeln($context['DEBUG_ENABLED']);
+
+    return 0;
 });
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 78a0bf29448b8..1f2fa3590e16f 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,6 +20,8 @@
 
 require __DIR__.'/autoload.php';
 
-return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): int {
     $output->writeln($context['DEBUG_MODE']);
+
+    return 0;
 });
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 3e72372e5af06..8587f20f2382b 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,6 +20,8 @@
 
 require __DIR__.'/autoload.php';
 
-return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): int {
     $output->writeln($context['ENV_MODE']);
+
+    return 0;
 });
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 3fe4f44d7967b..4ab7694298f95 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,6 +19,8 @@
 
 require __DIR__.'/autoload.php';
 
-return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): int {
     $output->writeln($context['DEBUG_ENABLED']);
+
+    return 0;
 });

From 03e08301312c8507dfb5889682788649a5fb897d Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Thu, 8 May 2025 15:23:11 +0200
Subject: [PATCH 35/49] fix changelog

---
 src/Symfony/Bridge/Doctrine/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
index 3c660900e335f..961a0965d3431 100644
--- a/src/Symfony/Bridge/Doctrine/CHANGELOG.md
+++ b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -8,12 +8,12 @@ CHANGELOG
  * Deprecate the `DoctrineExtractor::getTypes()` method, use `DoctrineExtractor::getType()` instead
  * Add support for `Symfony\Component\Clock\DatePoint` as `DatePointType` Doctrine type
  * Improve exception message when `EntityValueResolver` gets no mapping information
+ * Add type aliases support to `EntityValueResolver`
 
 7.2
 ---
 
  * Accept `ReadableCollection` in `CollectionToArrayTransformer`
- * Add type aliases support to `EntityValueResolver`
 
 7.1
 ---

From 04a46d3721cdf5a7381f2ac6a18b78de7bc0d1ef Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Thu, 8 May 2025 15:32:34 +0200
Subject: [PATCH 36/49] make data provider static

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

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
index eae45736186b3..e5cc8522aafb4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -267,7 +267,7 @@ public function testValidatorEmailValidationMode(string $mode)
         });
     }
 
-    public function emailValidationModeProvider()
+    public static function emailValidationModeProvider()
     {
         foreach (Email::VALIDATION_MODES as $mode) {
             yield [$mode];

From 41a5462f0d478c8668696762c0419d656825e303 Mon Sep 17 00:00:00 2001
From: Kevin Bond <kevinbond@gmail.com>
Date: Thu, 23 Jan 2025 09:53:28 -0500
Subject: [PATCH 37/49] [Console] `#[Option]` rules & restrictions

---
 .../Component/Console/Attribute/Option.php    | 12 +++++
 .../Tests/Command/InvokableCommandTest.php    | 47 +++++++++++++++----
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Console/Attribute/Option.php b/src/Symfony/Component/Console/Attribute/Option.php
index 099c7d0c23149..4aea4831e9ac6 100644
--- a/src/Symfony/Component/Console/Attribute/Option.php
+++ b/src/Symfony/Component/Console/Attribute/Option.php
@@ -80,6 +80,18 @@ public static function tryFrom(\ReflectionParameter $parameter): ?self
         $self->default = $parameter->getDefaultValue();
         $self->allowNull = $parameter->allowsNull();
 
+        if ('bool' === $self->typeName && $self->allowNull && \in_array($self->default, [true, false], true)) {
+            throw new LogicException(\sprintf('The option parameter "$%s" must not be nullable when it has a default boolean value.', $name));
+        }
+
+        if ('string' === $self->typeName && null === $self->default) {
+            throw new LogicException(\sprintf('The option parameter "$%s" must not have a default of null.', $name));
+        }
+
+        if ('array' === $self->typeName && $self->allowNull) {
+            throw new LogicException(\sprintf('The option parameter "$%s" must not be nullable.', $name));
+        }
+
         if ('bool' === $self->typeName) {
             $self->mode = InputOption::VALUE_NONE;
             if (false !== $self->default) {
diff --git a/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php b/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
index d355c44ce5f9b..88f1b78701e0a 100644
--- a/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/InvokableCommandTest.php
@@ -261,13 +261,15 @@ public function testNonBinaryInputOptions(array $parameters, array $expected)
     {
         $command = new Command('foo');
         $command->setCode(function (
-            #[Option] ?string $a = null,
-            #[Option] ?string $b = 'b',
-            #[Option] ?array $c = [],
+            #[Option] string $a = '',
+            #[Option] ?string $b = '',
+            #[Option] array $c = [],
+            #[Option] array $d = ['a', 'b'],
         ) use ($expected): int {
             $this->assertSame($expected[0], $a);
             $this->assertSame($expected[1], $b);
             $this->assertSame($expected[2], $c);
+            $this->assertSame($expected[3], $d);
 
             return 0;
         });
@@ -277,22 +279,49 @@ public function testNonBinaryInputOptions(array $parameters, array $expected)
 
     public static function provideNonBinaryInputOptions(): \Generator
     {
-        yield 'defaults' => [[], [null, 'b', []]];
-        yield 'with-value' => [['--a' => 'x', '--b' => 'y', '--c' => ['z']], ['x', 'y', ['z']]];
-        yield 'without-value' => [['--a' => null, '--b' => null, '--c' => null], [null, null, null]];
+        yield 'defaults' => [[], ['', '', [], ['a', 'b']]];
+        yield 'with-value' => [['--a' => 'x', '--b' => 'y', '--c' => ['z'], '--d' => ['c', 'd']], ['x', 'y', ['z'], ['c', 'd']]];
+        yield 'without-value' => [['--b' => null], ['', null, [], ['a', 'b']]];
     }
 
-    public function testInvalidOptionDefinition()
+    /**
+     * @dataProvider provideInvalidOptionDefinitions
+     */
+    public function testInvalidOptionDefinition(callable $code, string $expectedMessage)
     {
         $command = new Command('foo');
-        $command->setCode(function (#[Option] string $a) {});
+        $command->setCode($code);
 
         $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The option parameter "$a" must declare a default value.');
+        $this->expectExceptionMessage($expectedMessage);
 
         $command->getDefinition();
     }
 
+    public static function provideInvalidOptionDefinitions(): \Generator
+    {
+        yield 'no-default' => [
+            function (#[Option] string $a) {},
+            'The option parameter "$a" must declare a default value.',
+        ];
+        yield 'nullable-bool-default-true' => [
+            function (#[Option] ?bool $a = true) {},
+            'The option parameter "$a" must not be nullable when it has a default boolean value.',
+        ];
+        yield 'nullable-bool-default-false' => [
+            function (#[Option] ?bool $a = false) {},
+            'The option parameter "$a" must not be nullable when it has a default boolean value.',
+        ];
+        yield 'nullable-string' => [
+            function (#[Option] ?string $a = null) {},
+            'The option parameter "$a" must not have a default of null.',
+        ];
+        yield 'nullable-array' => [
+            function (#[Option] ?array $a = null) {},
+            'The option parameter "$a" must not be nullable.',
+        ];
+    }
+
     public function testInvalidRequiredValueOptionEvenWithDefault()
     {
         $command = new Command('foo');

From 2eaa7ee0fd9d9335e156534b8d062fdfa4134a31 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Thu, 8 May 2025 11:03:40 +0200
Subject: [PATCH 38/49] [Security] Avoid failing when
 PersistentRememberMeHandler handles a malformed cookie

---
 .../RememberMe/PersistentRememberMeHandler.php   |  7 ++++++-
 .../PersistentRememberMeHandlerTest.php          | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php
index 2293666ae7ecb..ad1d990fd74ff 100644
--- a/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php
+++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php
@@ -160,7 +160,12 @@ public function clearRememberMeCookie(): void
             return;
         }
 
-        $rememberMeDetails = RememberMeDetails::fromRawCookie($cookie);
+        try {
+            $rememberMeDetails = RememberMeDetails::fromRawCookie($cookie);
+        } catch (AuthenticationException) {
+            // malformed cookie should not fail the response and can be simply ignored
+            return;
+        }
         [$series] = explode(':', $rememberMeDetails->getValue());
         $this->tokenProvider->deleteTokenBySeries($series);
     }
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
index a5bdac65118d8..bd539341c3f6c 100644
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentRememberMeHandlerTest.php
@@ -74,6 +74,22 @@ public function testClearRememberMeCookie()
         $this->assertNull($cookie->getValue());
     }
 
+    public function testClearRememberMeCookieMalformedCookie()
+    {
+        $this->tokenProvider->expects($this->exactly(0))
+            ->method('deleteTokenBySeries');
+
+        $this->request->cookies->set('REMEMBERME', 'malformed');
+
+        $this->handler->clearRememberMeCookie();
+
+        $this->assertTrue($this->request->attributes->has(ResponseListener::COOKIE_ATTR_NAME));
+
+        /** @var Cookie $cookie */
+        $cookie = $this->request->attributes->get(ResponseListener::COOKIE_ATTR_NAME);
+        $this->assertNull($cookie->getValue());
+    }
+
     public function testConsumeRememberMeCookieValid()
     {
         $this->tokenProvider->expects($this->any())

From 023c44c89ad06acc6bb38f2da2a88dc7aa24918f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 9 May 2025 10:05:11 +0200
Subject: [PATCH 39/49] [DependencyInjection][FrameworkBundle] Fix precedence
 of App\Kernel alias and ignore container.excluded tag on synthetic services

---
 .../FrameworkExtension.php                    | 20 +++++++++----------
 .../Kernel/MicroKernelTrait.php               |  3 ++-
 .../ResolveInstanceofConditionalsPass.php     |  7 ++++++-
 .../ResolveInstanceofConditionalsPassTest.php | 15 ++++++++++++++
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 2dd6ed95ee808..4b18b38177047 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -791,34 +791,34 @@ static function (ChildDefinition $definition, AsPeriodicTask|AsCronTask $attribu
         }
 
         $container->registerForAutoconfiguration(CompilerPassInterface::class)
-            ->addTag('container.excluded', ['source' => 'because it\'s a compiler pass'])->setAbstract(true);
+            ->addTag('container.excluded', ['source' => 'because it\'s a compiler pass']);
         $container->registerForAutoconfiguration(Constraint::class)
-            ->addTag('container.excluded', ['source' => 'because it\'s a validation constraint'])->setAbstract(true);
+            ->addTag('container.excluded', ['source' => 'because it\'s a validation constraint']);
         $container->registerForAutoconfiguration(TestCase::class)
-            ->addTag('container.excluded', ['source' => 'because it\'s a test case'])->setAbstract(true);
+            ->addTag('container.excluded', ['source' => 'because it\'s a test case']);
         $container->registerForAutoconfiguration(\UnitEnum::class)
-            ->addTag('container.excluded', ['source' => 'because it\'s an enum'])->setAbstract(true);
+            ->addTag('container.excluded', ['source' => 'because it\'s an enum']);
         $container->registerAttributeForAutoconfiguration(AsMessage::class, static function (ChildDefinition $definition) {
-            $definition->addTag('container.excluded', ['source' => 'because it\'s a messenger message'])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => 'because it\'s a messenger message']);
         });
         $container->registerAttributeForAutoconfiguration(\Attribute::class, static function (ChildDefinition $definition) {
-            $definition->addTag('container.excluded', ['source' => 'because it\'s an attribute'])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => 'because it\'s a PHP attribute']);
         });
         $container->registerAttributeForAutoconfiguration(Entity::class, static function (ChildDefinition $definition) {
-            $definition->addTag('container.excluded', ['source' => 'because it\'s a doctrine entity'])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => 'because it\'s a Doctrine entity']);
         });
         $container->registerAttributeForAutoconfiguration(Embeddable::class, static function (ChildDefinition $definition) {
-            $definition->addTag('container.excluded', ['source' => 'because it\'s a doctrine embeddable'])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => 'because it\'s a Doctrine embeddable']);
         });
         $container->registerAttributeForAutoconfiguration(MappedSuperclass::class, static function (ChildDefinition $definition) {
-            $definition->addTag('container.excluded', ['source' => 'because it\'s a doctrine mapped superclass'])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => 'because it\'s a Doctrine mapped superclass']);
         });
 
         $container->registerAttributeForAutoconfiguration(JsonStreamable::class, static function (ChildDefinition $definition, JsonStreamable $attribute) {
             $definition->addTag('json_streamer.streamable', [
                 'object' => $attribute->asObject,
                 'list' => $attribute->asList,
-            ])->addTag('container.excluded', ['source' => 'because it\'s a streamable JSON'])->setAbstract(true);
+            ])->addTag('container.excluded', ['source' => 'because it\'s a streamable JSON']);
         });
 
         if (!$container->getParameter('kernel.debug')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
index 28d616c13e1c1..f40373a302b45 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -165,7 +165,6 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
                     ->setPublic(true)
                 ;
             }
-            $container->setAlias($kernelClass, 'kernel')->setPublic(true);
 
             $kernelDefinition = $container->getDefinition('kernel');
             $kernelDefinition->addTag('routing.route_loader');
@@ -198,6 +197,8 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
                 $kernelLoader->registerAliasesForSinglyImplementedInterfaces();
                 AbstractConfigurator::$valuePreProcessor = $valuePreProcessor;
             }
+
+            $container->setAlias($kernelClass, 'kernel')->setPublic(true);
         });
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
index 90d4569c42bc4..52dc56c0f371b 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInstanceofConditionalsPass.php
@@ -112,8 +112,8 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
                 $definition = substr_replace($definition, '53', 2, 2);
                 $definition = substr_replace($definition, 'Child', 44, 0);
             }
-            /** @var ChildDefinition $definition */
             $definition = unserialize($definition);
+            /** @var ChildDefinition $definition */
             $definition->setParent($parent);
 
             if (null !== $shared && !isset($definition->getChanges()['shared'])) {
@@ -149,6 +149,11 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
                 ->setAbstract(true);
         }
 
+        if ($definition->isSynthetic()) {
+            // Ignore container.excluded tag on synthetic services
+            $definition->clearTag('container.excluded');
+        }
+
         return $definition;
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
index 76143fc9b91cb..b4e50d39f2eae 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -376,6 +376,21 @@ public function testDecoratorsKeepBehaviorDescribingTags()
         ], $container->getDefinition('decorator')->getTags());
         $this->assertFalse($container->hasParameter('container.behavior_describing_tags'));
     }
+
+    public function testSyntheticService()
+    {
+        $container = new ContainerBuilder();
+        $container->register('kernel', \stdClass::class)
+            ->setInstanceofConditionals([
+                \stdClass::class => (new ChildDefinition(''))
+                    ->addTag('container.excluded'),
+            ])
+            ->setSynthetic(true);
+
+        (new ResolveInstanceofConditionalsPass())->process($container);
+
+        $this->assertSame([], $container->getDefinition('kernel')->getTags());
+    }
 }
 
 class DecoratorWithBehavior implements ResetInterface, ResourceCheckerInterface, ServiceSubscriberInterface

From bb97a2a2399341f9e47884287f754cc49d991934 Mon Sep 17 00:00:00 2001
From: HypeMC <hypemc@gmail.com>
Date: Fri, 9 May 2025 13:44:27 +0200
Subject: [PATCH 40/49] [Console] Add support for `SignalableCommandInterface`
 with invokable commands

---
 src/Symfony/Component/Console/Application.php |  4 +-
 src/Symfony/Component/Console/CHANGELOG.md    |  1 +
 .../Component/Console/Command/Command.php     | 12 ++-
 .../Console/Command/InvokableCommand.php      | 14 +++-
 .../Console/Command/TraceableCommand.php      |  8 +-
 .../Console/Tests/ApplicationTest.php         | 74 ++++++++++++++++++-
 .../AddConsoleCommandPassTest.php             | 40 ++++++++++
 .../Tests/Fixtures/application_signalable.php |  3 +-
 .../Tests/phpt/alarm/command_exit.phpt        |  3 +-
 .../Tests/phpt/signal/command_exit.phpt       |  3 +-
 10 files changed, 141 insertions(+), 21 deletions(-)

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 78d885d2597a9..b4539fa1eeb50 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Console\Command\HelpCommand;
 use Symfony\Component\Console\Command\LazyCommand;
 use Symfony\Component\Console\Command\ListCommand;
-use Symfony\Component\Console\Command\SignalableCommandInterface;
 use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
 use Symfony\Component\Console\Completion\CompletionInput;
 use Symfony\Component\Console\Completion\CompletionSuggestions;
@@ -1005,8 +1004,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
             }
         }
 
-        $commandSignals = $command instanceof SignalableCommandInterface ? $command->getSubscribedSignals() : [];
-        if ($commandSignals || $this->dispatcher && $this->signalsToDispatchEvent) {
+        if (($commandSignals = $command->getSubscribedSignals()) || $this->dispatcher && $this->signalsToDispatchEvent) {
             $signalRegistry = $this->getSignalRegistry();
 
             if (Terminal::hasSttyAvailable()) {
diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md
index b84099a1d0e10..9f3ae3d7d2326 100644
--- a/src/Symfony/Component/Console/CHANGELOG.md
+++ b/src/Symfony/Component/Console/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG
  * Add support for `LockableTrait` in invokable commands
  * Deprecate returning a non-integer value from a `\Closure` function set via `Command::setCode()`
  * Mark `#[AsCommand]` attribute as `@final`
+ * Add support for `SignalableCommandInterface` with invokable commands
 
 7.2
 ---
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index c93340a77ad95..f6cd8499791f1 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -32,7 +32,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Command
+class Command implements SignalableCommandInterface
 {
     // see https://tldp.org/LDP/abs/html/exitcodes.html
     public const SUCCESS = 0;
@@ -674,6 +674,16 @@ public function getHelper(string $name): HelperInterface
         return $this->helperSet->get($name);
     }
 
+    public function getSubscribedSignals(): array
+    {
+        return $this->code?->getSubscribedSignals() ?? [];
+    }
+
+    public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
+    {
+        return $this->code?->handleSignal($signal, $previousExitCode) ?? false;
+    }
+
     /**
      * Validates a command name.
      *
diff --git a/src/Symfony/Component/Console/Command/InvokableCommand.php b/src/Symfony/Component/Console/Command/InvokableCommand.php
index 329d8b253cfb8..72ff407c81fdf 100644
--- a/src/Symfony/Component/Console/Command/InvokableCommand.php
+++ b/src/Symfony/Component/Console/Command/InvokableCommand.php
@@ -28,9 +28,10 @@
  *
  * @internal
  */
-class InvokableCommand
+class InvokableCommand implements SignalableCommandInterface
 {
     private readonly \Closure $code;
+    private readonly ?SignalableCommandInterface $signalableCommand;
     private readonly \ReflectionFunction $reflection;
     private bool $triggerDeprecations = false;
 
@@ -39,6 +40,7 @@ public function __construct(
         callable $code,
     ) {
         $this->code = $this->getClosure($code);
+        $this->signalableCommand = $code instanceof SignalableCommandInterface ? $code : null;
         $this->reflection = new \ReflectionFunction($this->code);
     }
 
@@ -142,4 +144,14 @@ private function getParameters(InputInterface $input, OutputInterface $output):
 
         return $parameters ?: [$input, $output];
     }
+
+    public function getSubscribedSignals(): array
+    {
+        return $this->signalableCommand?->getSubscribedSignals() ?? [];
+    }
+
+    public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
+    {
+        return $this->signalableCommand?->handleSignal($signal, $previousExitCode) ?? false;
+    }
 }
diff --git a/src/Symfony/Component/Console/Command/TraceableCommand.php b/src/Symfony/Component/Console/Command/TraceableCommand.php
index 659798e651c46..315f385de9aa2 100644
--- a/src/Symfony/Component/Console/Command/TraceableCommand.php
+++ b/src/Symfony/Component/Console/Command/TraceableCommand.php
@@ -27,7 +27,7 @@
  *
  * @author Jules Pietri <jules@heahprod.com>
  */
-final class TraceableCommand extends Command implements SignalableCommandInterface
+final class TraceableCommand extends Command
 {
     public readonly Command $command;
     public int $exitCode;
@@ -89,15 +89,11 @@ public function __call(string $name, array $arguments): mixed
 
     public function getSubscribedSignals(): array
     {
-        return $this->command instanceof SignalableCommandInterface ? $this->command->getSubscribedSignals() : [];
+        return $this->command->getSubscribedSignals();
     }
 
     public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
     {
-        if (!$this->command instanceof SignalableCommandInterface) {
-            return false;
-        }
-
         $event = $this->stopwatch->start($this->getName().'.handle_signal');
 
         $exit = $this->command->handleSignal($signal, $previousExitCode);
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index c5c796517c17a..268f8ba501a9e 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -2255,6 +2255,41 @@ public function testSignalableRestoresStty()
         $this->assertSame($previousSttyMode, $sttyMode);
     }
 
+    /**
+     * @requires extension pcntl
+     */
+    public function testSignalableInvokableCommand()
+    {
+        $command = new Command();
+        $command->setName('signal-invokable');
+        $command->setCode($invokable = new class implements SignalableCommandInterface {
+            use SignalableInvokableCommandTrait;
+        });
+
+        $application = $this->createSignalableApplication($command, null);
+        $application->setSignalsToDispatchEvent(\SIGUSR1);
+
+        $this->assertSame(1, $application->run(new ArrayInput(['signal-invokable'])));
+        $this->assertTrue($invokable->signaled);
+    }
+
+    /**
+     * @requires extension pcntl
+     */
+    public function testSignalableInvokableCommandThatExtendsBaseCommand()
+    {
+        $command = new class extends Command implements SignalableCommandInterface {
+            use SignalableInvokableCommandTrait;
+        };
+        $command->setName('signal-invokable');
+
+        $application = $this->createSignalableApplication($command, null);
+        $application->setSignalsToDispatchEvent(\SIGUSR1);
+
+        $this->assertSame(1, $application->run(new ArrayInput(['signal-invokable'])));
+        $this->assertTrue($command->signaled);
+    }
+
     /**
      * @requires extension pcntl
      */
@@ -2514,7 +2549,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 }
 
 #[AsCommand(name: 'signal')]
-class SignableCommand extends BaseSignableCommand implements SignalableCommandInterface
+class SignableCommand extends BaseSignableCommand
 {
     public function getSubscribedSignals(): array
     {
@@ -2531,7 +2566,7 @@ public function handleSignal(int $signal, int|false $previousExitCode = 0): int|
 }
 
 #[AsCommand(name: 'signal')]
-class TerminatableCommand extends BaseSignableCommand implements SignalableCommandInterface
+class TerminatableCommand extends BaseSignableCommand
 {
     public function getSubscribedSignals(): array
     {
@@ -2548,7 +2583,7 @@ public function handleSignal(int $signal, int|false $previousExitCode = 0): int|
 }
 
 #[AsCommand(name: 'signal')]
-class TerminatableWithEventCommand extends Command implements SignalableCommandInterface, EventSubscriberInterface
+class TerminatableWithEventCommand extends Command implements EventSubscriberInterface
 {
     private bool $shouldContinue = true;
     private OutputInterface $output;
@@ -2615,8 +2650,39 @@ public static function getSubscribedEvents(): array
     }
 }
 
+trait SignalableInvokableCommandTrait
+{
+    public bool $signaled = false;
+
+    public function __invoke(): int
+    {
+        posix_kill(posix_getpid(), \SIGUSR1);
+
+        for ($i = 0; $i < 1000; ++$i) {
+            usleep(100);
+            if ($this->signaled) {
+                return 1;
+            }
+        }
+
+        return 0;
+    }
+
+    public function getSubscribedSignals(): array
+    {
+        return SignalRegistry::isSupported() ? [\SIGUSR1] : [];
+    }
+
+    public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
+    {
+        $this->signaled = true;
+
+        return false;
+    }
+}
+
 #[AsCommand(name: 'alarm')]
-class AlarmableCommand extends BaseSignableCommand implements SignalableCommandInterface
+class AlarmableCommand extends BaseSignableCommand
 {
     public function __construct(private int $alarmInterval)
     {
diff --git a/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
index 8a0c1e6b2bbf5..9ac660100ea0d 100644
--- a/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
+++ b/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Command\LazyCommand;
+use Symfony\Component\Console\Command\SignalableCommandInterface;
 use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
 use Symfony\Component\Console\DependencyInjection\AddConsoleCommandPass;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
@@ -325,6 +326,27 @@ public function testProcessInvokableCommand()
         self::assertSame('The command description', $command->getDescription());
         self::assertSame('The %command.name% command help content.', $command->getHelp());
     }
+
+    public function testProcessInvokableSignalableCommand()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass(), PassConfig::TYPE_BEFORE_REMOVING);
+
+        $definition = new Definition(InvokableSignalableCommand::class);
+        $definition->addTag('console.command', [
+            'command' => 'invokable-signalable',
+            'description' => 'The command description',
+            'help' => 'The %command.name% command help content.',
+        ]);
+        $container->setDefinition('invokable_signalable_command', $definition);
+
+        $container->compile();
+        $command = $container->get('console.command_loader')->get('invokable-signalable');
+
+        self::assertTrue($container->has('invokable_signalable_command.command'));
+        self::assertSame('The command description', $command->getDescription());
+        self::assertSame('The %command.name% command help content.', $command->getHelp());
+    }
 }
 
 class MyCommand extends Command
@@ -361,3 +383,21 @@ public function __invoke(): void
     {
     }
 }
+
+#[AsCommand(name: 'invokable-signalable', description: 'Just testing', help: 'The %command.name% help content.')]
+class InvokableSignalableCommand implements SignalableCommandInterface
+{
+    public function __invoke(): void
+    {
+    }
+
+    public function getSubscribedSignals(): array
+    {
+        return [];
+    }
+
+    public function handleSignal(int $signal, false|int $previousExitCode = 0): int|false
+    {
+        return false;
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_signalable.php b/src/Symfony/Component/Console/Tests/Fixtures/application_signalable.php
index c737ba1bf79c7..cc1bae6acdf7f 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_signalable.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_signalable.php
@@ -1,6 +1,5 @@
 <?php
 
-use Symfony\Component\Console\Command\SignalableCommandInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ChoiceQuestion;
@@ -12,7 +11,7 @@
 }
 require $vendor.'/vendor/autoload.php';
 
-(new class extends SingleCommandApplication implements SignalableCommandInterface {
+(new class extends SingleCommandApplication {
     public function getSubscribedSignals(): array
     {
         return [SIGINT];
diff --git a/src/Symfony/Component/Console/Tests/phpt/alarm/command_exit.phpt b/src/Symfony/Component/Console/Tests/phpt/alarm/command_exit.phpt
index d3015ad9dbcf6..c2cf3edc7d1c0 100644
--- a/src/Symfony/Component/Console/Tests/phpt/alarm/command_exit.phpt
+++ b/src/Symfony/Component/Console/Tests/phpt/alarm/command_exit.phpt
@@ -7,7 +7,6 @@ Test command that exits
 
 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;
@@ -19,7 +18,7 @@ while (!file_exists($vendor.'/vendor')) {
 }
 require $vendor.'/vendor/autoload.php';
 
-class MyCommand extends Command implements SignalableCommandInterface
+class MyCommand extends Command
 {
     protected function initialize(InputInterface $input, OutputInterface $output): void
     {
diff --git a/src/Symfony/Component/Console/Tests/phpt/signal/command_exit.phpt b/src/Symfony/Component/Console/Tests/phpt/signal/command_exit.phpt
index 379476189d4b4..e14f80c47afee 100644
--- a/src/Symfony/Component/Console/Tests/phpt/signal/command_exit.phpt
+++ b/src/Symfony/Component/Console/Tests/phpt/signal/command_exit.phpt
@@ -7,7 +7,6 @@ Test command that exits
 
 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;
@@ -19,7 +18,7 @@ while (!file_exists($vendor.'/vendor')) {
 }
 require $vendor.'/vendor/autoload.php';
 
-class MyCommand extends Command implements SignalableCommandInterface
+class MyCommand extends Command
 {
     protected function execute(InputInterface $input, OutputInterface $output): int
     {

From 572ebe8a80432e755e8729b07582c53a8db8a699 Mon Sep 17 00:00:00 2001
From: Giuseppe Arcuti <giuseppe_arcuti@fastmail.com>
Date: Sat, 7 Dec 2024 12:56:32 +0100
Subject: [PATCH 41/49] [DoctrineBridge] Fix UniqueEntity for non-integer
 identifiers

---
 .../Tests/Fixtures/UserUuidNameDto.php        | 24 +++++++++++++++
 .../Tests/Fixtures/UserUuidNameEntity.php     | 29 +++++++++++++++++++
 .../Constraints/UniqueEntityValidatorTest.php | 25 ++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameDto.php
 create mode 100644 src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameEntity.php

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameDto.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameDto.php
new file mode 100644
index 0000000000000..8c2c60d21ba85
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameDto.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\Bridge\Doctrine\Tests\Fixtures;
+
+use Symfony\Component\Uid\Uuid;
+
+class UserUuidNameDto
+{
+    public function __construct(
+        public ?Uuid $id,
+        public ?string $fullName,
+        public ?string $address,
+    ) {
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameEntity.php
new file mode 100644
index 0000000000000..3ac3ead8d201a
--- /dev/null
+++ b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/UserUuidNameEntity.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\Doctrine\Tests\Fixtures;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\Id;
+use Symfony\Component\Uid\Uuid;
+
+#[Entity]
+class UserUuidNameEntity
+{
+    public function __construct(
+        #[Id, Column]
+        public ?Uuid $id = null,
+        #[Column(unique: true)]
+        public ?string $fullName = null,
+    ) {
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
index a985eaae7b2dc..4d7a9b1f78f77 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -41,9 +41,12 @@
 use Symfony\Bridge\Doctrine\Tests\Fixtures\UpdateCompositeIntIdEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\UpdateCompositeObjectNoToStringIdEntity;
 use Symfony\Bridge\Doctrine\Tests\Fixtures\UpdateEmployeeProfile;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\UserUuidNameDto;
+use Symfony\Bridge\Doctrine\Tests\Fixtures\UserUuidNameEntity;
 use Symfony\Bridge\Doctrine\Tests\TestRepositoryFactory;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator;
+use Symfony\Component\Uid\Uuid;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 use Symfony\Component\Validator\Exception\UnexpectedValueException;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -116,6 +119,7 @@ private function createSchema($em)
             $em->getClassMetadata(Employee::class),
             $em->getClassMetadata(CompositeObjectNoToStringIdEntity::class),
             $em->getClassMetadata(SingleIntIdStringWrapperNameEntity::class),
+            $em->getClassMetadata(UserUuidNameEntity::class),
         ]);
     }
 
@@ -1401,4 +1405,25 @@ public function testEntityManagerNullObjectWhenDTODoctrineStyle()
 
         $this->validator->validate($dto, $constraint);
     }
+
+    public function testUuidIdentifierWithSameValueDifferentInstanceDoesNotCauseViolation()
+    {
+        $uuidString = 'ec562e21-1fc8-4e55-8de7-a42389ac75c5';
+        $existingPerson = new UserUuidNameEntity(Uuid::fromString($uuidString), 'Foo Bar');
+        $this->em->persist($existingPerson);
+        $this->em->flush();
+
+        $dto = new UserUuidNameDto(Uuid::fromString($uuidString), 'Foo Bar', '');
+
+        $constraint = new UniqueEntity(
+            fields: ['fullName'],
+            entityClass: UserUuidNameEntity::class,
+            identifierFieldNames: ['id'],
+            em: self::EM_NAME,
+        );
+
+        $this->validator->validate($dto, $constraint);
+
+        $this->assertNoViolation();
+    }
 }

From b0f012f474badce385bc755fd4c96c5105219207 Mon Sep 17 00:00:00 2001
From: wkania <wojciech.kania+github@gmail.com>
Date: Fri, 25 Apr 2025 19:34:41 +0200
Subject: [PATCH 42/49] [DoctrineBridge] Fix UniqueEntityValidator Stringable
 identifiers

---
 .../Validator/Constraints/UniqueEntityValidator.php         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
index 87eebbca142c6..4aed1cd3a44c2 100644
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -197,6 +197,12 @@ public function validate(mixed $value, Constraint $constraint): void
 
             foreach ($constraint->identifierFieldNames as $identifierFieldName) {
                 $propertyValue = $this->getPropertyValue($entityClass, $identifierFieldName, current($result));
+                if ($fieldValues[$identifierFieldName] instanceof \Stringable) {
+                    $fieldValues[$identifierFieldName] = (string) $fieldValues[$identifierFieldName];
+                }
+                if ($propertyValue instanceof \Stringable) {
+                    $propertyValue = (string) $propertyValue;
+                }
                 if ($fieldValues[$identifierFieldName] !== $propertyValue) {
                     $entityMatched = false;
                     break;

From 31be4cf7596e77d6d0bda4b383ef790391daba1f Mon Sep 17 00:00:00 2001
From: Nowfel2501 <nowfel2501@gmail.com>
Date: Fri, 9 May 2025 21:12:33 +0200
Subject: [PATCH 43/49] Improve readability of disallow_search_engine_index
 condition

---
 .../FrameworkBundle/DependencyInjection/FrameworkExtension.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index f585b5bbb784b..68386120e06b1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -735,7 +735,7 @@ static function (ChildDefinition $definition, AsPeriodicTask|AsCronTask $attribu
             $container->getDefinition('config_cache_factory')->setArguments([]);
         }
 
-        if (!$config['disallow_search_engine_index'] ?? false) {
+        if (!$config['disallow_search_engine_index']) {
             $container->removeDefinition('disallow_search_engine_index_response_listener');
         }
 

From dc598178fef53929eabb1fef604f7d29e05c9dbf Mon Sep 17 00:00:00 2001
From: Quentin Devos <4972091+Okhoshi@users.noreply.github.com>
Date: Sat, 9 Dec 2023 21:15:58 +0100
Subject: [PATCH 44/49] [FrameworkBundle] Make `ValidatorCacheWarmer` and
 `SerializeCacheWarmer` use `kernel.build_dir` instead of `kernel.cache_dir`

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  2 +
 .../CacheWarmer/SerializerCacheWarmer.php     |  3 +
 .../CacheWarmer/ValidatorCacheWarmer.php      |  4 +
 .../Resources/config/serializer.php           |  2 +-
 .../Resources/config/validator.php            |  2 +-
 .../CacheWarmer/SerializerCacheWarmerTest.php | 74 ++++++++++++++---
 .../CacheWarmer/ValidatorCacheWarmerTest.php  | 81 ++++++++++++++++---
 7 files changed, 146 insertions(+), 22 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index 8e70fb98e42fe..ec0d88fcea3f6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -25,6 +25,8 @@ CHANGELOG
  * Set `framework.rate_limiter.limiters.*.lock_factory` to `auto` by default
  * Deprecate `RateLimiterFactory` autowiring aliases, use `RateLimiterFactoryInterface` instead
  * Allow configuring compound rate limiters
+ * Make `ValidatorCacheWarmer` use `kernel.build_dir` instead of `cache_dir`
+ * Make `SerializeCacheWarmer` use `kernel.build_dir` instead of `cache_dir`
 
 7.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
index 46da4daaab4d1..fbf7083b70b28 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
@@ -41,6 +41,9 @@ public function __construct(
 
     protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool
     {
+        if (!$buildDir) {
+            return false;
+        }
         if (!$this->loaders) {
             return true;
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
index 6ecaa4bd14d01..9c313f80a8662 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -41,6 +41,10 @@ public function __construct(
 
     protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool
     {
+        if (!$buildDir) {
+            return false;
+        }
+
         $loaders = $this->validatorBuilder->getLoaders();
         $metadataFactory = new LazyLoadingMetadataFactory(new LoaderChain($loaders), $arrayAdapter);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
index 535b95a399248..e0a256bbe3640 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
@@ -56,7 +56,7 @@
 
 return static function (ContainerConfigurator $container) {
     $container->parameters()
-        ->set('serializer.mapping.cache.file', '%kernel.cache_dir%/serialization.php')
+        ->set('serializer.mapping.cache.file', '%kernel.build_dir%/serialization.php')
     ;
 
     $container->services()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
index adde2de238e05..535b42edc1bc3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.php
@@ -28,7 +28,7 @@
 
 return static function (ContainerConfigurator $container) {
     $container->parameters()
-        ->set('validator.mapping.cache.file', param('kernel.cache_dir').'/validation.php');
+        ->set('validator.mapping.cache.file', '%kernel.build_dir%/validation.php');
 
     $validatorsDir = \dirname((new \ReflectionClass(EmailValidator::class))->getFileName());
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
index 5feb0c8ec1bd7..9b765c36a18e6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
@@ -30,9 +30,50 @@ public function testWarmUp(array $loaders)
         @unlink($file);
 
         $warmer = new SerializerCacheWarmer($loaders, $file);
-        $warmer->warmUp(\dirname($file));
+        $warmer->warmUp(\dirname($file), \dirname($file));
+
+        $this->assertFileExists($file);
+
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person')->isHit());
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
+    }
+
+    /**
+     * @dataProvider loaderProvider
+     */
+    public function testWarmUpAbsoluteFilePath(array $loaders)
+    {
+        $file = sys_get_temp_dir().'/0/cache-serializer.php';
+        @unlink($file);
+
+        $cacheDir = sys_get_temp_dir().'/1';
+
+        $warmer = new SerializerCacheWarmer($loaders, $file);
+        $warmer->warmUp($cacheDir, $cacheDir);
 
         $this->assertFileExists($file);
+        $this->assertFileDoesNotExist($cacheDir.'/cache-serializer.php');
+
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Person')->isHit());
+        $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
+    }
+
+    /**
+     * @dataProvider loaderProvider
+     */
+    public function testWarmUpWithoutBuildDir(array $loaders)
+    {
+        $file = sys_get_temp_dir().'/cache-serializer.php';
+        @unlink($file);
+
+        $warmer = new SerializerCacheWarmer($loaders, $file);
+        $warmer->warmUp(\dirname($file));
+
+        $this->assertFileDoesNotExist($file);
 
         $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
 
@@ -66,7 +107,7 @@ public function testWarmUpWithoutLoader()
         @unlink($file);
 
         $warmer = new SerializerCacheWarmer([], $file);
-        $warmer->warmUp(\dirname($file));
+        $warmer->warmUp(\dirname($file), \dirname($file));
 
         $this->assertFileExists($file);
     }
@@ -79,7 +120,10 @@ public function testClassAutoloadException()
     {
         $this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_SerializerCacheWarmerTest', false));
 
-        $warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], tempnam(sys_get_temp_dir(), __FUNCTION__));
+        $file = tempnam(sys_get_temp_dir(), __FUNCTION__);
+        @unlink($file);
+
+        $warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], $file);
 
         spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
             if ($class === $mappedClass) {
@@ -87,7 +131,8 @@ public function testClassAutoloadException()
             }
         }, true, true);
 
-        $warmer->warmUp('foo');
+        $warmer->warmUp(\dirname($file), \dirname($file));
+        $this->assertFileExists($file);
 
         spl_autoload_unregister($classLoader);
     }
@@ -98,12 +143,12 @@ public function testClassAutoloadException()
      */
     public function testClassAutoloadExceptionWithUnrelatedException()
     {
-        $this->expectException(\DomainException::class);
-        $this->expectExceptionMessage('This exception should not be caught by the warmer.');
-
         $this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_SerializerCacheWarmerTest', false));
 
-        $warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], tempnam(sys_get_temp_dir(), __FUNCTION__));
+        $file = tempnam(sys_get_temp_dir(), __FUNCTION__);
+        @unlink($file);
+
+        $warmer = new SerializerCacheWarmer([new YamlFileLoader(__DIR__.'/../Fixtures/Serialization/Resources/does_not_exist.yaml')], basename($file));
 
         spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
             if ($class === $mappedClass) {
@@ -112,8 +157,17 @@ public function testClassAutoloadExceptionWithUnrelatedException()
             }
         }, true, true);
 
-        $warmer->warmUp('foo');
+        $this->expectException(\DomainException::class);
+        $this->expectExceptionMessage('This exception should not be caught by the warmer.');
+
+        try {
+            $warmer->warmUp(\dirname($file), \dirname($file));
+        } catch (\DomainException $e) {
+            $this->assertFileDoesNotExist($file);
 
-        spl_autoload_unregister($classLoader);
+            throw $e;
+        } finally {
+            spl_autoload_unregister($classLoader);
+        }
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php
index cc471e43fc685..af0bb1b50d3dd 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ValidatorCacheWarmerTest.php
@@ -32,7 +32,7 @@ public function testWarmUp()
         @unlink($file);
 
         $warmer = new ValidatorCacheWarmer($validatorBuilder, $file);
-        $warmer->warmUp(\dirname($file));
+        $warmer->warmUp(\dirname($file), \dirname($file));
 
         $this->assertFileExists($file);
 
@@ -42,6 +42,53 @@ public function testWarmUp()
         $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author')->isHit());
     }
 
+    public function testWarmUpAbsoluteFilePath()
+    {
+        $validatorBuilder = new ValidatorBuilder();
+        $validatorBuilder->addXmlMapping(__DIR__.'/../Fixtures/Validation/Resources/person.xml');
+        $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/author.yml');
+        $validatorBuilder->addMethodMapping('loadValidatorMetadata');
+        $validatorBuilder->enableAttributeMapping();
+
+        $file = sys_get_temp_dir().'/0/cache-validator.php';
+        @unlink($file);
+
+        $cacheDir = sys_get_temp_dir().'/1';
+
+        $warmer = new ValidatorCacheWarmer($validatorBuilder, $file);
+        $warmer->warmUp($cacheDir, $cacheDir);
+
+        $this->assertFileExists($file);
+        $this->assertFileDoesNotExist($cacheDir.'/cache-validator.php');
+
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+
+        $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Person')->isHit());
+        $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author')->isHit());
+    }
+
+    public function testWarmUpWithoutBuilDir()
+    {
+        $validatorBuilder = new ValidatorBuilder();
+        $validatorBuilder->addXmlMapping(__DIR__.'/../Fixtures/Validation/Resources/person.xml');
+        $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/author.yml');
+        $validatorBuilder->addMethodMapping('loadValidatorMetadata');
+        $validatorBuilder->enableAttributeMapping();
+
+        $file = sys_get_temp_dir().'/cache-validator.php';
+        @unlink($file);
+
+        $warmer = new ValidatorCacheWarmer($validatorBuilder, $file);
+        $warmer->warmUp(\dirname($file));
+
+        $this->assertFileDoesNotExist($file);
+
+        $arrayPool = new PhpArrayAdapter($file, new NullAdapter());
+
+        $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Person')->isHit());
+        $this->assertTrue($arrayPool->getItem('Symfony.Bundle.FrameworkBundle.Tests.Fixtures.Validation.Author')->isHit());
+    }
+
     public function testWarmUpWithAnnotations()
     {
         $validatorBuilder = new ValidatorBuilder();
@@ -52,7 +99,7 @@ public function testWarmUpWithAnnotations()
         @unlink($file);
 
         $warmer = new ValidatorCacheWarmer($validatorBuilder, $file);
-        $warmer->warmUp(\dirname($file));
+        $warmer->warmUp(\dirname($file), \dirname($file));
 
         $this->assertFileExists($file);
 
@@ -72,7 +119,7 @@ public function testWarmUpWithoutLoader()
         @unlink($file);
 
         $warmer = new ValidatorCacheWarmer($validatorBuilder, $file);
-        $warmer->warmUp(\dirname($file));
+        $warmer->warmUp(\dirname($file), \dirname($file));
 
         $this->assertFileExists($file);
     }
@@ -85,9 +132,12 @@ public function testClassAutoloadException()
     {
         $this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_ValidatorCacheWarmerTest', false));
 
+        $file = tempnam(sys_get_temp_dir(), __FUNCTION__);
+        @unlink($file);
+
         $validatorBuilder = new ValidatorBuilder();
         $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/does_not_exist.yaml');
-        $warmer = new ValidatorCacheWarmer($validatorBuilder, tempnam(sys_get_temp_dir(), __FUNCTION__));
+        $warmer = new ValidatorCacheWarmer($validatorBuilder, $file);
 
         spl_autoload_register($classloader = function ($class) use ($mappedClass) {
             if ($class === $mappedClass) {
@@ -95,7 +145,9 @@ public function testClassAutoloadException()
             }
         }, true, true);
 
-        $warmer->warmUp('foo');
+        $warmer->warmUp(\dirname($file), \dirname($file));
+
+        $this->assertFileExists($file);
 
         spl_autoload_unregister($classloader);
     }
@@ -106,14 +158,14 @@ public function testClassAutoloadException()
      */
     public function testClassAutoloadExceptionWithUnrelatedException()
     {
-        $this->expectException(\DomainException::class);
-        $this->expectExceptionMessage('This exception should not be caught by the warmer.');
+        $file = tempnam(sys_get_temp_dir(), __FUNCTION__);
+        @unlink($file);
 
         $this->assertFalse(class_exists($mappedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_ValidatorCacheWarmerTest', false));
 
         $validatorBuilder = new ValidatorBuilder();
         $validatorBuilder->addYamlMapping(__DIR__.'/../Fixtures/Validation/Resources/does_not_exist.yaml');
-        $warmer = new ValidatorCacheWarmer($validatorBuilder, tempnam(sys_get_temp_dir(), __FUNCTION__));
+        $warmer = new ValidatorCacheWarmer($validatorBuilder, basename($file));
 
         spl_autoload_register($classLoader = function ($class) use ($mappedClass) {
             if ($class === $mappedClass) {
@@ -122,8 +174,17 @@ public function testClassAutoloadExceptionWithUnrelatedException()
             }
         }, true, true);
 
-        $warmer->warmUp('foo');
+        $this->expectException(\DomainException::class);
+        $this->expectExceptionMessage('This exception should not be caught by the warmer.');
+
+        try {
+            $warmer->warmUp(\dirname($file), \dirname($file));
+        } catch (\DomainException $e) {
+            $this->assertFileDoesNotExist($file);
 
-        spl_autoload_unregister($classLoader);
+            throw $e;
+        } finally {
+            spl_autoload_unregister($classLoader);
+        }
     }
 }

From a69cf15e51cd1e42b5a34d448cc053a772ad05f5 Mon Sep 17 00:00:00 2001
From: ivelin vasilev <i.d.vasilevv@gmail.com>
Date: Thu, 8 May 2025 01:06:34 +0300
Subject: [PATCH 45/49] [HttpFoundation] Emit PHP warning when
 Response::sendHeaders() while output has already been sent

---
 src/Symfony/Component/HttpFoundation/Response.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
index 638b5bf601347..6766f2c77099e 100644
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@@ -317,6 +317,11 @@ public function sendHeaders(?int $statusCode = null): static
     {
         // headers have already been sent by the developer
         if (headers_sent()) {
+            if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
+                $statusCode ??= $this->statusCode;
+                header(\sprintf('HTTP/%s %s %s', $this->version, $statusCode, $this->statusText), true, $statusCode);
+            }
+
             return $this;
         }
 

From 6ab4c7f1fb5be3b29dc3533bd0d46132a8ccee08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Wed, 13 Mar 2024 18:34:52 +0100
Subject: [PATCH 46/49] [Workflow] Add support for executing custom workflow
 definition validators during the container compilation

---
 .../Bundle/FrameworkBundle/CHANGELOG.md       |  1 +
 .../DependencyInjection/Configuration.php     | 35 +++++++--
 .../FrameworkExtension.php                    | 35 +++++----
 .../FrameworkBundle/FrameworkBundle.php       |  2 +
 .../Resources/config/schema/symfony-1.0.xsd   |  1 +
 .../Validator/DefinitionValidator.php         | 16 ++++
 .../Fixtures/php/workflows.php                |  3 +
 .../Fixtures/xml/workflows.xml                |  1 +
 .../Fixtures/yml/workflows.yml                |  2 +
 .../FrameworkExtensionTestCase.php            | 12 ++-
 .../PhpFrameworkExtensionTest.php             | 61 ++++++++++++++-
 .../Bundle/FrameworkBundle/composer.json      |  4 +-
 .../WorkflowValidatorPass.php                 | 37 ++++++++++
 .../WorkflowValidatorPassTest.php             | 74 +++++++++++++++++++
 src/Symfony/Component/Workflow/composer.json  |  1 +
 15 files changed, 256 insertions(+), 29 deletions(-)
 create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/Workflow/Validator/DefinitionValidator.php
 create mode 100644 src/Symfony/Component/Workflow/DependencyInjection/WorkflowValidatorPass.php
 create mode 100644 src/Symfony/Component/Workflow/Tests/DependencyInjection/WorkflowValidatorPassTest.php

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
index f7a3766d66cb7..ce62c9cdf836b 100644
--- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -55,6 +55,7 @@ CHANGELOG
  * Allow configuring compound rate limiters
  * Make `ValidatorCacheWarmer` use `kernel.build_dir` instead of `cache_dir`
  * Make `SerializeCacheWarmer` use `kernel.build_dir` instead of `cache_dir`
+ * Support executing custom workflow validators during container compilation
 
 7.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
index 11dc781babd3d..4c40455526e57 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -52,6 +52,7 @@
 use Symfony\Component\Validator\Validation;
 use Symfony\Component\Webhook\Controller\WebhookController;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
+use Symfony\Component\Workflow\Validator\DefinitionValidatorInterface;
 use Symfony\Component\Workflow\WorkflowEvents;
 
 /**
@@ -403,6 +404,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                             ->useAttributeAsKey('name')
                             ->prototype('array')
                                 ->fixXmlConfig('support')
+                                ->fixXmlConfig('definition_validator')
                                 ->fixXmlConfig('place')
                                 ->fixXmlConfig('transition')
                                 ->fixXmlConfig('event_to_dispatch', 'events_to_dispatch')
@@ -432,11 +434,28 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                         ->prototype('scalar')
                                             ->cannotBeEmpty()
                                             ->validate()
-                                                ->ifTrue(fn ($v) => !class_exists($v) && !interface_exists($v, false))
+                                                ->ifTrue(static fn ($v) => !class_exists($v) && !interface_exists($v, false))
                                                 ->thenInvalid('The supported class or interface "%s" does not exist.')
                                             ->end()
                                         ->end()
                                     ->end()
+                                    ->arrayNode('definition_validators')
+                                        ->prototype('scalar')
+                                            ->cannotBeEmpty()
+                                            ->validate()
+                                                ->ifTrue(static fn ($v) => !class_exists($v))
+                                                ->thenInvalid('The validation class %s does not exist.')
+                                            ->end()
+                                            ->validate()
+                                                ->ifTrue(static fn ($v) => !is_a($v, DefinitionValidatorInterface::class, true))
+                                                ->thenInvalid(\sprintf('The validation class %%s is not an instance of "%s".', DefinitionValidatorInterface::class))
+                                            ->end()
+                                            ->validate()
+                                                ->ifTrue(static fn ($v) => 1 <= (new \ReflectionClass($v))->getConstructor()?->getNumberOfRequiredParameters())
+                                                ->thenInvalid('The %s validation class constructor must not have any arguments.')
+                                            ->end()
+                                        ->end()
+                                    ->end()
                                     ->scalarNode('support_strategy')
                                         ->cannotBeEmpty()
                                     ->end()
@@ -448,7 +467,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                     ->variableNode('events_to_dispatch')
                                         ->defaultValue(null)
                                         ->validate()
-                                            ->ifTrue(function ($v) {
+                                            ->ifTrue(static function ($v) {
                                                 if (null === $v) {
                                                     return false;
                                                 }
@@ -475,14 +494,14 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                     ->arrayNode('places')
                                         ->beforeNormalization()
                                             ->always()
-                                            ->then(function ($places) {
+                                            ->then(static function ($places) {
                                                 if (!\is_array($places)) {
                                                     throw new InvalidConfigurationException('The "places" option must be an array in workflow configuration.');
                                                 }
 
                                                 // It's an indexed array of shape  ['place1', 'place2']
                                                 if (isset($places[0]) && \is_string($places[0])) {
-                                                    return array_map(function (string $place) {
+                                                    return array_map(static function (string $place) {
                                                         return ['name' => $place];
                                                     }, $places);
                                                 }
@@ -522,7 +541,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                     ->arrayNode('transitions')
                                         ->beforeNormalization()
                                             ->always()
-                                            ->then(function ($transitions) {
+                                            ->then(static function ($transitions) {
                                                 if (!\is_array($transitions)) {
                                                     throw new InvalidConfigurationException('The "transitions" option must be an array in workflow configuration.');
                                                 }
@@ -589,20 +608,20 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                     ->end()
                                 ->end()
                                 ->validate()
-                                    ->ifTrue(function ($v) {
+                                    ->ifTrue(static function ($v) {
                                         return $v['supports'] && isset($v['support_strategy']);
                                     })
                                     ->thenInvalid('"supports" and "support_strategy" cannot be used together.')
                                 ->end()
                                 ->validate()
-                                    ->ifTrue(function ($v) {
+                                    ->ifTrue(static function ($v) {
                                         return !$v['supports'] && !isset($v['support_strategy']);
                                     })
                                     ->thenInvalid('"supports" or "support_strategy" should be configured.')
                                 ->end()
                                 ->beforeNormalization()
                                         ->always()
-                                        ->then(function ($values) {
+                                        ->then(static function ($values) {
                                             // Special case to deal with XML when the user wants an empty array
                                             if (\array_key_exists('event_to_dispatch', $values) && null === $values['event_to_dispatch']) {
                                                 $values['events_to_dispatch'] = [];
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 4b18b38177047..6df4d21df25ce 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1123,7 +1123,8 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                 }
             }
             $metadataStoreDefinition->replaceArgument(2, $transitionsMetadataDefinition);
-            $container->setDefinition(\sprintf('%s.metadata_store', $workflowId), $metadataStoreDefinition);
+            $metadataStoreId = \sprintf('%s.metadata_store', $workflowId);
+            $container->setDefinition($metadataStoreId, $metadataStoreDefinition);
 
             // Create places
             $places = array_column($workflow['places'], 'name');
@@ -1134,7 +1135,8 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             $definitionDefinition->addArgument($places);
             $definitionDefinition->addArgument($transitions);
             $definitionDefinition->addArgument($initialMarking);
-            $definitionDefinition->addArgument(new Reference(\sprintf('%s.metadata_store', $workflowId)));
+            $definitionDefinition->addArgument(new Reference($metadataStoreId));
+            $definitionDefinitionId = \sprintf('%s.definition', $workflowId);
 
             // Create MarkingStore
             $markingStoreDefinition = null;
@@ -1148,14 +1150,26 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                 $markingStoreDefinition = new Reference($workflow['marking_store']['service']);
             }
 
+            // Validation
+            $workflow['definition_validators'][] = match ($workflow['type']) {
+                'state_machine' => Workflow\Validator\StateMachineValidator::class,
+                'workflow' => Workflow\Validator\WorkflowValidator::class,
+                 default => throw new \LogicException(\sprintf('Invalid workflow type "%s".', $workflow['type'])),
+            };
+
             // Create Workflow
             $workflowDefinition = new ChildDefinition(\sprintf('%s.abstract', $type));
-            $workflowDefinition->replaceArgument(0, new Reference(\sprintf('%s.definition', $workflowId)));
+            $workflowDefinition->replaceArgument(0, new Reference($definitionDefinitionId));
             $workflowDefinition->replaceArgument(1, $markingStoreDefinition);
             $workflowDefinition->replaceArgument(3, $name);
             $workflowDefinition->replaceArgument(4, $workflow['events_to_dispatch']);
 
-            $workflowDefinition->addTag('workflow', ['name' => $name, 'metadata' => $workflow['metadata']]);
+            $workflowDefinition->addTag('workflow', [
+                'name' => $name,
+                'metadata' => $workflow['metadata'],
+                'definition_validators' => $workflow['definition_validators'],
+                'definition_id' => $definitionDefinitionId,
+            ]);
             if ('workflow' === $type) {
                 $workflowDefinition->addTag('workflow.workflow', ['name' => $name]);
             } elseif ('state_machine' === $type) {
@@ -1164,21 +1178,10 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
 
             // Store to container
             $container->setDefinition($workflowId, $workflowDefinition);
-            $container->setDefinition(\sprintf('%s.definition', $workflowId), $definitionDefinition);
+            $container->setDefinition($definitionDefinitionId, $definitionDefinition);
             $container->registerAliasForArgument($workflowId, WorkflowInterface::class, $name.'.'.$type);
             $container->registerAliasForArgument($workflowId, WorkflowInterface::class, $name);
 
-            // Validate Workflow
-            if ('state_machine' === $workflow['type']) {
-                $validator = new Workflow\Validator\StateMachineValidator();
-            } else {
-                $validator = new Workflow\Validator\WorkflowValidator();
-            }
-
-            $trs = array_map(fn (Reference $ref): Workflow\Transition => $container->get((string) $ref), $transitions);
-            $realDefinition = new Workflow\Definition($places, $trs, $initialMarking);
-            $validator->validate($realDefinition, $name);
-
             // Add workflow to Registry
             if ($workflow['supports']) {
                 foreach ($workflow['supports'] as $supportedClassName) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
index faf2841f40105..7c5ba6e39e121 100644
--- a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
+++ b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -77,6 +77,7 @@
 use Symfony\Component\VarExporter\Internal\Registry;
 use Symfony\Component\Workflow\DependencyInjection\WorkflowDebugPass;
 use Symfony\Component\Workflow\DependencyInjection\WorkflowGuardListenerPass;
+use Symfony\Component\Workflow\DependencyInjection\WorkflowValidatorPass;
 
 // Help opcache.preload discover always-needed symbols
 class_exists(ApcuAdapter::class);
@@ -173,6 +174,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new CachePoolPrunerPass(), PassConfig::TYPE_AFTER_REMOVING);
         $this->addCompilerPassIfExists($container, FormPass::class);
         $this->addCompilerPassIfExists($container, WorkflowGuardListenerPass::class);
+        $this->addCompilerPassIfExists($container, WorkflowValidatorPass::class);
         $container->addCompilerPass(new ResettableServicePass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
         $container->addCompilerPass(new RegisterLocaleAwareServicesPass());
         $container->addCompilerPass(new TestServiceContainerWeakRefPass(), PassConfig::TYPE_BEFORE_REMOVING, -32);
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 c4ee3486dae87..3a6242b837dd3 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
@@ -449,6 +449,7 @@
             <xsd:element name="initial-marking" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="marking-store" type="marking_store" minOccurs="0" maxOccurs="1" />
             <xsd:element name="support" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="definition-validator" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="event-to-dispatch" type="event_to_dispatch" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="place" type="place" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="transition" type="transition" minOccurs="0" maxOccurs="unbounded" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/Workflow/Validator/DefinitionValidator.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/Workflow/Validator/DefinitionValidator.php
new file mode 100644
index 0000000000000..7244e927ca763
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/Workflow/Validator/DefinitionValidator.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Fixtures\Workflow\Validator;
+
+use Symfony\Component\Workflow\Definition;
+use Symfony\Component\Workflow\Validator\DefinitionValidatorInterface;
+
+class DefinitionValidator implements DefinitionValidatorInterface
+{
+    public static bool $called = false;
+
+    public function validate(Definition $definition, string $name): void
+    {
+        self::$called = true;
+    }
+}
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 118a627c7c05b..2c29b848901eb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/workflows.php
@@ -13,6 +13,9 @@
             'supports' => [
                 FrameworkExtensionTestCase::class,
             ],
+            'definition_validators' => [
+                Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Fixtures\Workflow\Validator\DefinitionValidator::class,
+            ],
             'initial_marking' => ['draft'],
             'metadata' => [
                 'title' => 'article workflow',
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 76b4f07a87a44..c5dae479d3d63 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
@@ -13,6 +13,7 @@
             <framework:audit-trail enabled="true"/>
             <framework:initial-marking>draft</framework:initial-marking>
             <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
+            <framework:definition-validator>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Fixtures\Workflow\Validator\DefinitionValidator</framework:definition-validator>
             <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/yml/workflows.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
index a9b427d89408a..cac5f6f230f92 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/workflows.yml
@@ -9,6 +9,8 @@ framework:
             type: workflow
             supports:
                 - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase
+            definition_validators:
+                - Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Fixtures\Workflow\Validator\DefinitionValidator
             initial_marking: [draft]
             metadata:
                 title: article workflow
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index d942c122c826a..1899d5239eb4d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -15,6 +15,7 @@
 use Psr\Log\LoggerAwareInterface;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Fixtures\Workflow\Validator\DefinitionValidator;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FullStack;
@@ -287,7 +288,11 @@ public function testProfilerCollectSerializerDataEnabled()
 
     public function testWorkflows()
     {
-        $container = $this->createContainerFromFile('workflows');
+        DefinitionValidator::$called = false;
+
+        $container = $this->createContainerFromFile('workflows', compile: false);
+        $container->addCompilerPass(new \Symfony\Component\Workflow\DependencyInjection\WorkflowValidatorPass());
+        $container->compile();
 
         $this->assertTrue($container->hasDefinition('workflow.article'), 'Workflow is registered as a service');
         $this->assertSame('workflow.abstract', $container->getDefinition('workflow.article')->getParent());
@@ -310,6 +315,7 @@ public function testWorkflows()
         ], $tags['workflow'][0]['metadata'] ?? null);
 
         $this->assertTrue($container->hasDefinition('workflow.article.definition'), 'Workflow definition is registered as a service');
+        $this->assertTrue(DefinitionValidator::$called, 'DefinitionValidator is called');
 
         $workflowDefinition = $container->getDefinition('workflow.article.definition');
 
@@ -403,7 +409,9 @@ public function testWorkflowAreValidated()
     {
         $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessage('A transition from a place/state must have an unique name. Multiple transitions named "go" from place/state "first" were found on StateMachine "my_workflow".');
-        $this->createContainerFromFile('workflow_not_valid');
+        $container = $this->createContainerFromFile('workflow_not_valid', compile: false);
+        $container->addCompilerPass(new \Symfony\Component\Workflow\DependencyInjection\WorkflowValidatorPass());
+        $container->compile();
     }
 
     public function testWorkflowCannotHaveBothSupportsAndSupportStrategy()
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
index dbadcc468a5b9..d2bd2b38eb313 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -102,7 +102,7 @@ public function testWorkflowValidationStateMachine()
     {
         $this->expectException(InvalidDefinitionException::class);
         $this->expectExceptionMessage('A transition from a place/state must have an unique name. Multiple transitions named "a_to_b" from place/state "a" were found on StateMachine "article".');
-        $this->createContainerFromClosure(function ($container) {
+        $this->createContainerFromClosure(function (ContainerBuilder $container) {
             $container->loadFromExtension('framework', [
                 'annotations' => false,
                 'http_method_override' => false,
@@ -128,9 +128,57 @@ public function testWorkflowValidationStateMachine()
                     ],
                 ],
             ]);
+            $container->addCompilerPass(new \Symfony\Component\Workflow\DependencyInjection\WorkflowValidatorPass());
+        });
+    }
+
+    /**
+     * @dataProvider provideWorkflowValidationCustomTests
+     */
+    public function testWorkflowValidationCustomBroken(string $class, string $message)
+    {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage($message);
+        $this->createContainerFromClosure(function ($container) use ($class) {
+            $container->loadFromExtension('framework', [
+                'annotations' => false,
+                'http_method_override' => false,
+                'handle_all_throwables' => true,
+                'php_errors' => ['log' => true],
+                'workflows' => [
+                    'article' => [
+                        'type' => 'state_machine',
+                        'supports' => [
+                            __CLASS__,
+                        ],
+                        'places' => [
+                            'a',
+                            'b',
+                        ],
+                        'transitions' => [
+                            'a_to_b' => [
+                                'from' => ['a'],
+                                'to' => ['b'],
+                            ],
+                        ],
+                        'definition_validators' => [
+                            $class,
+                        ],
+                    ],
+                ],
+            ]);
         });
     }
 
+    public static function provideWorkflowValidationCustomTests()
+    {
+        yield ['classDoesNotExist', 'Invalid configuration for path "framework.workflows.workflows.article.definition_validators.0": The validation class "classDoesNotExist" does not exist.'];
+
+        yield [\DateTime::class, 'Invalid configuration for path "framework.workflows.workflows.article.definition_validators.0": The validation class "DateTime" is not an instance of "Symfony\Component\Workflow\Validator\DefinitionValidatorInterface".'];
+
+        yield [WorkflowValidatorWithConstructor::class, 'Invalid configuration for path "framework.workflows.workflows.article.definition_validators.0": The "Symfony\\\\Bundle\\\\FrameworkBundle\\\\Tests\\\\DependencyInjection\\\\WorkflowValidatorWithConstructor" validation class constructor must not have any arguments.'];
+    }
+
     public function testWorkflowDefaultMarkingStoreDefinition()
     {
         $container = $this->createContainerFromClosure(function ($container) {
@@ -407,3 +455,14 @@ public static function emailValidationModeProvider()
         }
     }
 }
+
+class WorkflowValidatorWithConstructor implements \Symfony\Component\Workflow\Validator\DefinitionValidatorInterface
+{
+    public function __construct(bool $enabled)
+    {
+    }
+
+    public function validate(\Symfony\Component\Workflow\Definition $definition, string $name): void
+    {
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index bc312827ffa14..b3c81b28700a3 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -67,7 +67,7 @@
         "symfony/twig-bundle": "^6.4|^7.0",
         "symfony/type-info": "^7.1",
         "symfony/validator": "^6.4|^7.0",
-        "symfony/workflow": "^6.4|^7.0",
+        "symfony/workflow": "^7.3",
         "symfony/yaml": "^6.4|^7.0",
         "symfony/property-info": "^6.4|^7.0",
         "symfony/json-streamer": "7.3.*",
@@ -108,7 +108,7 @@
         "symfony/validator": "<6.4",
         "symfony/web-profiler-bundle": "<6.4",
         "symfony/webhook": "<7.2",
-        "symfony/workflow": "<6.4"
+        "symfony/workflow": "<7.3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" },
diff --git a/src/Symfony/Component/Workflow/DependencyInjection/WorkflowValidatorPass.php b/src/Symfony/Component/Workflow/DependencyInjection/WorkflowValidatorPass.php
new file mode 100644
index 0000000000000..60072ef0ca612
--- /dev/null
+++ b/src/Symfony/Component/Workflow/DependencyInjection/WorkflowValidatorPass.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\Workflow\DependencyInjection;
+
+use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+
+/**
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ */
+class WorkflowValidatorPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        foreach ($container->findTaggedServiceIds('workflow') as $attributes) {
+            foreach ($attributes as $attribute) {
+                foreach ($attribute['definition_validators'] ?? [] as $validatorClass) {
+                    $container->addResource(new FileResource($container->getReflectionClass($validatorClass)->getFileName()));
+
+                    $realDefinition = $container->get($attribute['definition_id'] ?? throw new \LogicException('The "definition_id" attribute is required.'));
+                    (new $validatorClass())->validate($realDefinition, $attribute['name'] ?? throw new \LogicException('The "name" attribute is required.'));
+                }
+            }
+        }
+    }
+}
diff --git a/src/Symfony/Component/Workflow/Tests/DependencyInjection/WorkflowValidatorPassTest.php b/src/Symfony/Component/Workflow/Tests/DependencyInjection/WorkflowValidatorPassTest.php
new file mode 100644
index 0000000000000..213e0d4d94cc3
--- /dev/null
+++ b/src/Symfony/Component/Workflow/Tests/DependencyInjection/WorkflowValidatorPassTest.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\Workflow\Tests\DependencyInjection;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Workflow\Definition;
+use Symfony\Component\Workflow\DependencyInjection\WorkflowValidatorPass;
+use Symfony\Component\Workflow\Validator\DefinitionValidatorInterface;
+use Symfony\Component\Workflow\WorkflowInterface;
+
+class WorkflowValidatorPassTest extends TestCase
+{
+    private ContainerBuilder $container;
+    private WorkflowValidatorPass $compilerPass;
+
+    protected function setUp(): void
+    {
+        $this->container = new ContainerBuilder();
+        $this->compilerPass = new WorkflowValidatorPass();
+    }
+
+    public function testNothingToDo()
+    {
+        $this->compilerPass->process($this->container);
+
+        $this->assertFalse(DefinitionValidator::$called);
+    }
+
+    public function testValidate()
+    {
+        $this
+            ->container
+            ->register('my.workflow', WorkflowInterface::class)
+            ->addTag('workflow', [
+                'definition_id' => 'my.workflow.definition',
+                'name' => 'my.workflow',
+                'definition_validators' => [DefinitionValidator::class],
+            ])
+        ;
+
+        $this
+            ->container
+            ->register('my.workflow.definition', Definition::class)
+            ->setArguments([
+                '$places' => [],
+                '$transitions' => [],
+            ])
+        ;
+
+        $this->compilerPass->process($this->container);
+
+        $this->assertTrue(DefinitionValidator::$called);
+    }
+}
+
+class DefinitionValidator implements DefinitionValidatorInterface
+{
+    public static bool $called = false;
+
+    public function validate(Definition $definition, string $name): void
+    {
+        self::$called = true;
+    }
+}
diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json
index ef6779c6de142..3e2c50a38cffd 100644
--- a/src/Symfony/Component/Workflow/composer.json
+++ b/src/Symfony/Component/Workflow/composer.json
@@ -25,6 +25,7 @@
     },
     "require-dev": {
         "psr/log": "^1|^2|^3",
+        "symfony/config": "^6.4|^7.0",
         "symfony/dependency-injection": "^6.4|^7.0",
         "symfony/error-handler": "^6.4|^7.0",
         "symfony/event-dispatcher": "^6.4|^7.0",

From 5f8eb21b2705adc542acfeee1adbd617531b95f2 Mon Sep 17 00:00:00 2001
From: andyexeter <palmer.andy@gmail.com>
Date: Wed, 23 Oct 2024 10:35:14 +0100
Subject: [PATCH 47/49] Use Composer InstalledVersions to check if flex is
 installed instead of existence of InstallRecipesCommand

---
 .../SecurityBundle/DependencyInjection/SecurityExtension.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index f454b9318c183..14e7e45a1dc5c 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\SecurityBundle\DependencyInjection;
 
+use Composer\InstalledVersions;
 use Symfony\Bridge\Twig\Extension\LogoutUrlExtension;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\AuthenticatorFactoryInterface;
 use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\FirewallListenerFactoryInterface;
@@ -61,7 +62,6 @@
 use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticator;
 use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticatorManagerListener;
 use Symfony\Component\Security\Http\Event\CheckPassportEvent;
-use Symfony\Flex\Command\InstallRecipesCommand;
 
 /**
  * SecurityExtension.
@@ -92,7 +92,7 @@ public function prepend(ContainerBuilder $container): void
     public function load(array $configs, ContainerBuilder $container): void
     {
         if (!array_filter($configs)) {
-            $hint = class_exists(InstallRecipesCommand::class) ? 'Try running "composer symfony:recipes:install symfony/security-bundle".' : 'Please define your settings for the "security" config section.';
+            $hint = class_exists(InstalledVersions::class) && InstalledVersions::isInstalled('symfony/flex') ? 'Try running "composer symfony:recipes:install symfony/security-bundle".' : 'Please define your settings for the "security" config section.';
 
             throw new InvalidConfigurationException('The SecurityBundle is enabled but is not configured. '.$hint);
         }

From 67301406f68c997d55cfe599fc37ad13d366cfb7 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 10 May 2025 14:09:26 +0200
Subject: [PATCH 48/49] Update CHANGELOG for 7.3.0-BETA2

---
 CHANGELOG-7.3.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG-7.3.md b/CHANGELOG-7.3.md
index bfe703f791ae4..b88c6a58f068c 100644
--- a/CHANGELOG-7.3.md
+++ b/CHANGELOG-7.3.md
@@ -7,6 +7,29 @@ in 7.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/v7.3.0...v7.3.1
 
+* 7.3.0-BETA2 (2025-05-10)
+
+ * bug #58643 [SecurityBundle] Use Composer `InstalledVersions` to check if flex is installed (andyexeter)
+ * feature #54276 [Workflow] Add support for executing custom workflow definition validators during the container compilation (lyrixx)
+ * feature #52981 [FrameworkBundle] Make `ValidatorCacheWarmer` and `SerializeCacheWarmer` use `kernel.build_dir` instead of `kernel.cache_dir` (Okhoshi)
+ * feature #54384 [TwigBundle] Use `kernel.build_dir` to store the templates known at build time (Okhoshi)
+ * bug #60275 [DoctrineBridge] Fix UniqueEntityValidator Stringable identifiers (GiuseppeArcuti, wkania)
+ * feature #59602 [Console] `#[Option]` rules & restrictions (kbond)
+ * feature #60389 [Console] Add support for `SignalableCommandInterface` with invokable commands (HypeMC)
+ * bug #60293 [Messenger] fix asking users to select an option if `--force` option is used in `messenger:failed:retry` command (W0rma)
+ * bug #60392 [DependencyInjection][FrameworkBundle] Fix precedence of `App\Kernel` alias and ignore `container.excluded` tag on synthetic services (nicolas-grekas)
+ * bug #60379 [Security] Avoid failing when PersistentRememberMeHandler handles a malformed cookie (Seldaek)
+ * bug #60308 [Messenger] Fix integration with newer versions of Pheanstalk (HypeMC)
+ * bug #60373 [FrameworkBundle] Ensure `Email` class exists before using it (Kocal)
+ * bug #60365 [FrameworkBundle] ensure that all supported e-mail validation modes can be configured (xabbuh)
+ * bug #60350 [Security][LoginLink] Throw `InvalidLoginLinkException` on invalid parameters (davidszkiba)
+ * bug #60366 [Console] Set description as first parameter to `Argument` and `Option` attributes (alamirault)
+ * bug #60361 [Console] Ensure overriding `Command::execute()` keeps priority over `__invoke()` (GromNaN)
+ * feature #60028 [ObjectMapper] Condition to target a specific class  (soyuka)
+ * feature #60344 [Console] Use kebab-case for auto-guessed input arguments/options names (chalasr)
+ * bug #60340 [String] fix EmojiTransliterator return type compatibility with PHP 8.5 (xabbuh)
+ * bug #60322 [FrameworkBundle] drop the limiters option for non-compound rater limiters (xabbuh)
+
 * 7.3.0-BETA1 (2025-05-02)
 
  * feature #60232 Add PHP config support for routing (fabpot)

From 76c0d49b5fabbcc9f49d9354f46630cfc41eee24 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Sat, 10 May 2025 14:09:33 +0200
Subject: [PATCH 49/49] Update VERSION for 7.3.0-BETA2

---
 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 b5a41236d1899..d09c86966dbe2 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -73,12 +73,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
      */
     private static array $freshCache = [];
 
-    public const VERSION = '7.3.0-DEV';
+    public const VERSION = '7.3.0-BETA2';
     public const VERSION_ID = 70300;
     public const MAJOR_VERSION = 7;
     public const MINOR_VERSION = 3;
     public const RELEASE_VERSION = 0;
-    public const EXTRA_VERSION = 'DEV';
+    public const EXTRA_VERSION = 'BETA2';
 
     public const END_OF_MAINTENANCE = '05/2025';
     public const END_OF_LIFE = '01/2026';

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/symfony/symfony/compare/symfony:366bfc8...symfony:f21b512.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/symfony/symfony/compare/symfony:366bfc8...symfony:f21b512.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/symfony/symfony/compare/symfony:366bfc8...symfony:f21b512.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/symfony/symfony/compare/symfony:366bfc8...symfony:f21b512.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>