diff --git a/CHANGELOG.md b/CHANGELOG.md
index 949aad31c..3227eddc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,75 @@
 CHANGELOG
 =========
 
+7.2
+---
+
+ * Add support for `--sort` option when extracting translations with `translation:extract` command and `--force` option
+ * Add support for setting `headers` with `Symfony\Bundle\FrameworkBundle\Controller\TemplateController`
+ * Add `--resolve-env-vars` option to `lint:container` command
+ * Derivate `kernel.secret` from the decryption secret when its env var is not defined
+ * Make the `config/` directory optional in `MicroKernelTrait`, add support for service arguments in the
+   invokable Kernel class, and register `FrameworkBundle` by default when the `bundles.php` file is missing
+ * [BC BREAK] The `secrets:decrypt-to-local` command terminates with a non-zero exit code when a secret could not be read
+ * Deprecate making `cache.app` adapter taggable, use the `cache.app.taggable` adapter instead
+ * Enable `json_decode_detailed_errors` in the default serializer context in debug mode by default when `seld/jsonlint` is installed
+ * Register `Symfony\Component\Serializer\NameConverter\SnakeCaseToCamelCaseNameConverter` as a service named `serializer.name_converter.snake_case_to_camel_case` if available
+ * Add `framework.csrf_protection.stateless_token_ids`, `.cookie_name`, and `.check_header` options to use stateless headers/cookies-based CSRF protection
+ * Add `framework.form.csrf_protection.field_attr` option
+ * Deprecate `session.sid_length` and `session.sid_bits_per_character` config options
+ * Add the ability to use an existing service as a lock/semaphore resource
+ * Add support for configuring multiple serializer instances via the configuration
+ * Add support for `SYMFONY_TRUSTED_PROXIES`, `SYMFONY_TRUSTED_HEADERS`, `SYMFONY_TRUST_X_SENDFILE_TYPE_HEADER` and `SYMFONY_TRUSTED_HOSTS` env vars
+ * Add `--no-fill` option to `translation:extract` command
+
+7.1
+---
+
+ * Add `CheckAliasValidityPass` to `lint:container` command
+ * Add `private_ranges` as a shortcut for private IP address ranges to the `trusted_proxies` option
+ * Mark classes `ConfigBuilderCacheWarmer`, `Router`, `SerializerCacheWarmer`, `TranslationsCacheWarmer`, `Translator` and `ValidatorCacheWarmer` as `final`
+ * Move the Router `cache_dir` to `kernel.build_dir`
+ * Deprecate the `router.cache_dir` config option
+ * Add `rate_limiter` tags to rate limiter services
+ * Add `secrets:reveal` command
+ * Add `rate_limiter` option to `http_client.default_options` and `http_client.scoped_clients`
+ * Attach the workflow's configuration to the `workflow` tag
+ * Add the `allowed_recipients` option for mailer to allow some users to receive
+   emails even if `recipients` is defined.
+ * Reset env vars when resetting the container
+
+7.0
+---
+
+ * Remove command `translation:update`, use `translation:extract` instead
+ * Make the `http_method_override` config option default to `false`
+ * Remove `AbstractController::renderForm()`, use `render()` instead
+ * Remove the `Symfony\Component\Serializer\Normalizer\ObjectNormalizer` and
+   `Symfony\Component\Serializer\Normalizer\PropertyNormalizer` autowiring aliases, type-hint against
+   `Symfony\Component\Serializer\Normalizer\NormalizerInterface` or implement `NormalizerAwareInterface` instead
+ * Remove the `Http\Client\HttpClient` service, use `Psr\Http\Client\ClientInterface` instead
+ * Remove the integration of Doctrine annotations, use native attributes instead
+ * Remove `EnableLoggerDebugModePass`, use argument `$debug` of HttpKernel's `Logger` instead
+ * Remove `AddDebugLogProcessorPass::configureLogger()`, use HttpKernel's `DebugLoggerConfigurator` instead
+ * Make the `framework.handle_all_throwables` config option default to `true`
+ * Make the `framework.php_errors.log` config option default to `true`
+ * Make the `framework.session.cookie_secure` config option default to `auto`
+ * Make the `framework.session.cookie_samesite` config option default to `lax`
+ * Make the `framework.session.handler_id` default to null if `save_path` is not set and to `session.handler.native_file` otherwise
+ * Make the `framework.uid.default_uuid_version` config option default to `7`
+ * Make the `framework.uid.time_based_uuid_version` config option default to `7`
+ * Make the `framework.validation.email_validation_mode` config option default to `html5`
+ * Remove the `framework.validation.enable_annotations` config option, use `framework.validation.enable_attributes` instead
+ * Remove the `framework.serializer.enable_annotations` config option, use `framework.serializer.enable_attributes` instead
+ * Remove the `routing.loader.annotation` service, use the `routing.loader.attribute` service instead
+ * Remove the `routing.loader.annotation.directory` service, use the `routing.loader.attribute.directory` service instead
+ * Remove the `routing.loader.annotation.file` service, use the `routing.loader.attribute.file` service instead
+ * Remove `AnnotatedRouteControllerLoader`, use `AttributeRouteControllerLoader` instead
+ * Remove `AddExpressionLanguageProvidersPass`, use `Symfony\Component\Routing\DependencyInjection\AddExpressionLanguageProvidersPass` instead
+ * Remove `DataCollectorTranslatorPass`, use `Symfony\Component\Translation\DependencyInjection\DataCollectorTranslatorPass` instead
+ * Remove `LoggingTranslatorPass`, use `Symfony\Component\Translation\DependencyInjection\LoggingTranslatorPass` instead
+ * Remove `WorkflowGuardListenerPass`, use `Symfony\Component\Workflow\DependencyInjection\WorkflowGuardListenerPass` instead
+
 6.4
 ---
 
diff --git a/CacheWarmer/AbstractPhpFileCacheWarmer.php b/CacheWarmer/AbstractPhpFileCacheWarmer.php
index 98c281276..a18faae7d 100644
--- a/CacheWarmer/AbstractPhpFileCacheWarmer.php
+++ b/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -19,14 +19,12 @@
 
 abstract class AbstractPhpFileCacheWarmer implements CacheWarmerInterface
 {
-    private string $phpArrayFile;
-
     /**
      * @param string $phpArrayFile The PHP file where metadata are cached
      */
-    public function __construct(string $phpArrayFile)
-    {
-        $this->phpArrayFile = $phpArrayFile;
+    public function __construct(
+        private string $phpArrayFile,
+    ) {
     }
 
     public function isOptional(): bool
@@ -34,12 +32,8 @@ public function isOptional(): bool
         return true;
     }
 
-    /**
-     * @param string|null $buildDir
-     */
-    public function warmUp(string $cacheDir /* , string $buildDir = null */): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
-        $buildDir = 1 < \func_num_args() ? func_get_arg(1) : null;
         $arrayAdapter = new ArrayAdapter();
 
         spl_autoload_register([ClassExistenceResource::class, 'throwOnRequiredClass']);
@@ -64,7 +58,7 @@ public function warmUp(string $cacheDir /* , string $buildDir = null */): array
      */
     protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array $values): array
     {
-        return (array) $phpArrayAdapter->warmUp($values);
+        return $phpArrayAdapter->warmUp($values);
     }
 
     /**
@@ -79,9 +73,7 @@ final protected function ignoreAutoloadException(string $class, \Exception $exce
     }
 
     /**
-     * @param string|null $buildDir
-     *
      * @return bool false if there is nothing to warm-up
      */
-    abstract protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter /* , string $buildDir = null */): bool;
+    abstract protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool;
 }
diff --git a/CacheWarmer/AnnotationsCacheWarmer.php b/CacheWarmer/AnnotationsCacheWarmer.php
deleted file mode 100644
index 20533bb60..000000000
--- a/CacheWarmer/AnnotationsCacheWarmer.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
-
-use Doctrine\Common\Annotations\AnnotationException;
-use Doctrine\Common\Annotations\PsrCachedReader;
-use Doctrine\Common\Annotations\Reader;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
-
-/**
- * Warms up annotation caches for classes found in composer's autoload class map
- * and declared in DI bundle extensions using the addAnnotatedClassesToCache method.
- *
- * @author Titouan Galopin <galopintitouan@gmail.com>
- *
- * @deprecated since Symfony 6.4 without replacement
- */
-class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer
-{
-    /**
-     * @param string $phpArrayFile The PHP file where annotations are cached
-     */
-    public function __construct(
-        private readonly Reader $annotationReader,
-        string $phpArrayFile,
-        private readonly ?string $excludeRegexp = null,
-        private readonly bool $debug = false,
-        /* bool $triggerDeprecation = true, */
-    ) {
-        if (\func_num_args() < 5 || func_get_arg(4)) {
-            trigger_deprecation('symfony/framework-bundle', '6.4', 'The "%s" class is deprecated without replacement.', __CLASS__);
-        }
-
-        parent::__construct($phpArrayFile);
-    }
-
-    /**
-     * @param string|null $buildDir
-     */
-    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter /* , string $buildDir = null */): bool
-    {
-        $annotatedClassPatterns = $cacheDir.'/annotations.map';
-
-        if (!is_file($annotatedClassPatterns)) {
-            return true;
-        }
-
-        $annotatedClasses = include $annotatedClassPatterns;
-        $reader = new PsrCachedReader($this->annotationReader, $arrayAdapter, $this->debug);
-
-        foreach ($annotatedClasses as $class) {
-            if (null !== $this->excludeRegexp && preg_match($this->excludeRegexp, $class)) {
-                continue;
-            }
-            try {
-                $this->readAllComponents($reader, $class);
-            } catch (\Exception $e) {
-                $this->ignoreAutoloadException($class, $e);
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @return string[] A list of classes to preload on PHP 7.4+
-     */
-    protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array $values): array
-    {
-        // make sure we don't cache null values
-        $values = array_filter($values, fn ($val) => null !== $val);
-
-        return parent::warmUpPhpArrayAdapter($phpArrayAdapter, $values);
-    }
-
-    private function readAllComponents(Reader $reader, string $class): void
-    {
-        $reflectionClass = new \ReflectionClass($class);
-
-        try {
-            $reader->getClassAnnotations($reflectionClass);
-        } catch (AnnotationException) {
-            /*
-             * Ignore any AnnotationException to not break the cache warming process if an Annotation is badly
-             * configured or could not be found / read / etc.
-             *
-             * In particular cases, an Annotation in your code can be used and defined only for a specific
-             * environment but is always added to the annotations.map file by some Symfony default behaviors,
-             * and you always end up with a not found Annotation.
-             */
-        }
-
-        foreach ($reflectionClass->getMethods() as $reflectionMethod) {
-            try {
-                $reader->getMethodAnnotations($reflectionMethod);
-            } catch (AnnotationException) {
-            }
-        }
-
-        foreach ($reflectionClass->getProperties() as $reflectionProperty) {
-            try {
-                $reader->getPropertyAnnotations($reflectionProperty);
-            } catch (AnnotationException) {
-            }
-        }
-    }
-}
diff --git a/CacheWarmer/CachePoolClearerCacheWarmer.php b/CacheWarmer/CachePoolClearerCacheWarmer.php
index ae27502cf..e67f84dac 100644
--- a/CacheWarmer/CachePoolClearerCacheWarmer.php
+++ b/CacheWarmer/CachePoolClearerCacheWarmer.php
@@ -25,16 +25,13 @@
  */
 final class CachePoolClearerCacheWarmer implements CacheWarmerInterface
 {
-    private Psr6CacheClearer $poolClearer;
-    private array $pools;
-
     /**
      * @param string[] $pools
      */
-    public function __construct(Psr6CacheClearer $poolClearer, array $pools = [])
-    {
-        $this->poolClearer = $poolClearer;
-        $this->pools = $pools;
+    public function __construct(
+        private Psr6CacheClearer $poolClearer,
+        private array $pools = [],
+    ) {
     }
 
     public function warmUp(string $cacheDir, ?string $buildDir = null): array
diff --git a/CacheWarmer/ConfigBuilderCacheWarmer.php b/CacheWarmer/ConfigBuilderCacheWarmer.php
index c43fc8af1..48ed51aec 100644
--- a/CacheWarmer/ConfigBuilderCacheWarmer.php
+++ b/CacheWarmer/ConfigBuilderCacheWarmer.php
@@ -29,25 +29,19 @@
  * Generate all config builders.
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ *
+ * @final since Symfony 7.1
  */
 class ConfigBuilderCacheWarmer implements CacheWarmerInterface
 {
-    private KernelInterface $kernel;
-    private ?LoggerInterface $logger;
-
-    public function __construct(KernelInterface $kernel, ?LoggerInterface $logger = null)
-    {
-        $this->kernel = $kernel;
-        $this->logger = $logger;
+    public function __construct(
+        private KernelInterface $kernel,
+        private ?LoggerInterface $logger = null,
+    ) {
     }
 
-    /**
-     * @param string|null $buildDir
-     */
-    public function warmUp(string $cacheDir /* , string $buildDir = null */): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
-        $buildDir = 1 < \func_num_args() ? func_get_arg(1) : null;
-
         if (!$buildDir) {
             return [];
         }
diff --git a/CacheWarmer/RouterCacheWarmer.php b/CacheWarmer/RouterCacheWarmer.php
index c2b9478a3..7d621f57d 100644
--- a/CacheWarmer/RouterCacheWarmer.php
+++ b/CacheWarmer/RouterCacheWarmer.php
@@ -26,23 +26,27 @@
  */
 class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {
-    private ContainerInterface $container;
-
-    public function __construct(ContainerInterface $container)
-    {
-        // As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
-        $this->container = $container;
+    /**
+     * As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
+     */
+    public function __construct(
+        private ContainerInterface $container,
+    ) {
     }
 
     public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
+        if (!$buildDir) {
+            return [];
+        }
+
         $router = $this->container->get('router');
 
         if ($router instanceof WarmableInterface) {
-            return (array) $router->warmUp($cacheDir, $buildDir);
+            return $router->warmUp($cacheDir, $buildDir);
         }
 
-        throw new \LogicException(sprintf('The router "%s" cannot be warmed up because it does not implement "%s".', get_debug_type($router), WarmableInterface::class));
+        throw new \LogicException(\sprintf('The router "%s" cannot be warmed up because it does not implement "%s".', get_debug_type($router), WarmableInterface::class));
     }
 
     public function isOptional(): bool
diff --git a/CacheWarmer/SerializerCacheWarmer.php b/CacheWarmer/SerializerCacheWarmer.php
index b47a48ce6..46da4daaa 100644
--- a/CacheWarmer/SerializerCacheWarmer.php
+++ b/CacheWarmer/SerializerCacheWarmer.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
-use Doctrine\Common\Annotations\AnnotationException;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
@@ -24,25 +23,23 @@
  * Warms up XML and YAML serializer metadata.
  *
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @final since Symfony 7.1
  */
 class SerializerCacheWarmer extends AbstractPhpFileCacheWarmer
 {
-    private array $loaders;
-
     /**
      * @param LoaderInterface[] $loaders      The serializer metadata loaders
      * @param string            $phpArrayFile The PHP file where metadata are cached
      */
-    public function __construct(array $loaders, string $phpArrayFile)
-    {
+    public function __construct(
+        private array $loaders,
+        string $phpArrayFile,
+    ) {
         parent::__construct($phpArrayFile);
-        $this->loaders = $loaders;
     }
 
-    /**
-     * @param string|null $buildDir
-     */
-    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter /* , string $buildDir = null */): bool
+    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool
     {
         if (!$this->loaders) {
             return true;
@@ -54,8 +51,6 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter /* , st
             foreach ($loader->getMappedClasses() as $mappedClass) {
                 try {
                     $metadataFactory->getMetadataFor($mappedClass);
-                } catch (AnnotationException) {
-                    // ignore failing annotations
                 } catch (\Exception $e) {
                     $this->ignoreAutoloadException($mappedClass, $e);
                 }
diff --git a/CacheWarmer/TranslationsCacheWarmer.php b/CacheWarmer/TranslationsCacheWarmer.php
index 39b1444b0..40341cc10 100644
--- a/CacheWarmer/TranslationsCacheWarmer.php
+++ b/CacheWarmer/TranslationsCacheWarmer.php
@@ -21,29 +21,27 @@
  * Generates the catalogues for translations.
  *
  * @author Xavier Leune <xavier.leune@gmail.com>
+ *
+ * @final since Symfony 7.1
  */
 class TranslationsCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {
-    private ContainerInterface $container;
     private TranslatorInterface $translator;
 
-    public function __construct(ContainerInterface $container)
-    {
-        // As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
-        $this->container = $container;
-    }
-
     /**
-     * @param string|null $buildDir
+     * As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
      */
-    public function warmUp(string $cacheDir /* , string $buildDir = null */): array
+    public function __construct(
+        private ContainerInterface $container,
+    ) {
+    }
+
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         $this->translator ??= $this->container->get('translator');
 
         if ($this->translator instanceof WarmableInterface) {
-            $buildDir = 1 < \func_num_args() ? func_get_arg(1) : null;
-
-            return (array) $this->translator->warmUp($cacheDir, $buildDir);
+            return $this->translator->warmUp($cacheDir, $buildDir);
         }
 
         return [];
diff --git a/CacheWarmer/ValidatorCacheWarmer.php b/CacheWarmer/ValidatorCacheWarmer.php
index 224e90985..6ecaa4bd1 100644
--- a/CacheWarmer/ValidatorCacheWarmer.php
+++ b/CacheWarmer/ValidatorCacheWarmer.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\CacheWarmer;
 
-use Doctrine\Common\Annotations\AnnotationException;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
@@ -25,24 +24,22 @@
  * Warms up XML and YAML validator metadata.
  *
  * @author Titouan Galopin <galopintitouan@gmail.com>
+ *
+ * @final since Symfony 7.1
  */
 class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
 {
-    private ValidatorBuilder $validatorBuilder;
-
     /**
      * @param string $phpArrayFile The PHP file where metadata are cached
      */
-    public function __construct(ValidatorBuilder $validatorBuilder, string $phpArrayFile)
-    {
+    public function __construct(
+        private ValidatorBuilder $validatorBuilder,
+        string $phpArrayFile,
+    ) {
         parent::__construct($phpArrayFile);
-        $this->validatorBuilder = $validatorBuilder;
     }
 
-    /**
-     * @param string|null $buildDir
-     */
-    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter /* , string $buildDir = null */): bool
+    protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool
     {
         $loaders = $this->validatorBuilder->getLoaders();
         $metadataFactory = new LazyLoadingMetadataFactory(new LoaderChain($loaders), $arrayAdapter);
@@ -53,8 +50,6 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter /* , st
                     if ($metadataFactory->hasMetadataFor($mappedClass)) {
                         $metadataFactory->getMetadataFor($mappedClass);
                     }
-                } catch (AnnotationException) {
-                    // ignore failing annotations
                 } catch (\Exception $e) {
                     $this->ignoreAutoloadException($mappedClass, $e);
                 }
diff --git a/Command/AboutCommand.php b/Command/AboutCommand.php
index 2c6cb440f..4dc86130a 100644
--- a/Command/AboutCommand.php
+++ b/Command/AboutCommand.php
@@ -25,6 +25,7 @@
  * A console command to display information about the current installation.
  *
  * @author Roland Franssen <franssen.roland@gmail.com>
+ * @author Joppe De Cuyper <hello@joppe.dev>
  *
  * @final
  */
@@ -57,6 +58,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $buildDir = $kernel->getCacheDir();
         }
 
+        $xdebugMode = getenv('XDEBUG_MODE') ?: \ini_get('xdebug.mode');
+
         $rows = [
             ['<info>Symfony</>'],
             new TableSeparator(),
@@ -81,9 +84,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             ['Architecture', (\PHP_INT_SIZE * 8).' bits'],
             ['Intl locale', class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'],
             ['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTimeImmutable())->format(\DateTimeInterface::W3C).'</>)'],
-            ['OPcache', \extension_loaded('Zend OPcache') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOL) ? 'true' : 'false'],
-            ['APCu', \extension_loaded('apcu') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOL) ? 'true' : 'false'],
-            ['Xdebug', \extension_loaded('xdebug') ? 'true' : 'false'],
+            ['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
+            ['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
+            ['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
         ];
 
         $io->table([], $rows);
diff --git a/Command/AbstractConfigCommand.php b/Command/AbstractConfigCommand.php
index 94b95e502..fc3433c2d 100644
--- a/Command/AbstractConfigCommand.php
+++ b/Command/AbstractConfigCommand.php
@@ -28,10 +28,7 @@
  */
 abstract class AbstractConfigCommand extends ContainerDebugCommand
 {
-    /**
-     * @return void
-     */
-    protected function listBundles(OutputInterface|StyleInterface $output)
+    protected function listBundles(OutputInterface|StyleInterface $output): void
     {
         $title = 'Available registered bundles with their extension alias if available';
         $headers = ['Bundle name', 'Extension alias'];
@@ -117,7 +114,7 @@ protected function findExtension(string $name): ExtensionInterface
         foreach ($bundles as $bundle) {
             if ($name === $bundle->getName()) {
                 if (!$bundle->getContainerExtension()) {
-                    throw new \LogicException(sprintf('Bundle "%s" does not have a container extension.', $name));
+                    throw new \LogicException(\sprintf('Bundle "%s" does not have a container extension.', $name));
                 }
 
                 return $bundle->getContainerExtension();
@@ -147,29 +144,26 @@ protected function findExtension(string $name): ExtensionInterface
         }
 
         if (!str_ends_with($name, 'Bundle')) {
-            $message = sprintf('No extensions with configuration available for "%s".', $name);
+            $message = \sprintf('No extensions with configuration available for "%s".', $name);
         } else {
-            $message = sprintf('No extension with alias "%s" is enabled.', $name);
+            $message = \sprintf('No extension with alias "%s" is enabled.', $name);
         }
 
         if (isset($guess) && $minScore < 3) {
-            $message .= sprintf("\n\nDid you mean \"%s\"?", $guess);
+            $message .= \sprintf("\n\nDid you mean \"%s\"?", $guess);
         }
 
         throw new LogicException($message);
     }
 
-    /**
-     * @return void
-     */
-    public function validateConfiguration(ExtensionInterface $extension, mixed $configuration)
+    public function validateConfiguration(ExtensionInterface $extension, mixed $configuration): void
     {
         if (!$configuration) {
-            throw new \LogicException(sprintf('The extension with alias "%s" does not have its getConfiguration() method setup.', $extension->getAlias()));
+            throw new \LogicException(\sprintf('The extension with alias "%s" does not have its getConfiguration() method setup.', $extension->getAlias()));
         }
 
         if (!$configuration instanceof ConfigurationInterface) {
-            throw new \LogicException(sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable.', get_debug_type($configuration)));
+            throw new \LogicException(\sprintf('Configuration class "%s" should implement ConfigurationInterface in order to be dumpable.', get_debug_type($configuration)));
         }
     }
 
diff --git a/Command/AssetsInstallCommand.php b/Command/AssetsInstallCommand.php
index 264955d79..5dc8c828e 100644
--- a/Command/AssetsInstallCommand.php
+++ b/Command/AssetsInstallCommand.php
@@ -41,15 +41,11 @@ class AssetsInstallCommand extends Command
     public const METHOD_ABSOLUTE_SYMLINK = 'absolute symlink';
     public const METHOD_RELATIVE_SYMLINK = 'relative symlink';
 
-    private Filesystem $filesystem;
-    private string $projectDir;
-
-    public function __construct(Filesystem $filesystem, string $projectDir)
-    {
+    public function __construct(
+        private Filesystem $filesystem,
+        private string $projectDir,
+    ) {
         parent::__construct();
-
-        $this->filesystem = $filesystem;
-        $this->projectDir = $projectDir;
     }
 
     protected function configure(): void
@@ -97,7 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $targetArg = $kernel->getProjectDir().'/'.$targetArg;
 
             if (!is_dir($targetArg)) {
-                throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $targetArg));
+                throw new InvalidArgumentException(\sprintf('The target directory "%s" does not exist.', $targetArg));
             }
         }
 
@@ -134,7 +130,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $validAssetDirs[] = $assetDir;
 
             if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
-                $message = sprintf("%s\n-> %s", $bundle->getName(), $targetDir);
+                $message = \sprintf("%s\n-> %s", $bundle->getName(), $targetDir);
             } else {
                 $message = $bundle->getName();
             }
@@ -155,13 +151,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 }
 
                 if ($method === $expectedMethod) {
-                    $rows[] = [sprintf('<fg=green;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'OK' : "\xE2\x9C\x94" /* HEAVY CHECK MARK (U+2714) */), $message, $method];
+                    $rows[] = [\sprintf('<fg=green;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'OK' : "\xE2\x9C\x94" /* HEAVY CHECK MARK (U+2714) */), $message, $method];
                 } else {
-                    $rows[] = [sprintf('<fg=yellow;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'WARNING' : '!'), $message, $method];
+                    $rows[] = [\sprintf('<fg=yellow;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'WARNING' : '!'), $message, $method];
                 }
             } catch (\Exception $e) {
                 $exitCode = 1;
-                $rows[] = [sprintf('<fg=red;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage()];
+                $rows[] = [\sprintf('<fg=red;options=bold>%s</>', '\\' === \DIRECTORY_SEPARATOR ? 'ERROR' : "\xE2\x9C\x98" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage()];
             }
         }
         // remove the assets of the bundles that no longer exist
@@ -234,7 +230,7 @@ private function symlink(string $originDir, string $targetDir, bool $relative =
         }
         $this->filesystem->symlink($originDir, $targetDir);
         if (!file_exists($targetDir)) {
-            throw new IOException(sprintf('Symbolic link "%s" was created but appears to be broken.', $targetDir), 0, null, $targetDir);
+            throw new IOException(\sprintf('Symbolic link "%s" was created but appears to be broken.', $targetDir), 0, null, $targetDir);
         }
     }
 
@@ -264,7 +260,7 @@ private function getPublicDirectory(ContainerInterface $container): string
             return $defaultPublicDir;
         }
 
-        $composerConfig = json_decode(file_get_contents($composerFilePath), true);
+        $composerConfig = json_decode($this->filesystem->readFile($composerFilePath), true, flags: \JSON_THROW_ON_ERROR);
 
         return $composerConfig['extra']['public-dir'] ?? $defaultPublicDir;
     }
diff --git a/Command/CacheClearCommand.php b/Command/CacheClearCommand.php
index eeafd1bd3..0e48ead59 100644
--- a/Command/CacheClearCommand.php
+++ b/Command/CacheClearCommand.php
@@ -37,14 +37,14 @@
 #[AsCommand(name: 'cache:clear', description: 'Clear the cache')]
 class CacheClearCommand extends Command
 {
-    private CacheClearerInterface $cacheClearer;
     private Filesystem $filesystem;
 
-    public function __construct(CacheClearerInterface $cacheClearer, ?Filesystem $filesystem = null)
-    {
+    public function __construct(
+        private CacheClearerInterface $cacheClearer,
+        ?Filesystem $filesystem = null,
+    ) {
         parent::__construct();
 
-        $this->cacheClearer = $cacheClearer;
         $this->filesystem = $filesystem ?? new Filesystem();
     }
 
@@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $fs->remove($oldCacheDir);
 
         if (!is_writable($realCacheDir)) {
-            throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realCacheDir));
+            throw new RuntimeException(\sprintf('Unable to write in the "%s" directory.', $realCacheDir));
         }
 
         $useBuildDir = $realBuildDir !== $realCacheDir;
@@ -89,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $fs->remove($oldBuildDir);
 
             if (!is_writable($realBuildDir)) {
-                throw new RuntimeException(sprintf('Unable to write in the "%s" directory.', $realBuildDir));
+                throw new RuntimeException(\sprintf('Unable to write in the "%s" directory.', $realBuildDir));
             }
 
             if ($this->isNfs($realCacheDir)) {
@@ -100,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $fs->mkdir($realCacheDir);
         }
 
-        $io->comment(sprintf('Clearing the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->comment(\sprintf('Clearing the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
         if ($useBuildDir) {
             $this->cacheClearer->clear($realBuildDir);
         }
@@ -151,7 +151,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $search = [$warmupDir, str_replace('/', '\\/', $warmupDir), str_replace('\\', '\\\\', $warmupDir)];
                 $replace = str_replace('\\', '/', $realBuildDir);
                 foreach (Finder::create()->files()->in($warmupDir) as $file) {
-                    $content = str_replace($search, $replace, file_get_contents($file), $count);
+                    $content = str_replace($search, $replace, $this->filesystem->readFile($file), $count);
                     if ($count) {
                         file_put_contents($file, $content);
                     }
@@ -199,7 +199,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $io->comment('Finished');
         }
 
-        $io->success(sprintf('Cache for the "%s" environment (debug=%s) was successfully cleared.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->success(\sprintf('Cache for the "%s" environment (debug=%s) was successfully cleared.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
 
         return 0;
     }
diff --git a/Command/CachePoolClearCommand.php b/Command/CachePoolClearCommand.php
index 8b8b9cd35..5d840e597 100644
--- a/Command/CachePoolClearCommand.php
+++ b/Command/CachePoolClearCommand.php
@@ -32,18 +32,14 @@
 #[AsCommand(name: 'cache:pool:clear', description: 'Clear cache pools')]
 final class CachePoolClearCommand extends Command
 {
-    private Psr6CacheClearer $poolClearer;
-    private ?array $poolNames;
-
     /**
      * @param string[]|null $poolNames
      */
-    public function __construct(Psr6CacheClearer $poolClearer, ?array $poolNames = null)
-    {
+    public function __construct(
+        private Psr6CacheClearer $poolClearer,
+        private ?array $poolNames = null,
+    ) {
         parent::__construct();
-
-        $this->poolClearer = $poolClearer;
-        $this->poolNames = $poolNames;
     }
 
     protected function configure(): void
@@ -99,28 +95,28 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 } elseif ($pool instanceof Psr6CacheClearer) {
                     $clearers[$id] = $pool;
                 } else {
-                    throw new InvalidArgumentException(sprintf('"%s" is not a cache pool nor a cache clearer.', $id));
+                    throw new InvalidArgumentException(\sprintf('"%s" is not a cache pool nor a cache clearer.', $id));
                 }
             }
         }
 
         foreach ($clearers as $id => $clearer) {
-            $io->comment(sprintf('Calling cache clearer: <info>%s</info>', $id));
+            $io->comment(\sprintf('Calling cache clearer: <info>%s</info>', $id));
             $clearer->clear($kernel->getContainer()->getParameter('kernel.cache_dir'));
         }
 
         $failure = false;
         foreach ($pools as $id => $pool) {
-            $io->comment(sprintf('Clearing cache pool: <info>%s</info>', $id));
+            $io->comment(\sprintf('Clearing cache pool: <info>%s</info>', $id));
 
             if ($pool instanceof CacheItemPoolInterface) {
                 if (!$pool->clear()) {
-                    $io->warning(sprintf('Cache pool "%s" could not be cleared.', $pool));
+                    $io->warning(\sprintf('Cache pool "%s" could not be cleared.', $pool));
                     $failure = true;
                 }
             } else {
                 if (false === $this->poolClearer->clearPool($id)) {
-                    $io->warning(sprintf('Cache pool "%s" could not be cleared.', $pool));
+                    $io->warning(\sprintf('Cache pool "%s" could not be cleared.', $pool));
                     $failure = true;
                 }
             }
diff --git a/Command/CachePoolDeleteCommand.php b/Command/CachePoolDeleteCommand.php
index dfa307bc0..8fb1d1aaa 100644
--- a/Command/CachePoolDeleteCommand.php
+++ b/Command/CachePoolDeleteCommand.php
@@ -29,18 +29,14 @@
 #[AsCommand(name: 'cache:pool:delete', description: 'Delete an item from a cache pool')]
 final class CachePoolDeleteCommand extends Command
 {
-    private Psr6CacheClearer $poolClearer;
-    private ?array $poolNames;
-
     /**
      * @param string[]|null $poolNames
      */
-    public function __construct(Psr6CacheClearer $poolClearer, ?array $poolNames = null)
-    {
+    public function __construct(
+        private Psr6CacheClearer $poolClearer,
+        private ?array $poolNames = null,
+    ) {
         parent::__construct();
-
-        $this->poolClearer = $poolClearer;
-        $this->poolNames = $poolNames;
     }
 
     protected function configure(): void
@@ -67,16 +63,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $cachePool = $this->poolClearer->getPool($pool);
 
         if (!$cachePool->hasItem($key)) {
-            $io->note(sprintf('Cache item "%s" does not exist in cache pool "%s".', $key, $pool));
+            $io->note(\sprintf('Cache item "%s" does not exist in cache pool "%s".', $key, $pool));
 
             return 0;
         }
 
         if (!$cachePool->deleteItem($key)) {
-            throw new \Exception(sprintf('Cache item "%s" could not be deleted.', $key));
+            throw new \Exception(\sprintf('Cache item "%s" could not be deleted.', $key));
         }
 
-        $io->success(sprintf('Cache item "%s" was successfully deleted.', $key));
+        $io->success(\sprintf('Cache item "%s" was successfully deleted.', $key));
 
         return 0;
     }
diff --git a/Command/CachePoolInvalidateTagsCommand.php b/Command/CachePoolInvalidateTagsCommand.php
index 9e6ef9330..f92f0d634 100644
--- a/Command/CachePoolInvalidateTagsCommand.php
+++ b/Command/CachePoolInvalidateTagsCommand.php
@@ -30,14 +30,13 @@
 #[AsCommand(name: 'cache:pool:invalidate-tags', description: 'Invalidate cache tags for all or a specific pool')]
 final class CachePoolInvalidateTagsCommand extends Command
 {
-    private ServiceProviderInterface $pools;
     private array $poolNames;
 
-    public function __construct(ServiceProviderInterface $pools)
-    {
+    public function __construct(
+        private ServiceProviderInterface $pools,
+    ) {
         parent::__construct();
 
-        $this->pools = $pools;
         $this->poolNames = array_keys($pools->getProvidedServices());
     }
 
@@ -65,26 +64,26 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $errors = false;
 
         foreach ($pools as $name) {
-            $io->comment(sprintf('Invalidating tag(s): <info>%s</info> from pool <comment>%s</comment>.', $tagList, $name));
+            $io->comment(\sprintf('Invalidating tag(s): <info>%s</info> from pool <comment>%s</comment>.', $tagList, $name));
 
             try {
                 $pool = $this->pools->get($name);
             } catch (ServiceNotFoundException) {
-                $io->error(sprintf('Pool "%s" not found.', $name));
+                $io->error(\sprintf('Pool "%s" not found.', $name));
                 $errors = true;
 
                 continue;
             }
 
             if (!$pool instanceof TagAwareCacheInterface) {
-                $io->error(sprintf('Pool "%s" is not taggable.', $name));
+                $io->error(\sprintf('Pool "%s" is not taggable.', $name));
                 $errors = true;
 
                 continue;
             }
 
             if (!$pool->invalidateTags($tags)) {
-                $io->error(sprintf('Cache tag(s) "%s" could not be invalidated for pool "%s".', $tagList, $name));
+                $io->error(\sprintf('Cache tag(s) "%s" could not be invalidated for pool "%s".', $tagList, $name));
                 $errors = true;
             }
         }
diff --git a/Command/CachePoolListCommand.php b/Command/CachePoolListCommand.php
index 2659ad8fe..6b8e71eb0 100644
--- a/Command/CachePoolListCommand.php
+++ b/Command/CachePoolListCommand.php
@@ -25,16 +25,13 @@
 #[AsCommand(name: 'cache:pool:list', description: 'List available cache pools')]
 final class CachePoolListCommand extends Command
 {
-    private array $poolNames;
-
     /**
      * @param string[] $poolNames
      */
-    public function __construct(array $poolNames)
-    {
+    public function __construct(
+        private array $poolNames,
+    ) {
         parent::__construct();
-
-        $this->poolNames = $poolNames;
     }
 
     protected function configure(): void
diff --git a/Command/CachePoolPruneCommand.php b/Command/CachePoolPruneCommand.php
index fc0dc6d79..745a001cc 100644
--- a/Command/CachePoolPruneCommand.php
+++ b/Command/CachePoolPruneCommand.php
@@ -26,16 +26,13 @@
 #[AsCommand(name: 'cache:pool:prune', description: 'Prune cache pools')]
 final class CachePoolPruneCommand extends Command
 {
-    private iterable $pools;
-
     /**
      * @param iterable<mixed, PruneableInterface> $pools
      */
-    public function __construct(iterable $pools)
-    {
+    public function __construct(
+        private iterable $pools,
+    ) {
         parent::__construct();
-
-        $this->pools = $pools;
     }
 
     protected function configure(): void
@@ -55,7 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io = new SymfonyStyle($input, $output);
 
         foreach ($this->pools as $name => $pool) {
-            $io->comment(sprintf('Pruning cache pool: <info>%s</info>', $name));
+            $io->comment(\sprintf('Pruning cache pool: <info>%s</info>', $name));
             $pool->prune();
         }
 
diff --git a/Command/CacheWarmupCommand.php b/Command/CacheWarmupCommand.php
index 6f1073de4..b096b0801 100644
--- a/Command/CacheWarmupCommand.php
+++ b/Command/CacheWarmupCommand.php
@@ -31,13 +31,10 @@
 #[AsCommand(name: 'cache:warmup', description: 'Warm up an empty cache')]
 class CacheWarmupCommand extends Command
 {
-    private CacheWarmerAggregate $cacheWarmer;
-
-    public function __construct(CacheWarmerAggregate $cacheWarmer)
-    {
+    public function __construct(
+        private CacheWarmerAggregate $cacheWarmer,
+    ) {
         parent::__construct();
-
-        $this->cacheWarmer = $cacheWarmer;
     }
 
     protected function configure(): void
@@ -61,7 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io = new SymfonyStyle($input, $output);
 
         $kernel = $this->getApplication()->getKernel();
-        $io->comment(sprintf('Warming up the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->comment(\sprintf('Warming up the cache for the <info>%s</info> environment with debug <info>%s</info>', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
 
         if (!$input->getOption('no-optional-warmers')) {
             $this->cacheWarmer->enableOptionalWarmers();
@@ -79,7 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             Preloader::append($preloadFile, $preload);
         }
 
-        $io->success(sprintf('Cache for the "%s" environment (debug=%s) was successfully warmed.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
+        $io->success(\sprintf('Cache for the "%s" environment (debug=%s) was successfully warmed.', $kernel->getEnvironment(), var_export($kernel->isDebug(), true)));
 
         return 0;
     }
diff --git a/Command/ConfigDebugCommand.php b/Command/ConfigDebugCommand.php
index cc116fc68..55c101e9c 100644
--- a/Command/ConfigDebugCommand.php
+++ b/Command/ConfigDebugCommand.php
@@ -41,15 +41,12 @@ class ConfigDebugCommand extends AbstractConfigCommand
 {
     protected function configure(): void
     {
-        $commentedHelpFormats = array_map(fn ($format) => sprintf('<comment>%s</comment>', $format), $this->getAvailableFormatOptions());
-        $helpFormats = implode('", "', $commentedHelpFormats);
-
         $this
             ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'The bundle name or the extension alias'),
                 new InputArgument('path', InputArgument::OPTIONAL, 'The configuration option path'),
                 new InputOption('resolve-env', null, InputOption::VALUE_NONE, 'Display resolved environment variable values instead of placeholders'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), class_exists(Yaml::class) ? 'txt' : 'json'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), class_exists(Yaml::class) ? 'txt' : 'json'),
             ])
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command dumps the current configuration for an
@@ -60,8 +57,7 @@ protected function configure(): void
   <info>php %command.full_name% framework</info>
   <info>php %command.full_name% FrameworkBundle</info>
 
-The <info>--format</info> option specifies the format of the configuration,
-these are "{$helpFormats}".
+The <info>--format</info> option specifies the format of the command output:
 
   <info>php %command.full_name% framework --format=json</info>
 
@@ -106,7 +102,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if (null === $path = $input->getArgument('path')) {
             if ('txt' === $input->getOption('format')) {
                 $io->title(
-                    sprintf('Current configuration for %s', $name === $extensionAlias ? sprintf('extension with alias "%s"', $extensionAlias) : sprintf('"%s"', $name))
+                    \sprintf('Current configuration for %s', $name === $extensionAlias ? \sprintf('extension with alias "%s"', $extensionAlias) : \sprintf('"%s"', $name))
                 );
             }
 
@@ -123,7 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 1;
         }
 
-        $io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
+        $io->title(\sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
 
         $io->writeln($this->convertToFormat($config, $format));
 
@@ -135,7 +131,7 @@ private function convertToFormat(mixed $config, string $format): string
         return match ($format) {
             'txt', 'yaml' => Yaml::dump($config, 10),
             'json' => json_encode($config, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE),
-            default => throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
+            default => throw new InvalidArgumentException(\sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions()))),
         };
     }
 
@@ -162,7 +158,7 @@ private function getConfigForPath(array $config, string $path, string $alias): m
 
         foreach ($steps as $step) {
             if (!\array_key_exists($step, $config)) {
-                throw new LogicException(sprintf('Unable to find configuration for "%s.%s".', $alias, $path));
+                throw new LogicException(\sprintf('Unable to find configuration for "%s.%s".', $alias, $path));
             }
 
             $config = $config[$step];
@@ -190,7 +186,7 @@ private function getConfigForExtension(ExtensionInterface $extension, ContainerB
         // Fall back to default config if the extension has one
 
         if (!$extension instanceof ConfigurationExtensionInterface && !$extension instanceof ConfigurationInterface) {
-            throw new \LogicException(sprintf('The extension with alias "%s" does not have configuration.', $extensionAlias));
+            throw new \LogicException(\sprintf('The extension with alias "%s" does not have configuration.', $extensionAlias));
         }
 
         $configs = $container->getExtensionConfig($extensionAlias);
@@ -268,6 +264,7 @@ private static function buildPathsCompletion(array $paths, string $prefix = ''):
         return $completionPaths;
     }
 
+    /** @return string[] */
     private function getAvailableFormatOptions(): array
     {
         return ['txt', 'yaml', 'json'];
diff --git a/Command/ConfigDumpReferenceCommand.php b/Command/ConfigDumpReferenceCommand.php
index 3231e5a47..7e5cd765f 100644
--- a/Command/ConfigDumpReferenceCommand.php
+++ b/Command/ConfigDumpReferenceCommand.php
@@ -39,14 +39,11 @@ class ConfigDumpReferenceCommand extends AbstractConfigCommand
 {
     protected function configure(): void
     {
-        $commentedHelpFormats = array_map(fn ($format) => sprintf('<comment>%s</comment>', $format), $this->getAvailableFormatOptions());
-        $helpFormats = implode('", "', $commentedHelpFormats);
-
         $this
             ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'The Bundle name or the extension alias'),
                 new InputArgument('path', InputArgument::OPTIONAL, 'The configuration option path'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'yaml'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'yaml'),
             ])
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command dumps the default configuration for an
@@ -57,10 +54,9 @@ protected function configure(): void
   <info>php %command.full_name% framework</info>
   <info>php %command.full_name% FrameworkBundle</info>
 
-The <info>--format</info> option specifies the format of the configuration,
-these are "{$helpFormats}".
+The <info>--format</info> option specifies the format of the command output:
 
-  <info>php %command.full_name% FrameworkBundle --format=xml</info>
+  <info>php %command.full_name% FrameworkBundle --format=json</info>
 
 For dumping a specific option, add its path as second argument (only available for the yaml format):
 
@@ -118,27 +114,27 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         if ($name === $extension->getAlias()) {
-            $message = sprintf('Default configuration for extension with alias: "%s"', $name);
+            $message = \sprintf('Default configuration for extension with alias: "%s"', $name);
         } else {
-            $message = sprintf('Default configuration for "%s"', $name);
+            $message = \sprintf('Default configuration for "%s"', $name);
         }
 
         if (null !== $path) {
-            $message .= sprintf(' at path "%s"', $path);
+            $message .= \sprintf(' at path "%s"', $path);
         }
 
         switch ($format) {
             case 'yaml':
-                $io->writeln(sprintf('# %s', $message));
+                $io->writeln(\sprintf('# %s', $message));
                 $dumper = new YamlReferenceDumper();
                 break;
             case 'xml':
-                $io->writeln(sprintf('<!-- %s -->', $message));
+                $io->writeln(\sprintf('<!-- %s -->', $message));
                 $dumper = new XmlReferenceDumper();
                 break;
             default:
                 $io->writeln($message);
-                throw new InvalidArgumentException(sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions())));
+                throw new InvalidArgumentException(\sprintf('Supported formats are "%s".', implode('", "', $this->getAvailableFormatOptions())));
         }
 
         $io->writeln(null === $path ? $dumper->dump($configuration, $extension->getNamespace()) : $dumper->dumpAtPath($configuration, $path));
@@ -181,6 +177,7 @@ private function getAvailableBundles(): array
         return $bundles;
     }
 
+    /** @return string[] */
     private function getAvailableFormatOptions(): array
     {
         return ['yaml', 'xml'];
diff --git a/Command/ContainerDebugCommand.php b/Command/ContainerDebugCommand.php
index 3000da51a..2c5b8291b 100644
--- a/Command/ContainerDebugCommand.php
+++ b/Command/ContainerDebugCommand.php
@@ -52,7 +52,7 @@ protected function configure(): void
                 new InputOption('types', null, InputOption::VALUE_NONE, 'Display types (classes/interfaces) available in the container'),
                 new InputOption('env-var', null, InputOption::VALUE_REQUIRED, 'Display a specific environment variable used in the container'),
                 new InputOption('env-vars', null, InputOption::VALUE_NONE, 'Display environment variables used in the container'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
                 new InputOption('deprecations', null, InputOption::VALUE_NONE, 'Display deprecations generated when compiling and warming up the container'),
             ])
@@ -106,6 +106,9 @@ protected function configure(): void
 
   <info>php %command.full_name% --show-hidden</info>
 
+The <info>--format</info> option specifies the format of the command output:
+
+  <info>php %command.full_name% --format=json</info>
 EOF
             )
         ;
@@ -171,19 +174,19 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 if ($object->hasDefinition($options['id'])) {
                     $definition = $object->getDefinition($options['id']);
                     if ($definition->isDeprecated()) {
-                        $errorIo->warning($definition->getDeprecation($options['id'])['message'] ?? sprintf('The "%s" service is deprecated.', $options['id']));
+                        $errorIo->warning($definition->getDeprecation($options['id'])['message'] ?? \sprintf('The "%s" service is deprecated.', $options['id']));
                     }
                 }
                 if ($object->hasAlias($options['id'])) {
                     $alias = $object->getAlias($options['id']);
                     if ($alias->isDeprecated()) {
-                        $errorIo->warning($alias->getDeprecation($options['id'])['message'] ?? sprintf('The "%s" alias is deprecated.', $options['id']));
+                        $errorIo->warning($alias->getDeprecation($options['id'])['message'] ?? \sprintf('The "%s" alias is deprecated.', $options['id']));
                     }
                 }
             }
 
             if (isset($options['id']) && isset($kernel->getContainer()->getRemovedIds()[$options['id']])) {
-                $errorIo->note(sprintf('The "%s" service or alias has been removed or inlined when the container was compiled.', $options['id']));
+                $errorIo->note(\sprintf('The "%s" service or alias has been removed or inlined when the container was compiled.', $options['id']));
             }
         } catch (ServiceNotFoundException $e) {
             if ('' !== $e->getId() && '@' === $e->getId()[0]) {
@@ -277,7 +280,7 @@ private function findProperServiceName(InputInterface $input, SymfonyStyle $io,
 
         $matchingServices = $this->findServiceIdsContaining($container, $name, $showHidden);
         if (!$matchingServices) {
-            throw new InvalidArgumentException(sprintf('No services found that match "%s".', $name));
+            throw new InvalidArgumentException(\sprintf('No services found that match "%s".', $name));
         }
 
         if (1 === \count($matchingServices)) {
@@ -297,7 +300,7 @@ private function findProperTagName(InputInterface $input, SymfonyStyle $io, Cont
 
         $matchingTags = $this->findTagsContaining($container, $tagName);
         if (!$matchingTags) {
-            throw new InvalidArgumentException(sprintf('No tags found that match "%s".', $tagName));
+            throw new InvalidArgumentException(\sprintf('No tags found that match "%s".', $tagName));
         }
 
         if (1 === \count($matchingTags)) {
@@ -362,6 +365,7 @@ public function filterToServiceTypes(string $serviceId): bool
         return class_exists($serviceId) || interface_exists($serviceId, false);
     }
 
+    /** @return string[] */
     private function getAvailableFormatOptions(): array
     {
         return (new DescriptorHelper())->getFormats();
diff --git a/Command/ContainerLintCommand.php b/Command/ContainerLintCommand.php
index b63ebe431..e794e88c4 100644
--- a/Command/ContainerLintCommand.php
+++ b/Command/ContainerLintCommand.php
@@ -17,8 +17,10 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\DependencyInjection\Compiler\CheckAliasValidityPass;
 use Symfony\Component\DependencyInjection\Compiler\CheckTypeDeclarationsPass;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\Compiler\ResolveFactoryClassPass;
@@ -38,6 +40,7 @@ protected function configure(): void
     {
         $this
             ->setHelp('This command parses service definitions and ensures that injected values match the type declarations of each services\' class.')
+            ->addOption('resolve-env-vars', null, InputOption::VALUE_NONE, 'Resolve environment variables and fail if one is missing.')
         ;
     }
 
@@ -57,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $container->setParameter('container.build_time', time());
 
         try {
-            $container->compile();
+            $container->compile((bool) $input->getOption('resolve-env-vars'));
         } catch (InvalidArgumentException $e) {
             $errorIo->error($e->getMessage());
 
@@ -80,7 +83,7 @@ private function getContainerBuilder(): ContainerBuilder
 
         if (!$kernel->isDebug() || !$kernelContainer->getParameter('debug.container.dump') || !(new ConfigCache($kernelContainer->getParameter('debug.container.dump'), true))->isFresh()) {
             if (!$kernel instanceof Kernel) {
-                throw new RuntimeException(sprintf('This command does not support the application kernel: "%s" does not extend "%s".', get_debug_type($kernel), Kernel::class));
+                throw new RuntimeException(\sprintf('This command does not support the application kernel: "%s" does not extend "%s".', get_debug_type($kernel), Kernel::class));
             }
 
             $buildContainer = \Closure::bind(function (): ContainerBuilder {
@@ -91,7 +94,7 @@ private function getContainerBuilder(): ContainerBuilder
             $container = $buildContainer();
         } else {
             if (!$kernelContainer instanceof Container) {
-                throw new RuntimeException(sprintf('This command does not support the application container: "%s" does not extend "%s".', get_debug_type($kernelContainer), Container::class));
+                throw new RuntimeException(\sprintf('This command does not support the application container: "%s" does not extend "%s".', get_debug_type($kernelContainer), Container::class));
             }
 
             (new XmlFileLoader($container = new ContainerBuilder($parameterBag = new EnvPlaceholderParameterBag()), new FileLocator()))->load($kernelContainer->getParameter('debug.container.dump'));
@@ -107,6 +110,7 @@ private function getContainerBuilder(): ContainerBuilder
         $container->setParameter('container.build_hash', 'lint_container');
         $container->setParameter('container.build_id', 'lint_container');
 
+        $container->addCompilerPass(new CheckAliasValidityPass(), PassConfig::TYPE_BEFORE_REMOVING, -100);
         $container->addCompilerPass(new CheckTypeDeclarationsPass(true), PassConfig::TYPE_AFTER_REMOVING, -100);
 
         return $this->container = $container;
diff --git a/Command/DebugAutowiringCommand.php b/Command/DebugAutowiringCommand.php
index f6efd8bef..e159c5a39 100644
--- a/Command/DebugAutowiringCommand.php
+++ b/Command/DebugAutowiringCommand.php
@@ -33,11 +33,10 @@
 #[AsCommand(name: 'debug:autowiring', description: 'List classes/interfaces you can use for autowiring')]
 class DebugAutowiringCommand extends ContainerDebugCommand
 {
-    private ?FileLinkFormatter $fileLinkFormatter;
-
-    public function __construct(?string $name = null, ?FileLinkFormatter $fileLinkFormatter = null)
-    {
-        $this->fileLinkFormatter = $fileLinkFormatter;
+    public function __construct(
+        ?string $name = null,
+        private ?FileLinkFormatter $fileLinkFormatter = null,
+    ) {
         parent::__construct($name);
     }
 
@@ -78,7 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $serviceIds = array_filter($serviceIds, fn ($serviceId) => false !== stripos(str_replace('\\', '', $serviceId), $searchNormalized) && !str_starts_with($serviceId, '.'));
 
             if (!$serviceIds) {
-                $errorIo->error(sprintf('No autowirable classes or interfaces found matching "%s"', $search));
+                $errorIo->error(\sprintf('No autowirable classes or interfaces found matching "%s"', $search));
 
                 return 1;
             }
@@ -97,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io->title('Autowirable Types');
         $io->text('The following classes & interfaces can be used as type-hints when autowiring:');
         if ($search) {
-            $io->text(sprintf('(only showing classes/interfaces matching <comment>%s</comment>)', $search));
+            $io->text(\sprintf('(only showing classes/interfaces matching <comment>%s</comment>)', $search));
         }
         $hasAlias = [];
         $all = $input->getOption('all');
@@ -120,10 +119,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 }
             }
 
-            $serviceLine = sprintf('<fg=yellow>%s</>', $serviceId);
+            $serviceLine = \sprintf('<fg=yellow>%s</>', $serviceId);
             if ('' !== $fileLink = $this->getFileLink($previousId)) {
                 $serviceLine = substr($serviceId, \strlen($previousId));
-                $serviceLine = sprintf('<fg=yellow;href=%s>%s</>', $fileLink, $previousId).('' !== $serviceLine ? sprintf('<fg=yellow>%s</>', $serviceLine) : '');
+                $serviceLine = \sprintf('<fg=yellow;href=%s>%s</>', $fileLink, $previousId).('' !== $serviceLine ? \sprintf('<fg=yellow>%s</>', $serviceLine) : '');
             }
 
             if ($container->hasAlias($serviceId)) {
@@ -168,7 +167,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io->newLine();
 
         if (0 < $serviceIdsNb) {
-            $io->text(sprintf('%s more concrete service%s would be displayed when adding the "--all" option.', $serviceIdsNb, $serviceIdsNb > 1 ? 's' : ''));
+            $io->text(\sprintf('%s more concrete service%s would be displayed when adding the "--all" option.', $serviceIdsNb, $serviceIdsNb > 1 ? 's' : ''));
         }
         if ($all) {
             $io->text('Pro-tip: use interfaces in your type-hints instead of classes to benefit from the dependency inversion principle.');
diff --git a/Command/EventDispatcherDebugCommand.php b/Command/EventDispatcherDebugCommand.php
index 1a74e8682..3c51cb1b7 100644
--- a/Command/EventDispatcherDebugCommand.php
+++ b/Command/EventDispatcherDebugCommand.php
@@ -37,13 +37,10 @@ class EventDispatcherDebugCommand extends Command
 {
     private const DEFAULT_DISPATCHER = 'event_dispatcher';
 
-    private ContainerInterface $dispatchers;
-
-    public function __construct(ContainerInterface $dispatchers)
-    {
+    public function __construct(
+        private ContainerInterface $dispatchers,
+    ) {
         parent::__construct();
-
-        $this->dispatchers = $dispatchers;
     }
 
     protected function configure(): void
@@ -52,7 +49,7 @@ protected function configure(): void
             ->setDefinition([
                 new InputArgument('event', InputArgument::OPTIONAL, 'An event name or a part of the event name'),
                 new InputOption('dispatcher', null, InputOption::VALUE_REQUIRED, 'To view events of a specific event dispatcher', self::DEFAULT_DISPATCHER),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
             ])
             ->setHelp(<<<'EOF'
@@ -63,6 +60,10 @@ protected function configure(): void
 To get specific listeners for an event, specify its name:
 
   <info>php %command.full_name% kernel.request</info>
+
+The <info>--format</info> option specifies the format of the command output:
+
+  <info>php %command.full_name% --format=json</info>
 EOF
             )
         ;
@@ -78,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $options = [];
         $dispatcherServiceName = $input->getOption('dispatcher');
         if (!$this->dispatchers->has($dispatcherServiceName)) {
-            $io->getErrorStyle()->error(sprintf('Event dispatcher "%s" is not available.', $dispatcherServiceName));
+            $io->getErrorStyle()->error(\sprintf('Event dispatcher "%s" is not available.', $dispatcherServiceName));
 
             return 1;
         }
@@ -92,7 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 // if there is no direct match, try find partial matches
                 $events = $this->searchForEvent($dispatcher, $event);
                 if (0 === \count($events)) {
-                    $io->getErrorStyle()->warning(sprintf('The event "%s" does not have any registered listeners.', $event));
+                    $io->getErrorStyle()->warning(\sprintf('The event "%s" does not have any registered listeners.', $event));
 
                     return 0;
                 } elseif (1 === \count($events)) {
@@ -156,6 +157,7 @@ private function searchForEvent(EventDispatcherInterface $dispatcher, string $ne
         return $output;
     }
 
+    /** @return string[] */
     private function getAvailableFormatOptions(): array
     {
         return (new DescriptorHelper())->getFormats();
diff --git a/Command/RouterDebugCommand.php b/Command/RouterDebugCommand.php
index 9318b46be..13a6f75d0 100644
--- a/Command/RouterDebugCommand.php
+++ b/Command/RouterDebugCommand.php
@@ -39,15 +39,11 @@ class RouterDebugCommand extends Command
 {
     use BuildDebugContainerTrait;
 
-    private RouterInterface $router;
-    private ?FileLinkFormatter $fileLinkFormatter;
-
-    public function __construct(RouterInterface $router, ?FileLinkFormatter $fileLinkFormatter = null)
-    {
+    public function __construct(
+        private RouterInterface $router,
+        private ?FileLinkFormatter $fileLinkFormatter = null,
+    ) {
         parent::__construct();
-
-        $this->router = $router;
-        $this->fileLinkFormatter = $fileLinkFormatter;
     }
 
     protected function configure(): void
@@ -57,7 +53,7 @@ protected function configure(): void
                 new InputArgument('name', InputArgument::OPTIONAL, 'A route name'),
                 new InputOption('show-controllers', null, InputOption::VALUE_NONE, 'Show assigned controllers in overview'),
                 new InputOption('show-aliases', null, InputOption::VALUE_NONE, 'Show aliases in overview'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, \sprintf('The output format ("%s")', implode('", "', $this->getAvailableFormatOptions())), 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw route(s)'),
             ])
             ->setHelp(<<<'EOF'
@@ -65,6 +61,9 @@ protected function configure(): void
 
   <info>php %command.full_name%</info>
 
+The <info>--format</info> option specifies the format of the command output:
+
+  <info>php %command.full_name% --format=json</info>
 EOF
             )
         ;
@@ -107,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
 
             if (!$route) {
-                throw new InvalidArgumentException(sprintf('The route "%s" does not exist.', $name));
+                throw new InvalidArgumentException(\sprintf('The route "%s" does not exist.', $name));
             }
 
             $helper->describe($io, $route, [
@@ -168,6 +167,7 @@ private function findRouteContaining(string $name, RouteCollection $routes): Rou
         return $foundRoutes;
     }
 
+    /** @return string[] */
     private function getAvailableFormatOptions(): array
     {
         return (new DescriptorHelper())->getFormats();
diff --git a/Command/RouterMatchCommand.php b/Command/RouterMatchCommand.php
index 7efd1f3ed..3f0ea3cb5 100644
--- a/Command/RouterMatchCommand.php
+++ b/Command/RouterMatchCommand.php
@@ -33,18 +33,14 @@
 #[AsCommand(name: 'router:match', description: 'Help debug routes by simulating a path info match')]
 class RouterMatchCommand extends Command
 {
-    private RouterInterface $router;
-    private iterable $expressionLanguageProviders;
-
     /**
      * @param iterable<mixed, ExpressionFunctionProviderInterface> $expressionLanguageProviders
      */
-    public function __construct(RouterInterface $router, iterable $expressionLanguageProviders = [])
-    {
+    public function __construct(
+        private RouterInterface $router,
+        private iterable $expressionLanguageProviders = [],
+    ) {
         parent::__construct();
-
-        $this->router = $router;
-        $this->expressionLanguageProviders = $expressionLanguageProviders;
     }
 
     protected function configure(): void
@@ -97,21 +93,21 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $matches = false;
         foreach ($traces as $trace) {
             if (TraceableUrlMatcher::ROUTE_ALMOST_MATCHES == $trace['level']) {
-                $io->text(sprintf('Route <info>"%s"</> almost matches but %s', $trace['name'], lcfirst($trace['log'])));
+                $io->text(\sprintf('Route <info>"%s"</> almost matches but %s', $trace['name'], lcfirst($trace['log'])));
             } elseif (TraceableUrlMatcher::ROUTE_MATCHES == $trace['level']) {
-                $io->success(sprintf('Route "%s" matches', $trace['name']));
+                $io->success(\sprintf('Route "%s" matches', $trace['name']));
 
                 $routerDebugCommand = $this->getApplication()->find('debug:router');
                 $routerDebugCommand->run(new ArrayInput(['name' => $trace['name']]), $output);
 
                 $matches = true;
             } elseif ($input->getOption('verbose')) {
-                $io->text(sprintf('Route "%s" does not match: %s', $trace['name'], $trace['log']));
+                $io->text(\sprintf('Route "%s" does not match: %s', $trace['name'], $trace['log']));
             }
         }
 
         if (!$matches) {
-            $io->error(sprintf('None of the routes match the path "%s"', $input->getArgument('path_info')));
+            $io->error(\sprintf('None of the routes match the path "%s"', $input->getArgument('path_info')));
 
             return 1;
         }
diff --git a/Command/SecretsDecryptToLocalCommand.php b/Command/SecretsDecryptToLocalCommand.php
index 5945c16cc..4e392b677 100644
--- a/Command/SecretsDecryptToLocalCommand.php
+++ b/Command/SecretsDecryptToLocalCommand.php
@@ -28,14 +28,10 @@
 #[AsCommand(name: 'secrets:decrypt-to-local', description: 'Decrypt all secrets and stores them in the local vault')]
 final class SecretsDecryptToLocalCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
-
-    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
-    {
-        $this->vault = $vault;
-        $this->localVault = $localVault;
-
+    public function __construct(
+        private AbstractVault $vault,
+        private ?AbstractVault $localVault = null,
+    ) {
         parent::__construct();
     }
 
@@ -68,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $secrets = $this->vault->list(true);
 
-        $io->comment(sprintf('%d secret%s found in the vault.', \count($secrets), 1 !== \count($secrets) ? 's' : ''));
+        $io->comment(\sprintf('%d secret%s found in the vault.', \count($secrets), 1 !== \count($secrets) ? 's' : ''));
 
         $skipped = 0;
         if (!$input->getOption('force')) {
@@ -82,14 +78,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         if ($skipped > 0) {
             $io->warning([
-                sprintf('%d secret%s already overridden in the local vault and will be skipped.', $skipped, 1 !== $skipped ? 's are' : ' is'),
+                \sprintf('%d secret%s already overridden in the local vault and will be skipped.', $skipped, 1 !== $skipped ? 's are' : ' is'),
                 'Use the --force flag to override these.',
             ]);
         }
 
+        $hadErrors = false;
         foreach ($secrets as $k => $v) {
             if (null === $v) {
-                $io->error($this->vault->getLastMessage() ?? sprintf('Secret "%s" has been skipped as there was an error reading it.', $k));
+                $io->error($this->vault->getLastMessage() ?? \sprintf('Secret "%s" has been skipped as there was an error reading it.', $k));
+                $hadErrors = true;
                 continue;
             }
 
@@ -97,6 +95,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $io->note($this->localVault->getLastMessage());
         }
 
+        if ($hadErrors) {
+            return 1;
+        }
+
         return 0;
     }
 }
diff --git a/Command/SecretsEncryptFromLocalCommand.php b/Command/SecretsEncryptFromLocalCommand.php
index 46e0baffc..9740098e5 100644
--- a/Command/SecretsEncryptFromLocalCommand.php
+++ b/Command/SecretsEncryptFromLocalCommand.php
@@ -27,14 +27,10 @@
 #[AsCommand(name: 'secrets:encrypt-from-local', description: 'Encrypt all local secrets to the vault')]
 final class SecretsEncryptFromLocalCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
-
-    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
-    {
-        $this->vault = $vault;
-        $this->localVault = $localVault;
-
+    public function __construct(
+        private AbstractVault $vault,
+        private ?AbstractVault $localVault = null,
+    ) {
         parent::__construct();
     }
 
diff --git a/Command/SecretsGenerateKeysCommand.php b/Command/SecretsGenerateKeysCommand.php
index 989eff9fd..66a752eac 100644
--- a/Command/SecretsGenerateKeysCommand.php
+++ b/Command/SecretsGenerateKeysCommand.php
@@ -30,14 +30,10 @@
 #[AsCommand(name: 'secrets:generate-keys', description: 'Generate new encryption keys')]
 final class SecretsGenerateKeysCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
-
-    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
-    {
-        $this->vault = $vault;
-        $this->localVault = $localVault;
-
+    public function __construct(
+        private AbstractVault $vault,
+        private ?AbstractVault $localVault = null,
+    ) {
         parent::__construct();
     }
 
diff --git a/Command/SecretsListCommand.php b/Command/SecretsListCommand.php
index 9a24f4a90..920b3b1fc 100644
--- a/Command/SecretsListCommand.php
+++ b/Command/SecretsListCommand.php
@@ -31,14 +31,10 @@
 #[AsCommand(name: 'secrets:list', description: 'List all secrets')]
 final class SecretsListCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
-
-    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
-    {
-        $this->vault = $vault;
-        $this->localVault = $localVault;
-
+    public function __construct(
+        private AbstractVault $vault,
+        private ?AbstractVault $localVault = null,
+    ) {
         parent::__construct();
     }
 
@@ -66,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io->comment('Use <info>"%env(<name>)%"</info> to reference a secret in a config file.');
 
         if (!$reveal = $input->getOption('reveal')) {
-            $io->comment(sprintf('To reveal the secrets run <info>php %s %s --reveal</info>', $_SERVER['PHP_SELF'], $this->getName()));
+            $io->comment(\sprintf('To reveal the secrets run <info>php %s %s --reveal</info>', $_SERVER['PHP_SELF'], $this->getName()));
         }
 
         $secrets = $this->vault->list($reveal);
diff --git a/Command/SecretsRemoveCommand.php b/Command/SecretsRemoveCommand.php
index 1789f2981..11660b00d 100644
--- a/Command/SecretsRemoveCommand.php
+++ b/Command/SecretsRemoveCommand.php
@@ -32,14 +32,10 @@
 #[AsCommand(name: 'secrets:remove', description: 'Remove a secret from the vault')]
 final class SecretsRemoveCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
-
-    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
-    {
-        $this->vault = $vault;
-        $this->localVault = $localVault;
-
+    public function __construct(
+        private AbstractVault $vault,
+        private ?AbstractVault $localVault = null,
+    ) {
         parent::__construct();
     }
 
diff --git a/Command/SecretsRevealCommand.php b/Command/SecretsRevealCommand.php
new file mode 100644
index 000000000..150186b1d
--- /dev/null
+++ b/Command/SecretsRevealCommand.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Command;
+
+use Symfony\Bundle\FrameworkBundle\Secrets\AbstractVault;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+/**
+ * @internal
+ */
+#[AsCommand(name: 'secrets:reveal', description: 'Reveal the value of a secret')]
+final class SecretsRevealCommand extends Command
+{
+    public function __construct(
+        private readonly AbstractVault $vault,
+        private readonly ?AbstractVault $localVault = null,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->addArgument('name', InputArgument::REQUIRED, 'The name of the secret to reveal', null, fn () => array_keys($this->vault->list()))
+            ->setHelp(<<<'EOF'
+The <info>%command.name%</info> command reveals a stored secret.
+
+    <info>%command.full_name%</info>
+EOF
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output);
+
+        $secrets = $this->vault->list(true);
+        $localSecrets = $this->localVault?->list(true);
+
+        $name = (string) $input->getArgument('name');
+
+        if (null !== $localSecrets && \array_key_exists($name, $localSecrets)) {
+            $io->writeln($localSecrets[$name]);
+        } else {
+            if (!\array_key_exists($name, $secrets)) {
+                $io->error(\sprintf('The secret "%s" does not exist.', $name));
+
+                return self::INVALID;
+            }
+
+            $io->writeln($secrets[$name]);
+        }
+
+        return self::SUCCESS;
+    }
+}
diff --git a/Command/SecretsSetCommand.php b/Command/SecretsSetCommand.php
index 2d2b8c5cb..f7e8eeaa6 100644
--- a/Command/SecretsSetCommand.php
+++ b/Command/SecretsSetCommand.php
@@ -33,14 +33,10 @@
 #[AsCommand(name: 'secrets:set', description: 'Set a secret in the vault')]
 final class SecretsSetCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
-
-    public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
-    {
-        $this->vault = $vault;
-        $this->localVault = $localVault;
-
+    public function __construct(
+        private AbstractVault $vault,
+        private ?AbstractVault $localVault = null,
+    ) {
         parent::__construct();
     }
 
@@ -88,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         if ($this->localVault === $vault && !\array_key_exists($name, $this->vault->list())) {
-            $io->error(sprintf('Secret "%s" does not exist in the vault, you cannot override it locally.', $name));
+            $io->error(\sprintf('Secret "%s" does not exist in the vault, you cannot override it locally.', $name));
 
             return 1;
         }
@@ -107,9 +103,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         } elseif (is_file($file) && is_readable($file)) {
             $value = file_get_contents($file);
         } elseif (!is_file($file)) {
-            throw new \InvalidArgumentException(sprintf('File not found: "%s".', $file));
+            throw new \InvalidArgumentException(\sprintf('File not found: "%s".', $file));
         } elseif (!is_readable($file)) {
-            throw new \InvalidArgumentException(sprintf('File is not readable: "%s".', $file));
+            throw new \InvalidArgumentException(\sprintf('File is not readable: "%s".', $file));
         }
 
         if ($vault->generateKeys()) {
diff --git a/Command/TranslationDebugCommand.php b/Command/TranslationDebugCommand.php
index ecb0ad8d7..9cdfdae04 100644
--- a/Command/TranslationDebugCommand.php
+++ b/Command/TranslationDebugCommand.php
@@ -50,27 +50,17 @@ class TranslationDebugCommand extends Command
     public const MESSAGE_UNUSED = 1;
     public const MESSAGE_EQUALS_FALLBACK = 2;
 
-    private TranslatorInterface $translator;
-    private TranslationReaderInterface $reader;
-    private ExtractorInterface $extractor;
-    private ?string $defaultTransPath;
-    private ?string $defaultViewsPath;
-    private array $transPaths;
-    private array $codePaths;
-    private array $enabledLocales;
-
-    public function __construct(TranslatorInterface $translator, TranslationReaderInterface $reader, ExtractorInterface $extractor, ?string $defaultTransPath = null, ?string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = [])
-    {
+    public function __construct(
+        private TranslatorInterface $translator,
+        private TranslationReaderInterface $reader,
+        private ExtractorInterface $extractor,
+        private ?string $defaultTransPath = null,
+        private ?string $defaultViewsPath = null,
+        private array $transPaths = [],
+        private array $codePaths = [],
+        private array $enabledLocales = [],
+    ) {
         parent::__construct();
-
-        $this->translator = $translator;
-        $this->reader = $reader;
-        $this->extractor = $extractor;
-        $this->defaultTransPath = $defaultTransPath;
-        $this->defaultViewsPath = $defaultViewsPath;
-        $this->transPaths = $transPaths;
-        $this->codePaths = $codePaths;
-        $this->enabledLocales = $enabledLocales;
     }
 
     protected function configure(): void
@@ -155,7 +145,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $codePaths = [$path.'/templates'];
 
                 if (!is_dir($transPaths[0])) {
-                    throw new InvalidArgumentException(sprintf('"%s" is neither an enabled bundle nor a directory.', $transPaths[0]));
+                    throw new InvalidArgumentException(\sprintf('"%s" is neither an enabled bundle nor a directory.', $transPaths[0]));
                 }
             }
         } elseif ($input->getOption('all')) {
@@ -181,10 +171,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         // No defined or extracted messages
         if (!$allMessages || null !== $domain && empty($allMessages[$domain])) {
-            $outputMessage = sprintf('No defined or extracted messages for locale "%s"', $locale);
+            $outputMessage = \sprintf('No defined or extracted messages for locale "%s"', $locale);
 
             if (null !== $domain) {
-                $outputMessage .= sprintf(' and domain "%s"', $domain);
+                $outputMessage .= \sprintf(' and domain "%s"', $domain);
             }
 
             $io->getErrorStyle()->warning($outputMessage);
@@ -196,9 +186,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $fallbackCatalogues = $this->loadFallbackCatalogues($locale, $transPaths);
 
         // Display header line
-        $headers = ['State', 'Domain', 'Id', sprintf('Message Preview (%s)', $locale)];
+        $headers = ['State', 'Domain', 'Id', \sprintf('Message Preview (%s)', $locale)];
         foreach ($fallbackCatalogues as $fallbackCatalogue) {
-            $headers[] = sprintf('Fallback Message Preview (%s)', $fallbackCatalogue->getLocale());
+            $headers[] = \sprintf('Fallback Message Preview (%s)', $fallbackCatalogue->getLocale());
         }
         $rows = [];
         // Iterate all message ids and determine their state
@@ -223,8 +213,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     }
                 }
 
-                if (!\in_array(self::MESSAGE_UNUSED, $states) && $input->getOption('only-unused')
-                    || !\in_array(self::MESSAGE_MISSING, $states) && $input->getOption('only-missing')
+                if (!\in_array(self::MESSAGE_UNUSED, $states, true) && $input->getOption('only-unused')
+                    || !\in_array(self::MESSAGE_MISSING, $states, true) && $input->getOption('only-missing')
                 ) {
                     continue;
                 }
@@ -320,7 +310,7 @@ private function formatStates(array $states): string
 
     private function formatId(string $id): string
     {
-        return sprintf('<fg=cyan;options=bold>%s</>', $id);
+        return \sprintf('<fg=cyan;options=bold>%s</>', $id);
     }
 
     private function sanitizeString(string $string, int $length = 40): string
diff --git a/Command/TranslationUpdateCommand.php b/Command/TranslationUpdateCommand.php
index f8ce99c41..194d1c50d 100644
--- a/Command/TranslationUpdateCommand.php
+++ b/Command/TranslationUpdateCommand.php
@@ -48,34 +48,24 @@ class TranslationUpdateCommand extends Command
         'xlf12' => ['xlf', '1.2'],
         'xlf20' => ['xlf', '2.0'],
     ];
-
-    private TranslationWriterInterface $writer;
-    private TranslationReaderInterface $reader;
-    private ExtractorInterface $extractor;
-    private string $defaultLocale;
-    private ?string $defaultTransPath;
-    private ?string $defaultViewsPath;
-    private array $transPaths;
-    private array $codePaths;
-    private array $enabledLocales;
-
-    public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, ?string $defaultTransPath = null, ?string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = [])
-    {
+    private const NO_FILL_PREFIX = "\0NoFill\0";
+
+    public function __construct(
+        private TranslationWriterInterface $writer,
+        private TranslationReaderInterface $reader,
+        private ExtractorInterface $extractor,
+        private string $defaultLocale,
+        private ?string $defaultTransPath = null,
+        private ?string $defaultViewsPath = null,
+        private array $transPaths = [],
+        private array $codePaths = [],
+        private array $enabledLocales = [],
+    ) {
         parent::__construct();
 
         if (!method_exists($writer, 'getFormats')) {
             throw new \InvalidArgumentException(sprintf('The writer class "%s" does not implement the "getFormats()" method.', $writer::class));
         }
-
-        $this->writer = $writer;
-        $this->reader = $reader;
-        $this->extractor = $extractor;
-        $this->defaultLocale = $defaultLocale;
-        $this->defaultTransPath = $defaultTransPath;
-        $this->defaultViewsPath = $defaultViewsPath;
-        $this->transPaths = $transPaths;
-        $this->codePaths = $codePaths;
-        $this->enabledLocales = $enabledLocales;
     }
 
     protected function configure(): void
@@ -85,12 +75,13 @@ protected function configure(): void
                 new InputArgument('locale', InputArgument::REQUIRED, 'The locale'),
                 new InputArgument('bundle', InputArgument::OPTIONAL, 'The bundle name or directory where to load the messages'),
                 new InputOption('prefix', null, InputOption::VALUE_OPTIONAL, 'Override the default prefix', '__'),
+                new InputOption('no-fill', null, InputOption::VALUE_NONE, 'Extract translation keys without filling in values'),
                 new InputOption('format', null, InputOption::VALUE_OPTIONAL, 'Override the default output format', 'xlf12'),
                 new InputOption('dump-messages', null, InputOption::VALUE_NONE, 'Should the messages be dumped in the console'),
                 new InputOption('force', null, InputOption::VALUE_NONE, 'Should the extract be done'),
                 new InputOption('clean', null, InputOption::VALUE_NONE, 'Should clean not found messages'),
                 new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'Specify the domain to extract'),
-                new InputOption('sort', null, InputOption::VALUE_OPTIONAL, 'Return list of messages sorted alphabetically (only works with --dump-messages)', 'asc'),
+                new InputOption('sort', null, InputOption::VALUE_OPTIONAL, 'Return list of messages sorted alphabetically'),
                 new InputOption('as-tree', null, InputOption::VALUE_OPTIONAL, 'Dump the messages as a tree-like structure: The given value defines the level where to switch to inline YAML'),
             ])
             ->setHelp(<<<'EOF'
@@ -99,7 +90,8 @@ protected function configure(): void
 the new ones into the translation files.
 
 When new translation strings are found it can automatically add a prefix to the translation
-message.
+message. However, if the <comment>--no-fill</comment> option is used, the <comment>--prefix</comment>
+option has no effect, since the translation values are left empty.
 
 Example running against a Bundle (AcmeBundle)
 
@@ -114,7 +106,7 @@ protected function configure(): void
 You can sort the output with the <comment>--sort</> flag:
 
     <info>php %command.full_name% --dump-messages --sort=asc en AcmeBundle</info>
-    <info>php %command.full_name% --dump-messages --sort=desc fr</info>
+    <info>php %command.full_name% --force --sort=desc fr</info>
 
 You can dump a tree-like structure using the yaml format with <comment>--as-tree</> flag:
 
@@ -183,16 +175,17 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $codePaths = [$path.'/templates'];
 
                 if (!is_dir($transPaths[0])) {
-                    throw new InvalidArgumentException(sprintf('"%s" is neither an enabled bundle nor a directory.', $transPaths[0]));
+                    throw new InvalidArgumentException(\sprintf('"%s" is neither an enabled bundle nor a directory.', $transPaths[0]));
                 }
             }
         }
 
         $io->title('Translation Messages Extractor and Dumper');
-        $io->comment(sprintf('Generating "<info>%s</info>" translation files for "<info>%s</info>"', $input->getArgument('locale'), $currentName));
+        $io->comment(\sprintf('Generating "<info>%s</info>" translation files for "<info>%s</info>"', $input->getArgument('locale'), $currentName));
 
         $io->comment('Parsing templates...');
-        $extractedCatalogue = $this->extractMessages($input->getArgument('locale'), $codePaths, $input->getOption('prefix'));
+        $prefix = $input->getOption('no-fill') ? self::NO_FILL_PREFIX : $input->getOption('prefix');
+        $extractedCatalogue = $this->extractMessages($input->getArgument('locale'), $codePaths, $prefix);
 
         $io->comment('Loading translation files...');
         $currentCatalogue = $this->loadCurrentMessages($input->getArgument('locale'), $transPaths);
@@ -218,6 +211,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $operation->moveMessagesToIntlDomainsIfPossible('new');
 
+        if ($sort = $input->getOption('sort')) {
+            $sort = strtolower($sort);
+            if (!\in_array($sort, self::SORT_ORDERS, true)) {
+                $errorIo->error(['Wrong sort order', 'Supported formats are: '.implode(', ', self::SORT_ORDERS).'.']);
+
+                return 1;
+            }
+        }
+
         // show compiled list of messages
         if (true === $input->getOption('dump-messages')) {
             $extractedMessagesCount = 0;
@@ -228,38 +230,29 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
                 $list = array_merge(
                     array_diff($allKeys, $newKeys),
-                    array_map(fn ($id) => sprintf('<fg=green>%s</>', $id), $newKeys),
-                    array_map(fn ($id) => sprintf('<fg=red>%s</>', $id), array_keys($operation->getObsoleteMessages($domain)))
+                    array_map(fn ($id) => \sprintf('<fg=green>%s</>', $id), $newKeys),
+                    array_map(fn ($id) => \sprintf('<fg=red>%s</>', $id), array_keys($operation->getObsoleteMessages($domain)))
                 );
 
                 $domainMessagesCount = \count($list);
 
-                if ($sort = $input->getOption('sort')) {
-                    $sort = strtolower($sort);
-                    if (!\in_array($sort, self::SORT_ORDERS, true)) {
-                        $errorIo->error(['Wrong sort order', 'Supported formats are: '.implode(', ', self::SORT_ORDERS).'.']);
-
-                        return 1;
-                    }
-
-                    if (self::DESC === $sort) {
-                        rsort($list);
-                    } else {
-                        sort($list);
-                    }
+                if (self::DESC === $sort) {
+                    rsort($list);
+                } else {
+                    sort($list);
                 }
 
-                $io->section(sprintf('Messages extracted for domain "<info>%s</info>" (%d message%s)', $domain, $domainMessagesCount, $domainMessagesCount > 1 ? 's' : ''));
+                $io->section(\sprintf('Messages extracted for domain "<info>%s</info>" (%d message%s)', $domain, $domainMessagesCount, $domainMessagesCount > 1 ? 's' : ''));
                 $io->listing($list);
 
                 $extractedMessagesCount += $domainMessagesCount;
             }
 
             if ('xlf' === $format) {
-                $io->comment(sprintf('Xliff output version is <info>%s</info>', $xliffVersion));
+                $io->comment(\sprintf('Xliff output version is <info>%s</info>', $xliffVersion));
             }
 
-            $resultMessage = sprintf('%d message%s successfully extracted', $extractedMessagesCount, $extractedMessagesCount > 1 ? 's were' : ' was');
+            $resultMessage = \sprintf('%d message%s successfully extracted', $extractedMessagesCount, $extractedMessagesCount > 1 ? 's were' : ' was');
         }
 
         // save the files
@@ -277,7 +270,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $bundleTransPath = end($transPaths);
             }
 
-            $this->writer->write($operation->getResult(), $format, ['path' => $bundleTransPath, 'default_locale' => $this->defaultLocale, 'xliff_version' => $xliffVersion, 'as_tree' => $input->getOption('as-tree'), 'inline' => $input->getOption('as-tree') ?? 0]);
+            $operationResult = $operation->getResult();
+            if ($sort) {
+                $operationResult = $this->sortCatalogue($operationResult, $sort);
+            }
+
+            if (true === $input->getOption('no-fill')) {
+                $this->removeNoFillTranslations($operationResult);
+            }
+
+            $this->writer->write($operationResult, $format, ['path' => $bundleTransPath, 'default_locale' => $this->defaultLocale, 'xliff_version' => $xliffVersion, 'as_tree' => $input->getOption('as-tree'), 'inline' => $input->getOption('as-tree') ?? 0]);
 
             if (true === $input->getOption('dump-messages')) {
                 $resultMessage .= ' and translation files were updated';
@@ -376,6 +378,54 @@ private function filterCatalogue(MessageCatalogue $catalogue, string $domain): M
         return $filteredCatalogue;
     }
 
+    private function sortCatalogue(MessageCatalogue $catalogue, string $sort): MessageCatalogue
+    {
+        $sortedCatalogue = new MessageCatalogue($catalogue->getLocale());
+
+        foreach ($catalogue->getDomains() as $domain) {
+            // extract intl-icu messages only
+            $intlDomain = $domain.MessageCatalogueInterface::INTL_DOMAIN_SUFFIX;
+            if ($intlMessages = $catalogue->all($intlDomain)) {
+                if (self::DESC === $sort) {
+                    krsort($intlMessages);
+                } elseif (self::ASC === $sort) {
+                    ksort($intlMessages);
+                }
+
+                $sortedCatalogue->add($intlMessages, $intlDomain);
+            }
+
+            // extract all messages and subtract intl-icu messages
+            if ($messages = array_diff($catalogue->all($domain), $intlMessages)) {
+                if (self::DESC === $sort) {
+                    krsort($messages);
+                } elseif (self::ASC === $sort) {
+                    ksort($messages);
+                }
+
+                $sortedCatalogue->add($messages, $domain);
+            }
+
+            if ($metadata = $catalogue->getMetadata('', $intlDomain)) {
+                foreach ($metadata as $k => $v) {
+                    $sortedCatalogue->setMetadata($k, $v, $intlDomain);
+                }
+            }
+
+            if ($metadata = $catalogue->getMetadata('', $domain)) {
+                foreach ($metadata as $k => $v) {
+                    $sortedCatalogue->setMetadata($k, $v, $domain);
+                }
+            }
+        }
+
+        foreach ($catalogue->getResources() as $resource) {
+            $sortedCatalogue->addResource($resource);
+        }
+
+        return $sortedCatalogue;
+    }
+
     private function extractMessages(string $locale, array $transPaths, string $prefix): MessageCatalogue
     {
         $extractedCatalogue = new MessageCatalogue($locale);
@@ -443,4 +493,13 @@ private function getRootCodePaths(KernelInterface $kernel): array
 
         return $codePaths;
     }
+
+    private function removeNoFillTranslations(MessageCatalogueInterface $operation): void
+    {
+        foreach ($operation->all('messages') as $key => $message) {
+            if (str_starts_with($message, self::NO_FILL_PREFIX)) {
+                $operation->set($key, '', 'messages');
+            }
+        }
+    }
 }
diff --git a/Command/WorkflowDumpCommand.php b/Command/WorkflowDumpCommand.php
index f84a560c6..201fb8be8 100644
--- a/Command/WorkflowDumpCommand.php
+++ b/Command/WorkflowDumpCommand.php
@@ -21,7 +21,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\DependencyInjection\ServiceLocator;
-use Symfony\Component\Workflow\Definition;
 use Symfony\Component\Workflow\Dumper\GraphvizDumper;
 use Symfony\Component\Workflow\Dumper\MermaidDumper;
 use Symfony\Component\Workflow\Dumper\PlantUmlDumper;
@@ -37,33 +36,16 @@
 #[AsCommand(name: 'workflow:dump', description: 'Dump a workflow')]
 class WorkflowDumpCommand extends Command
 {
-    /**
-     * string is the service id.
-     *
-     * @var array<string, Definition>
-     */
-    private array $definitions = [];
-
-    private ServiceLocator $workflows;
-
     private const DUMP_FORMAT_OPTIONS = [
         'puml',
         'mermaid',
         'dot',
     ];
 
-    public function __construct($workflows)
-    {
+    public function __construct(
+        private ServiceLocator $workflows,
+    ) {
         parent::__construct();
-
-        if ($workflows instanceof ServiceLocator) {
-            $this->workflows = $workflows;
-        } elseif (\is_array($workflows)) {
-            $this->definitions = $workflows;
-            trigger_deprecation('symfony/framework-bundle', '6.2', 'Passing an array of definitions in "%s()" is deprecated. Inject a ServiceLocator filled with all workflows instead.', __METHOD__);
-        } else {
-            throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be an array or a ServiceLocator, "%s" given.', __METHOD__, \gettype($workflows)));
-        }
     }
 
     protected function configure(): void
@@ -92,24 +74,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $workflowName = $input->getArgument('name');
 
-        if (isset($this->workflows)) {
-            if (!$this->workflows->has($workflowName)) {
-                throw new InvalidArgumentException(sprintf('The workflow named "%s" cannot be found.', $workflowName));
-            }
-            $workflow = $this->workflows->get($workflowName);
-            $type = $workflow instanceof StateMachine ? 'state_machine' : 'workflow';
-            $definition = $workflow->getDefinition();
-        } elseif (isset($this->definitions['workflow.'.$workflowName])) {
-            $definition = $this->definitions['workflow.'.$workflowName];
-            $type = 'workflow';
-        } elseif (isset($this->definitions['state_machine.'.$workflowName])) {
-            $definition = $this->definitions['state_machine.'.$workflowName];
-            $type = 'state_machine';
-        }
-
-        if (null === $definition) {
-            throw new InvalidArgumentException(sprintf('No service found for "workflow.%1$s" nor "state_machine.%1$s".', $workflowName));
+        if (!$this->workflows->has($workflowName)) {
+            throw new InvalidArgumentException(\sprintf('The workflow named "%s" cannot be found.', $workflowName));
         }
+        $workflow = $this->workflows->get($workflowName);
+        $type = $workflow instanceof StateMachine ? 'state_machine' : 'workflow';
+        $definition = $workflow->getDefinition();
 
         switch ($input->getOption('dump-format')) {
             case 'puml':
@@ -147,11 +117,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
     {
         if ($input->mustSuggestArgumentValuesFor('name')) {
-            if (isset($this->workflows)) {
-                $suggestions->suggestValues(array_keys($this->workflows->getProvidedServices()));
-            } else {
-                $suggestions->suggestValues(array_keys($this->definitions));
-            }
+            $suggestions->suggestValues(array_keys($this->workflows->getProvidedServices()));
         }
 
         if ($input->mustSuggestOptionValuesFor('dump-format')) {
diff --git a/Console/Application.php b/Console/Application.php
index b46dc0dee..274e7b06d 100644
--- a/Console/Application.php
+++ b/Console/Application.php
@@ -21,7 +21,6 @@
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelInterface;
@@ -31,14 +30,12 @@
  */
 class Application extends BaseApplication
 {
-    private KernelInterface $kernel;
     private bool $commandsRegistered = false;
     private array $registrationErrors = [];
 
-    public function __construct(KernelInterface $kernel)
-    {
-        $this->kernel = $kernel;
-
+    public function __construct(
+        private KernelInterface $kernel,
+    ) {
         parent::__construct('Symfony', Kernel::VERSION);
 
         $inputDefinition = $this->getDefinition();
@@ -147,14 +144,7 @@ public function get(string $name): Command
     {
         $this->registerCommands();
 
-        $command = parent::get($name);
-
-        if ($command instanceof ContainerAwareInterface) {
-            trigger_deprecation('symfony/dependency-injection', '6.4', 'Relying on "%s" to get the container in "%s" is deprecated, register the command as a service and use dependency injection instead.', ContainerAwareInterface::class, get_debug_type($command));
-            $command->setContainer($this->kernel->getContainer());
-        }
-
-        return $command;
+        return parent::get($name);
     }
 
     public function all(?string $namespace = null): array
@@ -166,7 +156,7 @@ public function all(?string $namespace = null): array
 
     public function getLongVersion(): string
     {
-        return parent::getLongVersion().sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
+        return parent::getLongVersion().\sprintf(' (env: <comment>%s</>, debug: <comment>%s</>)', $this->kernel->getEnvironment(), $this->kernel->isDebug() ? 'true' : 'false');
     }
 
     public function add(Command $command): ?Command
@@ -176,10 +166,7 @@ public function add(Command $command): ?Command
         return parent::add($command);
     }
 
-    /**
-     * @return void
-     */
-    protected function registerCommands()
+    protected function registerCommands(): void
     {
         if ($this->commandsRegistered) {
             return;
diff --git a/Console/Descriptor/Descriptor.php b/Console/Descriptor/Descriptor.php
index 8541f71bb..af5c3b10a 100644
--- a/Console/Descriptor/Descriptor.php
+++ b/Console/Descriptor/Descriptor.php
@@ -62,7 +62,7 @@ public function describe(OutputInterface $output, mixed $object, array $options
             $object instanceof Alias => $this->describeContainerAlias($object, $options),
             $object instanceof EventDispatcherInterface => $this->describeEventDispatcherListeners($object, $options),
             \is_callable($object) => $this->describeCallable($object, $options),
-            default => throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_debug_type($object))),
+            default => throw new \InvalidArgumentException(\sprintf('Object of type "%s" is not describable.', get_debug_type($object))),
         };
 
         if ($object instanceof ContainerBuilder) {
@@ -133,7 +133,7 @@ protected function formatValue(mixed $value): string
         }
 
         if (\is_object($value)) {
-            return sprintf('object(%s)', $value::class);
+            return \sprintf('object(%s)', $value::class);
         }
 
         if (\is_string($value)) {
diff --git a/Console/Descriptor/JsonDescriptor.php b/Console/Descriptor/JsonDescriptor.php
index 28260ad86..5b83f0746 100644
--- a/Console/Descriptor/JsonDescriptor.php
+++ b/Console/Descriptor/JsonDescriptor.php
@@ -156,7 +156,7 @@ protected function describeContainerParameter(mixed $parameter, ?array $deprecat
         $data = [$key => $parameter];
 
         if ($deprecation) {
-            $data['_deprecation'] = sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2)));
+            $data['_deprecation'] = \sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], \sprintf(...\array_slice($deprecation, 2)));
         }
 
         $this->writeData($data, $options);
@@ -169,7 +169,7 @@ protected function describeContainerEnvVars(array $envs, array $options = []): v
 
     protected function describeContainerDeprecations(ContainerBuilder $container, array $options = []): void
     {
-        $containerDeprecationFilePath = sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
+        $containerDeprecationFilePath = \sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
         if (!file_exists($containerDeprecationFilePath)) {
             throw new RuntimeException('The deprecation file does not exist, please try warming the cache first.');
         }
@@ -236,7 +236,7 @@ protected function sortParameters(ParameterBag $parameters): array
             $deprecations = [];
 
             foreach ($deprecated as $parameter => $deprecation) {
-                $deprecations[$parameter] = sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2)));
+                $deprecations[$parameter] = \sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], \sprintf(...\array_slice($deprecation, 2)));
             }
 
             $sortedParameters['_deprecations'] = $deprecations;
@@ -280,7 +280,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
                 if ($factory[0] instanceof Reference) {
                     $data['factory_service'] = (string) $factory[0];
                 } elseif ($factory[0] instanceof Definition) {
-                    $data['factory_service'] = sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured');
+                    $data['factory_service'] = \sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured');
                 } else {
                     $data['factory_class'] = $factory[0];
                 }
@@ -323,7 +323,7 @@ private function getContainerAliasData(Alias $alias): array
     private function getEventDispatcherListenersData(EventDispatcherInterface $eventDispatcher, array $options): array
     {
         $data = [];
-        $event = \array_key_exists('event', $options) ? $options['event'] : null;
+        $event = $options['event'] ?? null;
 
         if (null !== $event) {
             foreach ($eventDispatcher->getListeners($event) as $listener) {
@@ -393,12 +393,12 @@ private function getCallableData(mixed $callable): array
             $data['type'] = 'closure';
 
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure')) {
+            if ($r->isAnonymous()) {
                 return $data;
             }
             $data['name'] = $r->name;
 
-            if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
+            if ($class = $r->getClosureCalledClass()) {
                 $data['class'] = $class->name;
                 if (!$r->getClosureThis()) {
                     $data['static'] = true;
diff --git a/Console/Descriptor/MarkdownDescriptor.php b/Console/Descriptor/MarkdownDescriptor.php
index b4192ed6a..5203d14c3 100644
--- a/Console/Descriptor/MarkdownDescriptor.php
+++ b/Console/Descriptor/MarkdownDescriptor.php
@@ -40,7 +40,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
             }
             $this->describeRoute($route, ['name' => $name]);
             if (($showAliases ??= $options['show_aliases'] ?? false) && $aliases = ($reverseAliases ??= $this->getReverseAliases($routes))[$name] ?? []) {
-                $this->write(sprintf("- Aliases: \n%s", implode("\n", array_map(static fn (string $alias): string => sprintf('    - %s', $alias), $aliases))));
+                $this->write(\sprintf("- Aliases: \n%s", implode("\n", array_map(static fn (string $alias): string => \sprintf('    - %s', $alias), $aliases))));
             }
         }
         $this->write("\n");
@@ -75,11 +75,11 @@ protected function describeContainerParameters(ParameterBag $parameters, array $
 
         $this->write("Container parameters\n====================\n");
         foreach ($this->sortParameters($parameters) as $key => $value) {
-            $this->write(sprintf(
+            $this->write(\sprintf(
                 "\n- `%s`: `%s`%s",
                 $key,
                 $this->formatParameter($value),
-                isset($deprecatedParameters[$key]) ? sprintf(' *Since %s %s: %s*', $deprecatedParameters[$key][0], $deprecatedParameters[$key][1], sprintf(...\array_slice($deprecatedParameters[$key], 2))) : ''
+                isset($deprecatedParameters[$key]) ? \sprintf(' *Since %s %s: %s*', $deprecatedParameters[$key][0], $deprecatedParameters[$key][1], \sprintf(...\array_slice($deprecatedParameters[$key], 2))) : ''
             ));
         }
     }
@@ -111,13 +111,13 @@ protected function describeContainerService(object $service, array $options = []
         } elseif ($service instanceof Definition) {
             $this->describeContainerDefinition($service, $childOptions, $container);
         } else {
-            $this->write(sprintf('**`%s`:** `%s`', $options['id'], $service::class));
+            $this->write(\sprintf('**`%s`:** `%s`', $options['id'], $service::class));
         }
     }
 
     protected function describeContainerDeprecations(ContainerBuilder $container, array $options = []): void
     {
-        $containerDeprecationFilePath = sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
+        $containerDeprecationFilePath = \sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
         if (!file_exists($containerDeprecationFilePath)) {
             throw new RuntimeException('The deprecation file does not exist, please try warming the cache first.');
         }
@@ -132,11 +132,11 @@ protected function describeContainerDeprecations(ContainerBuilder $container, ar
         $formattedLogs = [];
         $remainingCount = 0;
         foreach ($logs as $log) {
-            $formattedLogs[] = sprintf("- %sx: \"%s\" in %s:%s\n", $log['count'], $log['message'], $log['file'], $log['line']);
+            $formattedLogs[] = \sprintf("- %sx: \"%s\" in %s:%s\n", $log['count'], $log['message'], $log['file'], $log['line']);
             $remainingCount += $log['count'];
         }
 
-        $this->write(sprintf("## Remaining deprecations (%s)\n\n", $remainingCount));
+        $this->write(\sprintf("## Remaining deprecations (%s)\n\n", $remainingCount));
         foreach ($formattedLogs as $formattedLog) {
             $this->write($formattedLog);
         }
@@ -201,7 +201,7 @@ protected function describeContainerServices(ContainerBuilder $container, array
             $this->write("\n\nServices\n--------\n");
             foreach ($services['services'] as $id => $service) {
                 $this->write("\n");
-                $this->write(sprintf('- `%s`: `%s`', $id, $service::class));
+                $this->write(\sprintf('- `%s`: `%s`', $id, $service::class));
             }
         }
     }
@@ -244,7 +244,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
                 if ($factory[0] instanceof Reference) {
                     $output .= "\n".'- Factory Service: `'.$factory[0].'`';
                 } elseif ($factory[0] instanceof Definition) {
-                    $output .= "\n".sprintf('- Factory Service: inline factory service (%s)', $factory[0]->getClass() ? sprintf('`%s`', $factory[0]->getClass()) : 'not configured');
+                    $output .= "\n".\sprintf('- Factory Service: inline factory service (%s)', $factory[0]->getClass() ? \sprintf('`%s`', $factory[0]->getClass()) : 'not configured');
                 } else {
                     $output .= "\n".'- Factory Class: `'.$factory[0].'`';
                 }
@@ -273,7 +273,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
         $inEdges = null !== $container && isset($options['id']) ? $this->getServiceEdges($container, $options['id']) : [];
         $output .= "\n".'- Usages: '.($inEdges ? implode(', ', $inEdges) : 'none');
 
-        $this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
+        $this->write(isset($options['id']) ? \sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
     }
 
     protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
@@ -287,7 +287,7 @@ protected function describeContainerAlias(Alias $alias, array $options = [], ?Co
             return;
         }
 
-        $this->write(sprintf("### %s\n\n%s\n", $options['id'], $output));
+        $this->write(\sprintf("### %s\n\n%s\n", $options['id'], $output));
 
         if (!$container) {
             return;
@@ -300,7 +300,7 @@ protected function describeContainerAlias(Alias $alias, array $options = [], ?Co
     protected function describeContainerParameter(mixed $parameter, ?array $deprecation, array $options = []): void
     {
         if (isset($options['parameter'])) {
-            $this->write(sprintf("%s\n%s\n\n%s%s", $options['parameter'], str_repeat('=', \strlen($options['parameter'])), $this->formatParameter($parameter), $deprecation ? sprintf("\n\n*Since %s %s: %s*", $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2))) : ''));
+            $this->write(\sprintf("%s\n%s\n\n%s%s", $options['parameter'], str_repeat('=', \strlen($options['parameter'])), $this->formatParameter($parameter), $deprecation ? \sprintf("\n\n*Since %s %s: %s*", $deprecation[0], $deprecation[1], \sprintf(...\array_slice($deprecation, 2))) : ''));
         } else {
             $this->write($parameter);
         }
@@ -319,35 +319,35 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
         $title = 'Registered listeners';
 
         if (null !== $dispatcherServiceName) {
-            $title .= sprintf(' of event dispatcher "%s"', $dispatcherServiceName);
+            $title .= \sprintf(' of event dispatcher "%s"', $dispatcherServiceName);
         }
 
         if (null !== $event) {
-            $title .= sprintf(' for event `%s` ordered by descending priority', $event);
+            $title .= \sprintf(' for event `%s` ordered by descending priority', $event);
             $registeredListeners = $eventDispatcher->getListeners($event);
         } else {
             // Try to see if "events" exists
             $registeredListeners = \array_key_exists('events', $options) ? array_combine($options['events'], array_map(fn ($event) => $eventDispatcher->getListeners($event), $options['events'])) : $eventDispatcher->getListeners();
         }
 
-        $this->write(sprintf('# %s', $title)."\n");
+        $this->write(\sprintf('# %s', $title)."\n");
 
         if (null !== $event) {
             foreach ($registeredListeners as $order => $listener) {
-                $this->write("\n".sprintf('## Listener %d', $order + 1)."\n");
+                $this->write("\n".\sprintf('## Listener %d', $order + 1)."\n");
                 $this->describeCallable($listener);
-                $this->write(sprintf('- Priority: `%d`', $eventDispatcher->getListenerPriority($event, $listener))."\n");
+                $this->write(\sprintf('- Priority: `%d`', $eventDispatcher->getListenerPriority($event, $listener))."\n");
             }
         } else {
             ksort($registeredListeners);
 
             foreach ($registeredListeners as $eventListened => $eventListeners) {
-                $this->write("\n".sprintf('## %s', $eventListened)."\n");
+                $this->write("\n".\sprintf('## %s', $eventListened)."\n");
 
                 foreach ($eventListeners as $order => $eventListener) {
-                    $this->write("\n".sprintf('### Listener %d', $order + 1)."\n");
+                    $this->write("\n".\sprintf('### Listener %d', $order + 1)."\n");
                     $this->describeCallable($eventListener);
-                    $this->write(sprintf('- Priority: `%d`', $eventDispatcher->getListenerPriority($eventListened, $eventListener))."\n");
+                    $this->write(\sprintf('- Priority: `%d`', $eventDispatcher->getListenerPriority($eventListened, $eventListener))."\n");
                 }
             }
         }
@@ -361,16 +361,16 @@ protected function describeCallable(mixed $callable, array $options = []): void
             $string .= "\n- Type: `function`";
 
             if (\is_object($callable[0])) {
-                $string .= "\n".sprintf('- Name: `%s`', $callable[1]);
-                $string .= "\n".sprintf('- Class: `%s`', $callable[0]::class);
+                $string .= "\n".\sprintf('- Name: `%s`', $callable[1]);
+                $string .= "\n".\sprintf('- Class: `%s`', $callable[0]::class);
             } else {
                 if (!str_starts_with($callable[1], 'parent::')) {
-                    $string .= "\n".sprintf('- Name: `%s`', $callable[1]);
-                    $string .= "\n".sprintf('- Class: `%s`', $callable[0]);
+                    $string .= "\n".\sprintf('- Name: `%s`', $callable[1]);
+                    $string .= "\n".\sprintf('- Class: `%s`', $callable[0]);
                     $string .= "\n- Static: yes";
                 } else {
-                    $string .= "\n".sprintf('- Name: `%s`', substr($callable[1], 8));
-                    $string .= "\n".sprintf('- Class: `%s`', $callable[0]);
+                    $string .= "\n".\sprintf('- Name: `%s`', substr($callable[1], 8));
+                    $string .= "\n".\sprintf('- Class: `%s`', $callable[0]);
                     $string .= "\n- Static: yes";
                     $string .= "\n- Parent: yes";
                 }
@@ -385,12 +385,12 @@ protected function describeCallable(mixed $callable, array $options = []): void
             $string .= "\n- Type: `function`";
 
             if (!str_contains($callable, '::')) {
-                $string .= "\n".sprintf('- Name: `%s`', $callable);
+                $string .= "\n".\sprintf('- Name: `%s`', $callable);
             } else {
                 $callableParts = explode('::', $callable);
 
-                $string .= "\n".sprintf('- Name: `%s`', $callableParts[1]);
-                $string .= "\n".sprintf('- Class: `%s`', $callableParts[0]);
+                $string .= "\n".\sprintf('- Name: `%s`', $callableParts[1]);
+                $string .= "\n".\sprintf('- Class: `%s`', $callableParts[0]);
                 $string .= "\n- Static: yes";
             }
 
@@ -403,15 +403,15 @@ protected function describeCallable(mixed $callable, array $options = []): void
             $string .= "\n- Type: `closure`";
 
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure')) {
+            if ($r->isAnonymous()) {
                 $this->write($string."\n");
 
                 return;
             }
-            $string .= "\n".sprintf('- Name: `%s`', $r->name);
+            $string .= "\n".\sprintf('- Name: `%s`', $r->name);
 
-            if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
-                $string .= "\n".sprintf('- Class: `%s`', $class->name);
+            if ($class = $r->getClosureCalledClass()) {
+                $string .= "\n".\sprintf('- Class: `%s`', $class->name);
                 if (!$r->getClosureThis()) {
                     $string .= "\n- Static: yes";
                 }
@@ -424,7 +424,7 @@ protected function describeCallable(mixed $callable, array $options = []): void
 
         if (method_exists($callable, '__invoke')) {
             $string .= "\n- Type: `object`";
-            $string .= "\n".sprintf('- Name: `%s`', $callable::class);
+            $string .= "\n".\sprintf('- Name: `%s`', $callable::class);
 
             $this->write($string."\n");
 
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
index f8d0133e5..5efaab496 100644
--- a/Console/Descriptor/TextDescriptor.php
+++ b/Console/Descriptor/TextDescriptor.php
@@ -38,11 +38,9 @@
  */
 class TextDescriptor extends Descriptor
 {
-    private ?FileLinkFormatter $fileLinkFormatter;
-
-    public function __construct(?FileLinkFormatter $fileLinkFormatter = null)
-    {
-        $this->fileLinkFormatter = $fileLinkFormatter;
+    public function __construct(
+        private ?FileLinkFormatter $fileLinkFormatter = null,
+    ) {
     }
 
     protected function describeRouteCollection(RouteCollection $routes, array $options = []): void
@@ -133,7 +131,7 @@ protected function describeContainerParameters(ParameterBag $parameters, array $
 
             if (isset($deprecatedParameters[$parameter])) {
                 $tableRows[] = [new TableCell(
-                    sprintf('<comment>(Since %s %s: %s)</comment>', $deprecatedParameters[$parameter][0], $deprecatedParameters[$parameter][1], sprintf(...\array_slice($deprecatedParameters[$parameter], 2))),
+                    \sprintf('<comment>(Since %s %s: %s)</comment>', $deprecatedParameters[$parameter][0], $deprecatedParameters[$parameter][1], \sprintf(...\array_slice($deprecatedParameters[$parameter], 2))),
                     ['colspan' => 2]
                 )];
             }
@@ -154,7 +152,7 @@ protected function describeContainerTags(ContainerBuilder $container, array $opt
         }
 
         foreach ($this->findDefinitionsByTag($container, $showHidden) as $tag => $definitions) {
-            $options['output']->section(sprintf('"%s" tag', $tag));
+            $options['output']->section(\sprintf('"%s" tag', $tag));
             $options['output']->listing(array_keys($definitions));
         }
     }
@@ -170,11 +168,11 @@ protected function describeContainerService(object $service, array $options = []
         } elseif ($service instanceof Definition) {
             $this->describeContainerDefinition($service, $options, $container);
         } else {
-            $options['output']->title(sprintf('Information for Service "<info>%s</info>"', $options['id']));
+            $options['output']->title(\sprintf('Information for Service "<info>%s</info>"', $options['id']));
             $options['output']->table(
                 ['Service ID', 'Class'],
                 [
-                    [$options['id'] ?? '-', $service::class],
+                    [$options['id'], $service::class],
                 ]
             );
         }
@@ -192,7 +190,7 @@ protected function describeContainerServices(ContainerBuilder $container, array
         }
 
         if ($showTag) {
-            $title .= sprintf(' Tagged with "%s" Tag', $options['tag']);
+            $title .= \sprintf(' Tagged with "%s" Tag', $options['tag']);
         }
 
         $options['output']->title($title);
@@ -249,7 +247,7 @@ protected function describeContainerServices(ContainerBuilder $container, array
         foreach ($serviceIds as $serviceId) {
             $definition = $this->resolveServiceDefinition($container, $serviceId);
 
-            $styledServiceId = $rawOutput ? $serviceId : sprintf('<fg=cyan>%s</fg=cyan>', OutputFormatter::escape($serviceId));
+            $styledServiceId = $rawOutput ? $serviceId : \sprintf('<fg=cyan>%s</fg=cyan>', OutputFormatter::escape($serviceId));
             if ($definition instanceof Definition) {
                 if ($showTag) {
                     foreach ($this->sortByPriority($definition->getTag($showTag)) as $key => $tag) {
@@ -272,7 +270,7 @@ protected function describeContainerServices(ContainerBuilder $container, array
                 }
             } elseif ($definition instanceof Alias) {
                 $alias = $definition;
-                $tableRows[] = array_merge([$styledServiceId, sprintf('alias for "%s"', $alias)], $tagsCount ? array_fill(0, $tagsCount, '') : []);
+                $tableRows[] = array_merge([$styledServiceId, \sprintf('alias for "%s"', $alias)], $tagsCount ? array_fill(0, $tagsCount, '') : []);
             } else {
                 $tableRows[] = array_merge([$styledServiceId, $definition::class], $tagsCount ? array_fill(0, $tagsCount, '') : []);
             }
@@ -284,7 +282,7 @@ protected function describeContainerServices(ContainerBuilder $container, array
     protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
     {
         if (isset($options['id'])) {
-            $options['output']->title(sprintf('Information for Service "<info>%s</info>"', $options['id']));
+            $options['output']->title(\sprintf('Information for Service "<info>%s</info>"', $options['id']));
         }
 
         if ('' !== $classDescription = $this->getClassDescription((string) $definition->getClass())) {
@@ -301,13 +299,13 @@ protected function describeContainerDefinition(Definition $definition, array $op
             $tagInformation = [];
             foreach ($tags as $tagName => $tagData) {
                 foreach ($tagData as $tagParameters) {
-                    $parameters = array_map(fn ($key, $value) => sprintf('<info>%s</info>: %s', $key, \is_array($value) ? $this->formatParameter($value) : $value), array_keys($tagParameters), array_values($tagParameters));
+                    $parameters = array_map(fn ($key, $value) => \sprintf('<info>%s</info>: %s', $key, \is_array($value) ? $this->formatParameter($value) : $value), array_keys($tagParameters), array_values($tagParameters));
                     $parameters = implode(', ', $parameters);
 
                     if ('' === $parameters) {
-                        $tagInformation[] = sprintf('%s', $tagName);
+                        $tagInformation[] = \sprintf('%s', $tagName);
                     } else {
-                        $tagInformation[] = sprintf('%s (%s)', $tagName, $parameters);
+                        $tagInformation[] = \sprintf('%s (%s)', $tagName, $parameters);
                     }
                 }
             }
@@ -335,7 +333,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
         $tableRows[] = ['Autoconfigured', $definition->isAutoconfigured() ? 'yes' : 'no'];
 
         if ($definition->getFile()) {
-            $tableRows[] = ['Required File', $definition->getFile() ?: '-'];
+            $tableRows[] = ['Required File', $definition->getFile()];
         }
 
         if ($factory = $definition->getFactory()) {
@@ -343,7 +341,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
                 if ($factory[0] instanceof Reference) {
                     $tableRows[] = ['Factory Service', $factory[0]];
                 } elseif ($factory[0] instanceof Definition) {
-                    $tableRows[] = ['Factory Service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured')];
+                    $tableRows[] = ['Factory Service', \sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured')];
                 } else {
                     $tableRows[] = ['Factory Class', $factory[0]];
                 }
@@ -361,27 +359,27 @@ protected function describeContainerDefinition(Definition $definition, array $op
                     $argument = $argument->getValues()[0];
                 }
                 if ($argument instanceof Reference) {
-                    $argumentsInformation[] = sprintf('Service(%s)', (string) $argument);
+                    $argumentsInformation[] = \sprintf('Service(%s)', (string) $argument);
                 } elseif ($argument instanceof IteratorArgument) {
                     if ($argument instanceof TaggedIteratorArgument) {
-                        $argumentsInformation[] = sprintf('Tagged Iterator for "%s"%s', $argument->getTag(), $options['is_debug'] ? '' : sprintf(' (%d element(s))', \count($argument->getValues())));
+                        $argumentsInformation[] = \sprintf('Tagged Iterator for "%s"%s', $argument->getTag(), $options['is_debug'] ? '' : \sprintf(' (%d element(s))', \count($argument->getValues())));
                     } else {
-                        $argumentsInformation[] = sprintf('Iterator (%d element(s))', \count($argument->getValues()));
+                        $argumentsInformation[] = \sprintf('Iterator (%d element(s))', \count($argument->getValues()));
                     }
 
                     foreach ($argument->getValues() as $ref) {
-                        $argumentsInformation[] = sprintf('- Service(%s)', $ref);
+                        $argumentsInformation[] = \sprintf('- Service(%s)', $ref);
                     }
                 } elseif ($argument instanceof ServiceLocatorArgument) {
-                    $argumentsInformation[] = sprintf('Service locator (%d element(s))', \count($argument->getValues()));
+                    $argumentsInformation[] = \sprintf('Service locator (%d element(s))', \count($argument->getValues()));
                 } elseif ($argument instanceof Definition) {
                     $argumentsInformation[] = 'Inlined Service';
                 } elseif ($argument instanceof \UnitEnum) {
                     $argumentsInformation[] = ltrim(var_export($argument, true), '\\');
                 } elseif ($argument instanceof AbstractArgument) {
-                    $argumentsInformation[] = sprintf('Abstract argument (%s)', $argument->getText());
+                    $argumentsInformation[] = \sprintf('Abstract argument (%s)', $argument->getText());
                 } else {
-                    $argumentsInformation[] = \is_array($argument) ? sprintf('Array (%d element(s))', \count($argument)) : $argument;
+                    $argumentsInformation[] = \is_array($argument) ? \sprintf('Array (%d element(s))', \count($argument)) : $argument;
                 }
             }
 
@@ -396,7 +394,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
 
     protected function describeContainerDeprecations(ContainerBuilder $container, array $options = []): void
     {
-        $containerDeprecationFilePath = sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
+        $containerDeprecationFilePath = \sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
         if (!file_exists($containerDeprecationFilePath)) {
             $options['output']->warning('The deprecation file does not exist, please try warming the cache first.');
 
@@ -413,19 +411,19 @@ protected function describeContainerDeprecations(ContainerBuilder $container, ar
         $formattedLogs = [];
         $remainingCount = 0;
         foreach ($logs as $log) {
-            $formattedLogs[] = sprintf("%sx: %s\n      in %s:%s", $log['count'], $log['message'], $log['file'], $log['line']);
+            $formattedLogs[] = \sprintf("%sx: %s\n      in %s:%s", $log['count'], $log['message'], $log['file'], $log['line']);
             $remainingCount += $log['count'];
         }
-        $options['output']->title(sprintf('Remaining deprecations (%s)', $remainingCount));
+        $options['output']->title(\sprintf('Remaining deprecations (%s)', $remainingCount));
         $options['output']->listing($formattedLogs);
     }
 
     protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
     {
         if ($alias->isPublic() && !$alias->isPrivate()) {
-            $options['output']->comment(sprintf('This service is a <info>public</info> alias for the service <info>%s</info>', (string) $alias));
+            $options['output']->comment(\sprintf('This service is a <info>public</info> alias for the service <info>%s</info>', (string) $alias));
         } else {
-            $options['output']->comment(sprintf('This service is a <comment>private</comment> alias for the service <info>%s</info>', (string) $alias));
+            $options['output']->comment(\sprintf('This service is a <comment>private</comment> alias for the service <info>%s</info>', (string) $alias));
         }
 
         if (!$container) {
@@ -444,7 +442,7 @@ protected function describeContainerParameter(mixed $parameter, ?array $deprecat
 
         if ($deprecation) {
             $rows[] = [new TableCell(
-                sprintf('<comment>(Since %s %s: %s)</comment>', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2))),
+                \sprintf('<comment>(Since %s %s: %s)</comment>', $deprecation[0], $deprecation[1], \sprintf(...\array_slice($deprecation, 2))),
                 ['colspan' => 2]
             )];
         }
@@ -522,11 +520,11 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
         $title = 'Registered Listeners';
 
         if (null !== $dispatcherServiceName) {
-            $title .= sprintf(' of Event Dispatcher "%s"', $dispatcherServiceName);
+            $title .= \sprintf(' of Event Dispatcher "%s"', $dispatcherServiceName);
         }
 
         if (null !== $event) {
-            $title .= sprintf(' for "%s" Event', $event);
+            $title .= \sprintf(' for "%s" Event', $event);
             $registeredListeners = $eventDispatcher->getListeners($event);
         } else {
             $title .= ' Grouped by Event';
@@ -540,7 +538,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
         } else {
             ksort($registeredListeners);
             foreach ($registeredListeners as $eventListened => $eventListeners) {
-                $options['output']->section(sprintf('"%s" event', $eventListened));
+                $options['output']->section(\sprintf('"%s" event', $eventListened));
                 $this->renderEventListenerTable($eventDispatcher, $eventListened, $eventListeners, $options['output']);
             }
         }
@@ -557,7 +555,7 @@ private function renderEventListenerTable(EventDispatcherInterface $eventDispatc
         $tableRows = [];
 
         foreach ($eventListeners as $order => $listener) {
-            $tableRows[] = [sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener)];
+            $tableRows[] = [\sprintf('#%d', $order + 1), $this->formatCallable($listener), $eventDispatcher->getListenerPriority($event, $listener)];
         }
 
         $io->table($tableHeaders, $tableRows);
@@ -573,7 +571,7 @@ private function formatRouterConfig(array $config): string
 
         $configAsString = '';
         foreach ($config as $key => $value) {
-            $configAsString .= sprintf("\n%s: %s", $key, $this->formatValue($value));
+            $configAsString .= \sprintf("\n%s: %s", $key, $this->formatValue($value));
         }
 
         return trim($configAsString);
@@ -627,7 +625,7 @@ private function formatControllerLink(mixed $controller, string $anchorText, ?ca
 
         $fileLink = $this->fileLinkFormatter->format($r->getFileName(), $r->getStartLine());
         if ($fileLink) {
-            return sprintf('<href=%s>%s</>', $fileLink, $anchorText);
+            return \sprintf('<href=%s>%s</>', $fileLink, $anchorText);
         }
 
         return $anchorText;
@@ -637,30 +635,30 @@ private function formatCallable(mixed $callable): string
     {
         if (\is_array($callable)) {
             if (\is_object($callable[0])) {
-                return sprintf('%s::%s()', $callable[0]::class, $callable[1]);
+                return \sprintf('%s::%s()', $callable[0]::class, $callable[1]);
             }
 
-            return sprintf('%s::%s()', $callable[0], $callable[1]);
+            return \sprintf('%s::%s()', $callable[0], $callable[1]);
         }
 
         if (\is_string($callable)) {
-            return sprintf('%s()', $callable);
+            return \sprintf('%s()', $callable);
         }
 
         if ($callable instanceof \Closure) {
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure')) {
+            if ($r->isAnonymous()) {
                 return 'Closure()';
             }
-            if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
-                return sprintf('%s::%s()', $class->name, $r->name);
+            if ($class = $r->getClosureCalledClass()) {
+                return \sprintf('%s::%s()', $class->name, $r->name);
             }
 
             return $r->name.'()';
         }
 
         if (method_exists($callable, '__invoke')) {
-            return sprintf('%s::__invoke()', $callable::class);
+            return \sprintf('%s::__invoke()', $callable::class);
         }
 
         throw new \InvalidArgumentException('Callable is not describable.');
diff --git a/Console/Descriptor/XmlDescriptor.php b/Console/Descriptor/XmlDescriptor.php
index e5c912ce4..c41ac296f 100644
--- a/Console/Descriptor/XmlDescriptor.php
+++ b/Console/Descriptor/XmlDescriptor.php
@@ -64,7 +64,7 @@ protected function describeContainerService(object $service, array $options = []
 
     protected function describeContainerServices(ContainerBuilder $container, array $options = []): void
     {
-        $this->writeDocument($this->getContainerServicesDocument($container, $options['tag'] ?? null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], $options['filter'] ?? null, $options['id'] ?? null));
+        $this->writeDocument($this->getContainerServicesDocument($container, $options['tag'] ?? null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], $options['filter'] ?? null));
     }
 
     protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
@@ -110,7 +110,7 @@ protected function describeContainerEnvVars(array $envs, array $options = []): v
 
     protected function describeContainerDeprecations(ContainerBuilder $container, array $options = []): void
     {
-        $containerDeprecationFilePath = sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
+        $containerDeprecationFilePath = \sprintf('%s/%sDeprecations.log', $container->getParameter('kernel.build_dir'), $container->getParameter('kernel.container_class'));
         if (!file_exists($containerDeprecationFilePath)) {
             throw new RuntimeException('The deprecation file does not exist, please try warming the cache first.');
         }
@@ -243,7 +243,7 @@ private function getContainerParametersDocument(ParameterBag $parameters): \DOMD
             $parameterXML->appendChild(new \DOMText($this->formatParameter($value)));
 
             if (isset($deprecatedParameters[$key])) {
-                $parameterXML->setAttribute('deprecated', sprintf('Since %s %s: %s', $deprecatedParameters[$key][0], $deprecatedParameters[$key][1], sprintf(...\array_slice($deprecatedParameters[$key], 2))));
+                $parameterXML->setAttribute('deprecated', \sprintf('Since %s %s: %s', $deprecatedParameters[$key][0], $deprecatedParameters[$key][1], \sprintf(...\array_slice($deprecatedParameters[$key], 2))));
             }
         }
 
@@ -288,7 +288,7 @@ private function getContainerServiceDocument(object $service, string $id, ?Conta
         return $dom;
     }
 
-    private function getContainerServicesDocument(ContainerBuilder $container, ?string $tag = null, bool $showHidden = false, bool $showArguments = false, ?callable $filter = null, ?string $id = null): \DOMDocument
+    private function getContainerServicesDocument(ContainerBuilder $container, ?string $tag = null, bool $showHidden = false, bool $showArguments = false, ?callable $filter = null): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($containerXML = $dom->createElement('container'));
@@ -341,7 +341,7 @@ private function getContainerDefinitionDocument(Definition $definition, ?string
                 if ($factory[0] instanceof Reference) {
                     $factoryXML->setAttribute('service', (string) $factory[0]);
                 } elseif ($factory[0] instanceof Definition) {
-                    $factoryXML->setAttribute('service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'not configured'));
+                    $factoryXML->setAttribute('service', \sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'not configured'));
                 } else {
                     $factoryXML->setAttribute('class', $factory[0]);
                 }
@@ -490,7 +490,7 @@ private function getContainerParameterDocument(mixed $parameter, ?array $depreca
             $parameterXML->setAttribute('key', $options['parameter']);
 
             if ($deprecation) {
-                $parameterXML->setAttribute('deprecated', sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], sprintf(...\array_slice($deprecation, 2))));
+                $parameterXML->setAttribute('deprecated', \sprintf('Since %s %s: %s', $deprecation[0], $deprecation[1], \sprintf(...\array_slice($deprecation, 2))));
             }
         }
 
@@ -501,7 +501,7 @@ private function getContainerParameterDocument(mixed $parameter, ?array $depreca
 
     private function getEventDispatcherListenersDocument(EventDispatcherInterface $eventDispatcher, array $options): \DOMDocument
     {
-        $event = \array_key_exists('event', $options) ? $options['event'] : null;
+        $event = $options['event'] ?? null;
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($eventDispatcherXML = $dom->createElement('event-dispatcher'));
 
@@ -581,12 +581,12 @@ private function getCallableDocument(mixed $callable): \DOMDocument
             $callableXML->setAttribute('type', 'closure');
 
             $r = new \ReflectionFunction($callable);
-            if (str_contains($r->name, '{closure')) {
+            if ($r->isAnonymous()) {
                 return $dom;
             }
             $callableXML->setAttribute('name', $r->name);
 
-            if ($class = \PHP_VERSION_ID >= 80111 ? $r->getClosureCalledClass() : $r->getClosureScopeClass()) {
+            if ($class = $r->getClosureCalledClass()) {
                 $callableXML->setAttribute('class', $class->name);
                 if (!$r->getClosureThis()) {
                     $callableXML->setAttribute('static', 'true');
diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
index 6da5b1d54..af453619b 100644
--- a/Controller/AbstractController.php
+++ b/Controller/AbstractController.php
@@ -55,10 +55,7 @@
  */
 abstract class AbstractController implements ServiceSubscriberInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
+    protected ContainerInterface $container;
 
     #[Required]
     public function setContainer(ContainerInterface $container): ?ContainerInterface
@@ -75,7 +72,7 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface
     protected function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
     {
         if (!$this->container->has('parameter_bag')) {
-            throw new ServiceNotFoundException('parameter_bag.', null, null, [], sprintf('The "%s::getParameter()" method is missing a parameter bag to work properly. Did you forget to register your controller as a service subscriber? This can be fixed either by using autoconfiguration or by manually wiring a "parameter_bag" in the service locator passed to the controller.', static::class));
+            throw new ServiceNotFoundException('parameter_bag.', null, null, [], \sprintf('The "%s::getParameter()" method is missing a parameter bag to work properly. Did you forget to register your controller as a service subscriber? This can be fixed either by using autoconfiguration or by manually wiring a "parameter_bag" in the service locator passed to the controller.', static::class));
         }
 
         return $this->container->get('parameter_bag')->get($name);
@@ -185,7 +182,7 @@ protected function addFlash(string $type, mixed $message): void
         }
 
         if (!$session instanceof FlashBagAwareSessionInterface) {
-            trigger_deprecation('symfony/framework-bundle', '6.2', 'Calling "addFlash()" method when the session does not implement %s is deprecated.', FlashBagAwareSessionInterface::class);
+            throw new \LogicException(\sprintf('You cannot use the addFlash method because class "%s" doesn\'t implement "%s".', get_debug_type($session), FlashBagAwareSessionInterface::class));
         }
 
         $session->getFlashBag()->add($type, $message);
@@ -264,20 +261,6 @@ protected function renderBlock(string $view, string $block, array $parameters =
         return $this->doRender($view, $block, $parameters, $response, __FUNCTION__);
     }
 
-    /**
-     * Renders a view and sets the appropriate status code when a form is listed in parameters.
-     *
-     * If an invalid form is found in the list of parameters, a 422 status code is returned.
-     *
-     * @deprecated since Symfony 6.2, use render() instead
-     */
-    protected function renderForm(string $view, array $parameters = [], ?Response $response = null): Response
-    {
-        trigger_deprecation('symfony/framework-bundle', '6.2', 'The "%s::renderForm()" method is deprecated, use "render()" instead.', get_debug_type($this));
-
-        return $this->render($view, $parameters, $response);
-    }
-
     /**
      * Streams a view.
      */
@@ -432,7 +415,7 @@ protected function sendEarlyHints(iterable $links = [], ?Response $response = nu
     private function doRenderView(string $view, ?string $block, array $parameters, string $method): string
     {
         if (!$this->container->has('twig')) {
-            throw new \LogicException(sprintf('You cannot use the "%s" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".', $method));
+            throw new \LogicException(\sprintf('You cannot use the "%s" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".', $method));
         }
 
         foreach ($parameters as $k => $v) {
diff --git a/Controller/ControllerResolver.php b/Controller/ControllerResolver.php
index 3449740bf..ef9ca3993 100644
--- a/Controller/ControllerResolver.php
+++ b/Controller/ControllerResolver.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Controller;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\HttpKernel\Controller\ContainerControllerResolver;
 
 /**
@@ -25,16 +24,12 @@ protected function instantiateController(string $class): object
     {
         $controller = parent::instantiateController($class);
 
-        if ($controller instanceof ContainerAwareInterface) {
-            trigger_deprecation('symfony/dependency-injection', '6.4', 'Relying on "%s" to get the container in "%s" is deprecated, register the controller as a service and use dependency injection instead.', ContainerAwareInterface::class, get_debug_type($controller));
-            $controller->setContainer($this->container);
-        }
         if ($controller instanceof AbstractController) {
             if (null === $previousContainer = $controller->setContainer($this->container)) {
-                throw new \LogicException(sprintf('"%s" has no container set, did you forget to define it as a service subscriber?', $class));
-            } else {
-                $controller->setContainer($previousContainer);
+                throw new \LogicException(\sprintf('"%s" has no container set, did you forget to define it as a service subscriber?', $class));
             }
+
+            $controller->setContainer($previousContainer);
         }
 
         return $controller;
diff --git a/Controller/RedirectController.php b/Controller/RedirectController.php
index 24e1dad85..e6072d219 100644
--- a/Controller/RedirectController.php
+++ b/Controller/RedirectController.php
@@ -27,15 +27,11 @@
  */
 class RedirectController
 {
-    private ?UrlGeneratorInterface $router;
-    private ?int $httpPort;
-    private ?int $httpsPort;
-
-    public function __construct(?UrlGeneratorInterface $router = null, ?int $httpPort = null, ?int $httpsPort = null)
-    {
-        $this->router = $router;
-        $this->httpPort = $httpPort;
-        $this->httpsPort = $httpsPort;
+    public function __construct(
+        private ?UrlGeneratorInterface $router = null,
+        private ?int $httpPort = null,
+        private ?int $httpsPort = null,
+    ) {
     }
 
     /**
@@ -176,7 +172,7 @@ public function __invoke(Request $request): Response
 
         if (\array_key_exists('route', $p)) {
             if (\array_key_exists('path', $p)) {
-                throw new \RuntimeException(sprintf('Ambiguous redirection settings, use the "path" or "route" parameter, not both: "%s" and "%s" found respectively in "%s" routing configuration.', $p['path'], $p['route'], $request->attributes->get('_route')));
+                throw new \RuntimeException(\sprintf('Ambiguous redirection settings, use the "path" or "route" parameter, not both: "%s" and "%s" found respectively in "%s" routing configuration.', $p['path'], $p['route'], $request->attributes->get('_route')));
             }
 
             return $this->redirectAction($request, $p['route'], $p['permanent'] ?? false, $p['ignoreAttributes'] ?? false, $p['keepRequestMethod'] ?? false, $p['keepQueryParams'] ?? false);
@@ -186,6 +182,6 @@ public function __invoke(Request $request): Response
             return $this->urlRedirectAction($request, $p['path'], $p['permanent'] ?? false, $p['scheme'] ?? null, $p['httpPort'] ?? null, $p['httpsPort'] ?? null, $p['keepRequestMethod'] ?? false);
         }
 
-        throw new \RuntimeException(sprintf('The parameter "path" or "route" is required to configure the redirect action in "%s" routing configuration.', $request->attributes->get('_route')));
+        throw new \RuntimeException(\sprintf('The parameter "path" or "route" is required to configure the redirect action in "%s" routing configuration.', $request->attributes->get('_route')));
     }
 }
diff --git a/Controller/TemplateController.php b/Controller/TemplateController.php
index 97631572c..c08ea347b 100644
--- a/Controller/TemplateController.php
+++ b/Controller/TemplateController.php
@@ -23,11 +23,9 @@
  */
 class TemplateController
 {
-    private ?Environment $twig;
-
-    public function __construct(?Environment $twig = null)
-    {
-        $this->twig = $twig;
+    public function __construct(
+        private ?Environment $twig = null,
+    ) {
     }
 
     /**
@@ -39,8 +37,9 @@ public function __construct(?Environment $twig = null)
      * @param bool|null $private    Whether or not caching should apply for client caches only
      * @param array     $context    The context (arguments) of the template
      * @param int       $statusCode The HTTP status code to return with the response (200 "OK" by default)
+     * @param array     $headers    The HTTP headers to add to the response
      */
-    public function templateAction(string $template, ?int $maxAge = null, ?int $sharedAge = null, ?bool $private = null, array $context = [], int $statusCode = 200): Response
+    public function templateAction(string $template, ?int $maxAge = null, ?int $sharedAge = null, ?bool $private = null, array $context = [], int $statusCode = 200, array $headers = []): Response
     {
         if (null === $this->twig) {
             throw new \LogicException('You cannot use the TemplateController if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".');
@@ -62,14 +61,18 @@ public function templateAction(string $template, ?int $maxAge = null, ?int $shar
             $response->setPublic();
         }
 
+        foreach ($headers as $key => $value) {
+            $response->headers->set($key, $value);
+        }
+
         return $response;
     }
 
     /**
      * @param int $statusCode The HTTP status code (200 "OK" by default)
      */
-    public function __invoke(string $template, ?int $maxAge = null, ?int $sharedAge = null, ?bool $private = null, array $context = [], int $statusCode = 200): Response
+    public function __invoke(string $template, ?int $maxAge = null, ?int $sharedAge = null, ?bool $private = null, array $context = [], int $statusCode = 200, array $headers = []): Response
     {
-        return $this->templateAction($template, $maxAge, $sharedAge, $private, $context, $statusCode);
+        return $this->templateAction($template, $maxAge, $sharedAge, $private, $context, $statusCode, $headers);
     }
 }
diff --git a/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php b/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php
deleted file mode 100644
index 2105a54df..000000000
--- a/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * @internal
- */
-class AddAnnotationsCachedReaderPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        // "annotations.cached_reader" is wired late so that any passes using
-        // "annotation_reader" at build time don't get any cache
-        foreach ($container->findTaggedServiceIds('annotations.cached_reader') as $id => $tags) {
-            $reader = $container->getDefinition($id);
-            $properties = $reader->getProperties();
-
-            if (isset($properties['cacheProviderBackup'])) {
-                $provider = $properties['cacheProviderBackup']->getValues()[0];
-                unset($properties['cacheProviderBackup']);
-                $reader->setProperties($properties);
-                $reader->replaceArgument(1, $provider);
-            } elseif (4 <= \count($arguments = $reader->getArguments()) && $arguments[3] instanceof ServiceClosureArgument) {
-                $arguments[1] = $arguments[3]->getValues()[0];
-                unset($arguments[3]);
-                $reader->setArguments($arguments);
-            }
-        }
-    }
-}
diff --git a/DependencyInjection/Compiler/AddDebugLogProcessorPass.php b/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
index fb8629c18..1efdcb87f 100644
--- a/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
+++ b/DependencyInjection/Compiler/AddDebugLogProcessorPass.php
@@ -17,10 +17,7 @@
 
 class AddDebugLogProcessorPass implements CompilerPassInterface
 {
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('profiler')) {
             return;
@@ -35,18 +32,4 @@ public function process(ContainerBuilder $container)
         $container->getDefinition('monolog.logger_prototype')
             ->setConfigurator([new Reference('debug.debug_logger_configurator'), 'pushDebugLogger']);
     }
-
-    /**
-     * @deprecated since Symfony 6.4, use HttpKernel's DebugLoggerConfigurator instead
-     *
-     * @return void
-     */
-    public static function configureLogger(mixed $logger)
-    {
-        trigger_deprecation('symfony/framework-bundle', '6.4', 'The "%s()" method is deprecated, use HttpKernel\'s DebugLoggerConfigurator instead.', __METHOD__);
-
-        if (\is_object($logger) && method_exists($logger, 'removeDebugLogger') && \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
-            $logger->removeDebugLogger();
-        }
-    }
 }
diff --git a/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php b/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
deleted file mode 100644
index dabf1d6ff..000000000
--- a/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-trigger_deprecation('symfony/framework-bundle', '6.4', 'The "%s" class is deprecated, use "%s" instead.', AddExpressionLanguageProvidersPass::class, \Symfony\Component\Routing\DependencyInjection\AddExpressionLanguageProvidersPass::class);
-
-/**
- * Registers the expression language providers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since Symfony 6.4, use Symfony\Component\Routing\DependencyInjection\AddExpressionLanguageProvidersPass instead.
- */
-class AddExpressionLanguageProvidersPass implements CompilerPassInterface
-{
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
-    {
-        // routing
-        if ($container->has('router.default')) {
-            $definition = $container->findDefinition('router.default');
-            foreach ($container->findTaggedServiceIds('routing.expression_language_provider', true) as $id => $attributes) {
-                $definition->addMethodCall('addExpressionLanguageProvider', [new Reference($id)]);
-            }
-        }
-    }
-}
diff --git a/DependencyInjection/Compiler/AssetsContextPass.php b/DependencyInjection/Compiler/AssetsContextPass.php
index e8c2ad3a0..c4b99c568 100644
--- a/DependencyInjection/Compiler/AssetsContextPass.php
+++ b/DependencyInjection/Compiler/AssetsContextPass.php
@@ -18,10 +18,7 @@
 
 class AssetsContextPass implements CompilerPassInterface
 {
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('assets.context')) {
             return;
diff --git a/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php b/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
index 1e08ef314..e4023e623 100644
--- a/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
+++ b/DependencyInjection/Compiler/ContainerBuilderDebugDumpPass.php
@@ -25,10 +25,7 @@
  */
 class ContainerBuilderDebugDumpPass implements CompilerPassInterface
 {
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->getParameter('debug.container.dump')) {
             return;
diff --git a/DependencyInjection/Compiler/DataCollectorTranslatorPass.php b/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
deleted file mode 100644
index 7c6ca5d5a..000000000
--- a/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Translation\TranslatorBagInterface;
-
-trigger_deprecation('symfony/framework-bundle', '6.4', 'The "%s" class is deprecated, use "%s" instead.', DataCollectorTranslatorPass::class, \Symfony\Component\Translation\DependencyInjection\DataCollectorTranslatorPass::class);
-
-/**
- * @author Christian Flothmann <christian.flothmann@sensiolabs.de>
- *
- * @deprecated since Symfony 6.4, use Symfony\Component\Translation\DependencyInjection\DataCollectorTranslatorPass instead.
- */
-class DataCollectorTranslatorPass implements CompilerPassInterface
-{
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->has('translator')) {
-            return;
-        }
-
-        $translatorClass = $container->getParameterBag()->resolveValue($container->findDefinition('translator')->getClass());
-
-        if (!is_subclass_of($translatorClass, TranslatorBagInterface::class)) {
-            $container->removeDefinition('translator.data_collector');
-            $container->removeDefinition('data_collector.translation');
-        }
-    }
-}
diff --git a/DependencyInjection/Compiler/EnableLoggerDebugModePass.php b/DependencyInjection/Compiler/EnableLoggerDebugModePass.php
deleted file mode 100644
index c1a5e444f..000000000
--- a/DependencyInjection/Compiler/EnableLoggerDebugModePass.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
-
-trigger_deprecation('symfony/framework-bundle', '6.4', 'The "%s" class is deprecated, use argument $debug of HttpKernel\'s Logger instead.', EnableLoggerDebugModePass::class);
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\Log\Logger;
-
-/**
- * @deprecated since Symfony 6.4, use argument $debug of HttpKernel's Logger instead
- */
-final class EnableLoggerDebugModePass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        if (!$container->hasDefinition('profiler') || !$container->hasDefinition('logger')) {
-            return;
-        }
-
-        $loggerDefinition = $container->getDefinition('logger');
-
-        if (Logger::class === $loggerDefinition->getClass()) {
-            $loggerDefinition->setConfigurator([__CLASS__, 'configureLogger']);
-        }
-    }
-
-    public static function configureLogger(Logger $logger): void
-    {
-        if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
-            $logger->enableDebug();
-        }
-    }
-}
diff --git a/DependencyInjection/Compiler/LoggingTranslatorPass.php b/DependencyInjection/Compiler/LoggingTranslatorPass.php
deleted file mode 100644
index 5b31f2884..000000000
--- a/DependencyInjection/Compiler/LoggingTranslatorPass.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\Translation\TranslatorBagInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-trigger_deprecation('symfony/framework-bundle', '6.4', 'The "%s" class is deprecated, use "%s" instead.', LoggingTranslatorPass::class, \Symfony\Component\Translation\DependencyInjection\LoggingTranslatorPass::class);
-
-/**
- * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
- *
- * @deprecated since Symfony 6.4, use Symfony\Component\Translation\DependencyInjection\LoggingTranslatorPass instead.
- */
-class LoggingTranslatorPass implements CompilerPassInterface
-{
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasAlias('logger') || !$container->hasAlias('translator')) {
-            return;
-        }
-
-        if ($container->hasParameter('translator.logging') && $container->getParameter('translator.logging')) {
-            $translatorAlias = $container->getAlias('translator');
-            $definition = $container->getDefinition((string) $translatorAlias);
-            $class = $container->getParameterBag()->resolveValue($definition->getClass());
-
-            if (!$r = $container->getReflectionClass($class)) {
-                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $translatorAlias));
-            }
-            if ($r->isSubclassOf(TranslatorInterface::class) && $r->isSubclassOf(TranslatorBagInterface::class)) {
-                $container->getDefinition('translator.logging')->setDecoratedService('translator');
-                $warmer = $container->getDefinition('translation.warmer');
-                $subscriberAttributes = $warmer->getTag('container.service_subscriber');
-                $warmer->clearTag('container.service_subscriber');
-
-                foreach ($subscriberAttributes as $k => $v) {
-                    if ((!isset($v['id']) || 'translator' !== $v['id']) && (!isset($v['key']) || 'translator' !== $v['key'])) {
-                        $warmer->addTag('container.service_subscriber', $v);
-                    }
-                }
-                $warmer->addTag('container.service_subscriber', ['key' => 'translator', 'id' => 'translator.logging.inner']);
-            }
-        }
-    }
-}
diff --git a/DependencyInjection/Compiler/ProfilerPass.php b/DependencyInjection/Compiler/ProfilerPass.php
index 8f3f9b220..4da07e64a 100644
--- a/DependencyInjection/Compiler/ProfilerPass.php
+++ b/DependencyInjection/Compiler/ProfilerPass.php
@@ -24,10 +24,7 @@
  */
 class ProfilerPass implements CompilerPassInterface
 {
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (false === $container->hasDefinition('profiler')) {
             return;
@@ -45,7 +42,7 @@ public function process(ContainerBuilder $container)
             if (isset($attributes[0]['template']) || is_subclass_of($collectorClass, TemplateAwareDataCollectorInterface::class)) {
                 $idForTemplate = $attributes[0]['id'] ?? $collectorClass;
                 if (!$idForTemplate) {
-                    throw new InvalidArgumentException(sprintf('Data collector service "%s" must have an id attribute in order to specify a template.', $id));
+                    throw new InvalidArgumentException(\sprintf('Data collector service "%s" must have an id attribute in order to specify a template.', $id));
                 }
                 $template = [$idForTemplate, $attributes[0]['template'] ?? $collectorClass::getTemplate()];
             }
diff --git a/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php b/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php
index fedc30d06..7f0ec5f89 100644
--- a/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php
+++ b/DependencyInjection/Compiler/RemoveUnusedSessionMarshallingHandlerPass.php
@@ -19,10 +19,7 @@
  */
 class RemoveUnusedSessionMarshallingHandlerPass implements CompilerPassInterface
 {
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('session.marshalling_handler')) {
             return;
diff --git a/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php b/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
index aed3b1340..68a6ee103 100644
--- a/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
+++ b/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
@@ -21,10 +21,7 @@
  */
 class TestServiceContainerRealRefPass implements CompilerPassInterface
 {
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('test.private_services_locator')) {
             return;
diff --git a/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php b/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
index 6e7669a71..3b3dfcc06 100644
--- a/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
+++ b/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
@@ -21,10 +21,7 @@
  */
 class TestServiceContainerWeakRefPass implements CompilerPassInterface
 {
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('test.private_services_locator')) {
             return;
diff --git a/DependencyInjection/Compiler/TranslationLintCommandPass.php b/DependencyInjection/Compiler/TranslationLintCommandPass.php
new file mode 100644
index 000000000..4756795d1
--- /dev/null
+++ b/DependencyInjection/Compiler/TranslationLintCommandPass.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Translation\TranslatorBagInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class TranslationLintCommandPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        if (!$container->hasDefinition('console.command.translation_lint') || !$container->has('translator')) {
+            return;
+        }
+
+        $translatorClass = $container->getParameterBag()->resolveValue($container->findDefinition('translator')->getClass());
+
+        if (!is_subclass_of($translatorClass, TranslatorInterface::class) || !is_subclass_of($translatorClass, TranslatorBagInterface::class)) {
+            $container->removeDefinition('console.command.translation_lint');
+        }
+    }
+}
diff --git a/DependencyInjection/Compiler/UnusedTagsPass.php b/DependencyInjection/Compiler/UnusedTagsPass.php
index 5f975f868..ae2523e51 100644
--- a/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -22,9 +22,8 @@
 class UnusedTagsPass implements CompilerPassInterface
 {
     private const KNOWN_TAGS = [
-        'annotations.cached_reader',
-        'assets.package',
         'asset_mapper.compiler',
+        'assets.package',
         'auto_alias',
         'cache.pool',
         'cache.pool.clearer',
@@ -32,7 +31,6 @@ class UnusedTagsPass implements CompilerPassInterface
         'chatter.transport_factory',
         'config_cache.resource_checker',
         'console.command',
-        'container.do_not_inline',
         'container.env_var_loader',
         'container.env_var_processor',
         'container.excluded',
@@ -84,6 +82,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'routing.route_loader',
         'scheduler.schedule_provider',
         'scheduler.task',
+        'security.access_token_handler.oidc.signature_algorithm',
         'security.authenticator.login_linker',
         'security.expression_language_provider',
         'security.remember_me_handler',
@@ -106,16 +105,13 @@ class UnusedTagsPass implements CompilerPassInterface
         'workflow',
     ];
 
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         $tags = array_unique(array_merge($container->findTags(), self::KNOWN_TAGS));
 
         foreach ($container->findUnusedTags() as $tag) {
             // skip known tags
-            if (\in_array($tag, self::KNOWN_TAGS)) {
+            if (\in_array($tag, self::KNOWN_TAGS, true)) {
                 continue;
             }
 
@@ -132,9 +128,9 @@ public function process(ContainerBuilder $container)
             }
 
             $services = array_keys($container->findTaggedServiceIds($tag));
-            $message = sprintf('Tag "%s" was defined on service(s) "%s", but was never used.', $tag, implode('", "', $services));
+            $message = \sprintf('Tag "%s" was defined on service(s) "%s", but was never used.', $tag, implode('", "', $services));
             if ($candidates) {
-                $message .= sprintf(' Did you mean "%s"?', implode('", "', $candidates));
+                $message .= \sprintf(' Did you mean "%s"?', implode('", "', $candidates));
             }
 
             $container->log($this, $message);
diff --git a/DependencyInjection/Compiler/WorkflowGuardListenerPass.php b/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
deleted file mode 100644
index c07208311..000000000
--- a/DependencyInjection/Compiler/WorkflowGuardListenerPass.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\LogicException;
-
-trigger_deprecation('symfony/framework-bundle', '6.4', 'The "%s" class is deprecated, use "%s" instead.', WorkflowGuardListenerPass::class, \Symfony\Component\Workflow\DependencyInjection\WorkflowGuardListenerPass::class);
-
-/**
- * @author Christian Flothmann <christian.flothmann@sensiolabs.de>
- * @author Grégoire Pineau <lyrixx@lyrixx.info>
- *
- * @deprecated since Symfony 6.4, use Symfony\Component\Workflow\DependencyInjection\WorkflowGuardListenerPass instead.
- */
-class WorkflowGuardListenerPass implements CompilerPassInterface
-{
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasParameter('workflow.has_guard_listeners')) {
-            return;
-        }
-
-        $container->getParameterBag()->remove('workflow.has_guard_listeners');
-
-        $servicesNeeded = [
-            'security.token_storage',
-            'security.authorization_checker',
-            'security.authentication.trust_resolver',
-            'security.role_hierarchy',
-        ];
-
-        foreach ($servicesNeeded as $service) {
-            if (!$container->has($service)) {
-                throw new LogicException(sprintf('The "%s" service is needed to be able to use the workflow guard listener.', $service));
-            }
-        }
-    }
-}
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index cb52a0704..50c093f28 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
 
-use Doctrine\Common\Annotations\Annotation;
 use Doctrine\DBAL\Connection;
 use Psr\Log\LogLevel;
 use Seld\JsonLint\JsonParser;
@@ -30,6 +29,7 @@
 use Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\IpUtils;
 use Symfony\Component\Lock\Lock;
 use Symfony\Component\Lock\Store\SemaphoreStore;
 use Symfony\Component\Mailer\Mailer;
@@ -44,7 +44,9 @@
 use Symfony\Component\Serializer\Encoder\JsonDecode;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Translation\Translator;
+use Symfony\Component\TypeInfo\Type;
 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;
@@ -55,14 +57,12 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    private bool $debug;
-
     /**
      * @param bool $debug Whether debugging is enabled or not
      */
-    public function __construct(bool $debug)
-    {
-        $this->debug = $debug;
+    public function __construct(
+        private bool $debug,
+    ) {
     }
 
     /**
@@ -82,30 +82,16 @@ public function getConfigTreeBuilder(): TreeBuilder
                     return $v;
                 })
             ->end()
-            ->validate()
-                ->always(function ($v) {
-                    if (!isset($v['http_method_override'])) {
-                        trigger_deprecation('symfony/framework-bundle', '6.1', 'Not setting the "framework.http_method_override" config option is deprecated. It will default to "false" in 7.0.');
-
-                        $v['http_method_override'] = true;
-                    }
-                    if (!isset($v['handle_all_throwables'])) {
-                        trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.handle_all_throwables" config option is deprecated. It will default to "true" in 7.0.');
-                    }
-
-                    return $v;
-                })
-            ->end()
             ->fixXmlConfig('enabled_locale')
             ->children()
                 ->scalarNode('secret')->end()
                 ->booleanNode('http_method_override')
-                    ->info("Set true to enable support for the '_method' request parameter to determine the intended HTTP method on POST requests. Note: When using the HttpCache, you need to call the method in your front controller instead")
-                    ->treatNullLike(false)
+                    ->info("Set true to enable support for the '_method' request parameter to determine the intended HTTP method on POST requests. Note: When using the HttpCache, you need to call the method in your front controller instead.")
+                    ->defaultFalse()
                 ->end()
                 ->scalarNode('trust_x_sendfile_type_header')
                     ->info('Set true to enable support for xsendfile in binary file responses.')
-                    ->defaultFalse()
+                    ->defaultValue('%env(bool:default::SYMFONY_TRUST_X_SENDFILE_TYPE_HEADER)%')
                 ->end()
                 ->scalarNode('ide')->defaultValue($this->debug ? '%env(default::SYMFONY_IDE)%' : null)->end()
                 ->booleanNode('test')->end()
@@ -123,26 +109,28 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->prototype('scalar')->end()
                 ->end()
                 ->arrayNode('trusted_hosts')
-                    ->beforeNormalization()->ifString()->then(fn ($v) => [$v])->end()
+                    ->beforeNormalization()->ifString()->then(static fn ($v) => $v ? [$v] : [])->end()
                     ->prototype('scalar')->end()
+                    ->defaultValue(['%env(default::SYMFONY_TRUSTED_HOSTS)%'])
+                ->end()
+                ->variableNode('trusted_proxies')
+                    ->beforeNormalization()
+                        ->ifTrue(fn ($v) => 'private_ranges' === $v || 'PRIVATE_SUBNETS' === $v)
+                        ->then(fn () => IpUtils::PRIVATE_SUBNETS)
+                    ->end()
+                    ->defaultValue(['%env(default::SYMFONY_TRUSTED_PROXIES)%'])
                 ->end()
-                ->scalarNode('trusted_proxies')->end()
                 ->arrayNode('trusted_headers')
                     ->fixXmlConfig('trusted_header')
                     ->performNoDeepMerging()
-                    ->defaultValue(['x-forwarded-for', 'x-forwarded-port', 'x-forwarded-proto'])
-                    ->beforeNormalization()->ifString()->then(fn ($v) => $v ? array_map('trim', explode(',', $v)) : [])->end()
-                    ->enumPrototype()
-                        ->values([
-                            'forwarded',
-                            'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix',
-                        ])
-                    ->end()
+                    ->beforeNormalization()->ifString()->then(static fn ($v) => $v ? [$v] : [])->end()
+                    ->prototype('scalar')->end()
+                    ->defaultValue(['%env(default::SYMFONY_TRUSTED_HEADERS)%'])
                 ->end()
                 ->scalarNode('error_controller')
                     ->defaultValue('error_controller')
                 ->end()
-                ->booleanNode('handle_all_throwables')->info('HttpKernel will handle all kinds of \Throwable')->end()
+                ->booleanNode('handle_all_throwables')->info('HttpKernel will handle all kinds of \Throwable.')->defaultTrue()->end()
             ->end()
         ;
 
@@ -170,9 +158,10 @@ public function getConfigTreeBuilder(): TreeBuilder
         $this->addAssetMapperSection($rootNode, $enableIfStandalone);
         $this->addTranslatorSection($rootNode, $enableIfStandalone);
         $this->addValidationSection($rootNode, $enableIfStandalone);
-        $this->addAnnotationsSection($rootNode, $willBeAvailable);
+        $this->addAnnotationsSection($rootNode);
         $this->addSerializerSection($rootNode, $enableIfStandalone);
         $this->addPropertyAccessSection($rootNode, $willBeAvailable);
+        $this->addTypeInfoSection($rootNode, $enableIfStandalone);
         $this->addPropertyInfoSection($rootNode, $enableIfStandalone);
         $this->addCacheSection($rootNode, $willBeAvailable);
         $this->addPhpErrorsSection($rootNode);
@@ -221,9 +210,22 @@ private function addCsrfSection(ArrayNodeDefinition $rootNode): void
                     ->treatTrueLike(['enabled' => true])
                     ->treatNullLike(['enabled' => true])
                     ->addDefaultsIfNotSet()
+                    ->fixXmlConfig('stateless_token_id')
                     ->children()
-                        // defaults to framework.session.enabled && !class_exists(FullStack::class) && interface_exists(CsrfTokenManagerInterface::class)
-                        ->booleanNode('enabled')->defaultNull()->end()
+                        // defaults to (framework.csrf_protection.stateless_token_ids || framework.session.enabled) && !class_exists(FullStack::class) && interface_exists(CsrfTokenManagerInterface::class)
+                        ->scalarNode('enabled')->defaultNull()->end()
+                        ->arrayNode('stateless_token_ids')
+                            ->scalarPrototype()->end()
+                            ->info('Enable headers/cookies-based CSRF validation for the listed token ids.')
+                        ->end()
+                        ->scalarNode('check_header')
+                            ->defaultFalse()
+                            ->info('Whether to check the CSRF token in a header in addition to a cookie when using stateless protection.')
+                        ->end()
+                        ->scalarNode('cookie_name')
+                            ->defaultValue('csrf-token')
+                            ->info('The name of the cookie to use when using stateless protection.')
+                        ->end()
                     ->end()
                 ->end()
             ->end()
@@ -235,7 +237,7 @@ private function addFormSection(ArrayNodeDefinition $rootNode, callable $enableI
         $rootNode
             ->children()
                 ->arrayNode('form')
-                    ->info('form configuration')
+                    ->info('Form configuration')
                     ->{$enableIfStandalone('symfony/form', Form::class)}()
                     ->children()
                         ->arrayNode('csrf_protection')
@@ -244,13 +246,17 @@ private function addFormSection(ArrayNodeDefinition $rootNode, callable $enableI
                             ->treatNullLike(['enabled' => true])
                             ->addDefaultsIfNotSet()
                             ->children()
-                                ->booleanNode('enabled')->defaultNull()->end() // defaults to framework.csrf_protection.enabled
+                                ->scalarNode('enabled')->defaultNull()->end() // defaults to framework.csrf_protection.enabled
+                                ->scalarNode('token_id')->defaultNull()->end()
                                 ->scalarNode('field_name')->defaultValue('_token')->end()
+                                ->arrayNode('field_attr')
+                                    ->performNoDeepMerging()
+                                    ->normalizeKeys(false)
+                                    ->scalarPrototype()->end()
+                                    ->defaultValue(['data-controller' => 'csrf-protection'])
+                                ->end()
                             ->end()
                         ->end()
-                        ->booleanNode('legacy_error_messages')
-                            ->setDeprecated('symfony/framework-bundle', '6.2')
-                        ->end()
                     ->end()
                 ->end()
             ->end()
@@ -296,7 +302,7 @@ private function addEsiSection(ArrayNodeDefinition $rootNode): void
         $rootNode
             ->children()
                 ->arrayNode('esi')
-                    ->info('esi configuration')
+                    ->info('ESI configuration')
                     ->canBeEnabled()
                 ->end()
             ->end()
@@ -308,7 +314,7 @@ private function addSsiSection(ArrayNodeDefinition $rootNode): void
         $rootNode
             ->children()
                 ->arrayNode('ssi')
-                    ->info('ssi configuration')
+                    ->info('SSI configuration')
                     ->canBeEnabled()
                 ->end()
             ->end();
@@ -319,7 +325,7 @@ private function addFragmentsSection(ArrayNodeDefinition $rootNode): void
         $rootNode
             ->children()
                 ->arrayNode('fragments')
-                    ->info('fragments configuration')
+                    ->info('Fragments configuration')
                     ->canBeEnabled()
                     ->children()
                         ->scalarNode('hinclude_default_template')->defaultNull()->end()
@@ -335,15 +341,15 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode): void
         $rootNode
             ->children()
                 ->arrayNode('profiler')
-                    ->info('profiler configuration')
+                    ->info('Profiler configuration')
                     ->canBeEnabled()
                     ->children()
                         ->booleanNode('collect')->defaultTrue()->end()
-                        ->scalarNode('collect_parameter')->defaultNull()->info('The name of the parameter to use to enable or disable collection on a per request basis')->end()
+                        ->scalarNode('collect_parameter')->defaultNull()->info('The name of the parameter to use to enable or disable collection on a per request basis.')->end()
                         ->booleanNode('only_exceptions')->defaultFalse()->end()
                         ->booleanNode('only_main_requests')->defaultFalse()->end()
                         ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end()
-                        ->booleanNode('collect_serializer_data')->info('Enables the serializer data collector and profiler panel')->defaultFalse()->end()
+                        ->booleanNode('collect_serializer_data')->info('Enables the serializer data collector and profiler panel.')->defaultFalse()->end()
                     ->end()
                 ->end()
             ->end()
@@ -373,7 +379,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
 
                                 foreach ($workflows as $key => $workflow) {
                                     if (isset($workflow['enabled']) && false === $workflow['enabled']) {
-                                        throw new LogicException(sprintf('Cannot disable a single workflow. Remove the configuration for the workflow "%s" instead.', $key));
+                                        throw new LogicException(\sprintf('Cannot disable a single workflow. Remove the configuration for the workflow "%s" instead.', $key));
                                     }
 
                                     unset($workflows[$key]['enabled']);
@@ -418,10 +424,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                         ->end()
                                     ->end()
                                     ->arrayNode('supports')
-                                        ->beforeNormalization()
-                                            ->ifString()
-                                            ->then(fn ($v) => [$v])
-                                        ->end()
+                                        ->beforeNormalization()->castToArray()->end()
                                         ->prototype('scalar')
                                             ->cannotBeEmpty()
                                             ->validate()
@@ -453,7 +456,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                                     if (!\is_string($value)) {
                                                         return true;
                                                     }
-                                                    if (class_exists(WorkflowEvents::class) && !\in_array($value, WorkflowEvents::ALIASES)) {
+                                                    if (class_exists(WorkflowEvents::class) && !\in_array($value, WorkflowEvents::ALIASES, true)) {
                                                         return true;
                                                     }
                                                 }
@@ -462,7 +465,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                             })
                                             ->thenInvalid('The value must be "null" or an array of workflow events (like ["workflow.enter"]).')
                                         ->end()
-                                        ->info('Select which Transition events should be dispatched for this Workflow')
+                                        ->info('Select which Transition events should be dispatched for this Workflow.')
                                         ->example(['workflow.enter', 'workflow.transition'])
                                     ->end()
                                     ->arrayNode('places')
@@ -496,8 +499,6 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                                 return array_values($places);
                                             })
                                         ->end()
-                                        ->isRequired()
-                                        ->requiresAtLeastOneElement()
                                         ->prototype('array')
                                             ->children()
                                                 ->scalarNode('name')
@@ -548,24 +549,18 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode): void
                                                 ->end()
                                                 ->scalarNode('guard')
                                                     ->cannotBeEmpty()
-                                                    ->info('An expression to block the transition')
+                                                    ->info('An expression to block the transition.')
                                                     ->example('is_fully_authenticated() and is_granted(\'ROLE_JOURNALIST\') and subject.getTitle() == \'My first article\'')
                                                 ->end()
                                                 ->arrayNode('from')
-                                                    ->beforeNormalization()
-                                                        ->ifString()
-                                                        ->then(fn ($v) => [$v])
-                                                    ->end()
+                                                    ->beforeNormalization()->castToArray()->end()
                                                     ->requiresAtLeastOneElement()
                                                     ->prototype('scalar')
                                                         ->cannotBeEmpty()
                                                     ->end()
                                                 ->end()
                                                 ->arrayNode('to')
-                                                    ->beforeNormalization()
-                                                        ->ifString()
-                                                        ->then(fn ($v) => [$v])
-                                                    ->end()
+                                                    ->beforeNormalization()->castToArray()->end()
                                                     ->requiresAtLeastOneElement()
                                                     ->prototype('scalar')
                                                         ->cannotBeEmpty()
@@ -626,14 +621,17 @@ private function addRouterSection(ArrayNodeDefinition $rootNode): void
         $rootNode
             ->children()
                 ->arrayNode('router')
-                    ->info('router configuration')
+                    ->info('Router configuration')
                     ->canBeEnabled()
                     ->children()
                         ->scalarNode('resource')->isRequired()->end()
                         ->scalarNode('type')->end()
-                        ->scalarNode('cache_dir')->defaultValue('%kernel.cache_dir%')->end()
+                        ->scalarNode('cache_dir')
+                            ->defaultValue('%kernel.build_dir%')
+                            ->setDeprecated('symfony/framework-bundle', '7.1', 'Setting the "%path%.%node%" configuration option is deprecated. It will be removed in version 8.0.')
+                        ->end()
                         ->scalarNode('default_uri')
-                            ->info('The default URI used to generate URLs in a non-HTTP context')
+                            ->info('The default URI used to generate URLs in a non-HTTP context.')
                             ->defaultNull()
                         ->end()
                         ->scalarNode('http_port')->defaultValue(80)->end()
@@ -657,38 +655,15 @@ private function addRouterSection(ArrayNodeDefinition $rootNode): void
     private function addSessionSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
-            ->validate()
-                ->always(function (array $v): array {
-                    if ($v['session']['enabled']) {
-                        if (!\array_key_exists('cookie_secure', $v['session'])) {
-                            trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.session.cookie_secure" config option is deprecated. It will default to "auto" in 7.0.');
-                        }
-
-                        if (!\array_key_exists('cookie_samesite', $v['session'])) {
-                            trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.session.cookie_samesite" config option is deprecated. It will default to "lax" in 7.0.');
-                        }
-
-                        if (!\array_key_exists('handler_id', $v['session']) && !\array_key_exists('save_path', $v['session'])) {
-                            trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting either "framework.session.handler_id" or "save_path" config options is deprecated; "handler_id" will default to null in 7.0 if "save_path" is not set and to "session.handler.native_file" otherwise.');
-                        }
-                    }
-
-                    $v['session'] += [
-                        'cookie_samesite' => null,
-                        'handler_id' => 'session.handler.native_file',
-                        'save_path' => '%kernel.cache_dir%/sessions',
-                    ];
-
-                    return $v;
-                })
-            ->end()
             ->children()
                 ->arrayNode('session')
-                    ->info('session configuration')
+                    ->info('Session configuration')
                     ->canBeEnabled()
                     ->children()
                         ->scalarNode('storage_factory_id')->defaultValue('session.storage.factory.native')->end()
-                        ->scalarNode('handler_id')->end()
+                        ->scalarNode('handler_id')
+                            ->info('Defaults to using the native session handler, or to the native *file* session handler if "save_path" is not null.')
+                        ->end()
                         ->scalarNode('name')
                             ->validate()
                                 ->ifTrue(function ($v) {
@@ -702,25 +677,29 @@ private function addSessionSection(ArrayNodeDefinition $rootNode): void
                         ->scalarNode('cookie_lifetime')->end()
                         ->scalarNode('cookie_path')->end()
                         ->scalarNode('cookie_domain')->end()
-                        ->enumNode('cookie_secure')->values([true, false, 'auto'])->end()
+                        ->enumNode('cookie_secure')->values([true, false, 'auto'])->defaultValue('auto')->end()
                         ->booleanNode('cookie_httponly')->defaultTrue()->end()
-                        ->enumNode('cookie_samesite')->values([null, Cookie::SAMESITE_LAX, Cookie::SAMESITE_STRICT, Cookie::SAMESITE_NONE])->end()
+                        ->enumNode('cookie_samesite')->values([null, Cookie::SAMESITE_LAX, Cookie::SAMESITE_STRICT, Cookie::SAMESITE_NONE])->defaultValue('lax')->end()
                         ->booleanNode('use_cookies')->end()
                         ->scalarNode('gc_divisor')->end()
-                        ->scalarNode('gc_probability')->defaultValue(1)->end()
+                        ->scalarNode('gc_probability')->end()
                         ->scalarNode('gc_maxlifetime')->end()
-                        ->scalarNode('save_path')->end()
+                        ->scalarNode('save_path')
+                            ->info('Defaults to "%kernel.cache_dir%/sessions" if the "handler_id" option is not null.')
+                        ->end()
                         ->integerNode('metadata_update_threshold')
                             ->defaultValue(0)
-                            ->info('seconds to wait between 2 session metadata updates')
+                            ->info('Seconds to wait between 2 session metadata updates.')
                         ->end()
                         ->integerNode('sid_length')
                             ->min(22)
                             ->max(256)
+                            ->setDeprecated('symfony/framework-bundle', '7.2', 'Setting the "%path%.%node%" configuration option is deprecated. It will be removed in version 8.0. No alternative is provided as PHP 8.4 has deprecated the related option.')
                         ->end()
                         ->integerNode('sid_bits_per_character')
                             ->min(4)
                             ->max(6)
+                            ->setDeprecated('symfony/framework-bundle', '7.2', 'Setting the "%path%.%node%" configuration option is deprecated. It will be removed in version 8.0. No alternative is provided as PHP 8.4 has deprecated the related option.')
                         ->end()
                     ->end()
                 ->end()
@@ -733,7 +712,7 @@ private function addRequestSection(ArrayNodeDefinition $rootNode): void
         $rootNode
             ->children()
                 ->arrayNode('request')
-                    ->info('request configuration')
+                    ->info('Request configuration')
                     ->canBeEnabled()
                     ->fixXmlConfig('format')
                     ->children()
@@ -759,12 +738,12 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode, callable $enabl
         $rootNode
             ->children()
                 ->arrayNode('assets')
-                    ->info('assets configuration')
+                    ->info('Assets configuration')
                     ->{$enableIfStandalone('symfony/asset', Package::class)}()
                     ->fixXmlConfig('base_url')
                     ->children()
                         ->booleanNode('strict_mode')
-                            ->info('Throw an exception if an entry is missing from the manifest.json')
+                            ->info('Throw an exception if an entry is missing from the manifest.json.')
                             ->defaultFalse()
                         ->end()
                         ->scalarNode('version_strategy')->defaultNull()->end()
@@ -805,7 +784,7 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode, callable $enabl
                                 ->fixXmlConfig('base_url')
                                 ->children()
                                     ->booleanNode('strict_mode')
-                                        ->info('Throw an exception if an entry is missing from the manifest.json')
+                                        ->info('Throw an exception if an entry is missing from the manifest.json.')
                                         ->defaultFalse()
                                     ->end()
                                     ->scalarNode('version_strategy')->defaultNull()->end()
@@ -864,7 +843,7 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                     ->children()
                         // add array node called "paths" that will be an array of strings
                         ->arrayNode('paths')
-                            ->info('Directories that hold assets that should be in the mapper. Can be a simple array of an array of ["path/to/assets": "namespace"]')
+                            ->info('Directories that hold assets that should be in the mapper. Can be a simple array of an array of ["path/to/assets": "namespace"].')
                             ->example(['assets/'])
                             ->normalizeKeys(false)
                             ->useAttributeAsKey('namespace')
@@ -895,21 +874,21 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->prototype('scalar')->end()
                         ->end()
                         ->arrayNode('excluded_patterns')
-                            ->info('Array of glob patterns of asset file paths that should not be in the asset mapper')
+                            ->info('Array of glob patterns of asset file paths that should not be in the asset mapper.')
                             ->prototype('scalar')->end()
                             ->example(['*/assets/build/*', '*/*_.scss'])
                         ->end()
                         // boolean called defaulting to true
                         ->booleanNode('exclude_dotfiles')
-                            ->info('If true, any files starting with "." will be excluded from the asset mapper')
+                            ->info('If true, any files starting with "." will be excluded from the asset mapper.')
                             ->defaultTrue()
                         ->end()
                         ->booleanNode('server')
-                            ->info('If true, a "dev server" will return the assets from the public directory (true in "debug" mode only by default)')
+                            ->info('If true, a "dev server" will return the assets from the public directory (true in "debug" mode only by default).')
                             ->defaultValue($this->debug)
                         ->end()
                         ->scalarNode('public_prefix')
-                            ->info('The public path where the assets will be written to (and served from when "server" is true)')
+                            ->info('The public path where the assets will be written to (and served from when "server" is true).')
                             ->defaultValue('/assets/')
                         ->end()
                         ->enumNode('missing_import_mode')
@@ -947,9 +926,6 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->info('The directory to store JavaScript vendors.')
                             ->defaultValue('%kernel.project_dir%/assets/vendor')
                         ->end()
-                        ->scalarNode('provider')
-                            ->setDeprecated('symfony/framework-bundle', '6.4', 'Option "%node%" at "%path%" is deprecated and does nothing. Remove it.')
-                        ->end()
                     ->end()
                 ->end()
             ->end()
@@ -961,7 +937,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
         $rootNode
             ->children()
                 ->arrayNode('translator')
-                    ->info('translator configuration')
+                    ->info('Translator configuration')
                     ->{$enableIfStandalone('symfony/translation', Translator::class)}()
                     ->fixXmlConfig('fallback')
                     ->fixXmlConfig('path')
@@ -969,7 +945,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
                     ->children()
                         ->arrayNode('fallbacks')
                             ->info('Defaults to the value of "default_locale".')
-                            ->beforeNormalization()->ifString()->then(fn ($v) => [$v])->end()
+                            ->beforeNormalization()->castToArray()->end()
                             ->prototype('scalar')->end()
                             ->defaultValue([])
                         ->end()
@@ -977,7 +953,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
                         ->scalarNode('formatter')->defaultValue('translator.formatter.default')->end()
                         ->scalarNode('cache_dir')->defaultValue('%kernel.cache_dir%/translations')->end()
                         ->scalarNode('default_path')
-                            ->info('The default path used to load translations')
+                            ->info('The default path used to load translations.')
                             ->defaultValue('%kernel.project_dir%/translations')
                         ->end()
                         ->arrayNode('paths')
@@ -1000,7 +976,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
                             ->end()
                         ->end()
                         ->arrayNode('providers')
-                            ->info('Translation providers you can read/write your translations from')
+                            ->info('Translation providers you can read/write your translations from.')
                             ->useAttributeAsKey('name')
                             ->prototype('array')
                                 ->fixXmlConfig('domain')
@@ -1029,35 +1005,12 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
     private function addValidationSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
-            ->validate()
-                ->always(function ($v) {
-                    if ($v['validation']['enabled'] && !\array_key_exists('email_validation_mode', $v['validation'])) {
-                        trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.validation.email_validation_mode" config option is deprecated. It will default to "html5" in 7.0.');
-                    }
-
-                    return $v;
-                })
-            ->end()
             ->children()
                 ->arrayNode('validation')
-                    ->beforeNormalization()
-                        ->ifTrue(fn ($v) => isset($v['enable_annotations']))
-                        ->then(function ($v) {
-                            trigger_deprecation('symfony/framework-bundle', '6.4', 'Option "enable_annotations" at "framework.validation" is deprecated. Use the "enable_attributes" option instead.');
-
-                            if (isset($v['enable_attributes'])) {
-                                throw new LogicException('The "enable_annotations" and "enable_attributes" options at path "framework.validation" must not be both set. Only the "enable_attributes" option must be used.');
-                            }
-                            $v['enable_attributes'] = $v['enable_annotations'];
-
-                            return $v;
-                        })
-                    ->end()
-                    ->info('validation configuration')
+                    ->info('Validation configuration')
                     ->{$enableIfStandalone('symfony/validator', Validation::class)}()
                     ->children()
                         ->scalarNode('cache')->end()
-                        ->booleanNode('enable_annotations')->end()
                         ->booleanNode('enable_attributes')->{class_exists(FullStack::class) ? 'defaultFalse' : 'defaultTrue'}()->end()
                         ->arrayNode('static_method')
                             ->defaultValue(['loadValidatorMetadata'])
@@ -1066,7 +1019,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((class_exists(Email::class) ? Email::VALIDATION_MODES : ['html5-allow-no-tld', 'html5', 'strict']) + ['loose'])->defaultValue('html5')->end()
                         ->arrayNode('mapping')
                             ->addDefaultsIfNotSet()
                             ->fixXmlConfig('path')
@@ -1139,21 +1092,15 @@ private function addValidationSection(ArrayNodeDefinition $rootNode, callable $e
         ;
     }
 
-    private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $willBeAvailable): void
+    private function addAnnotationsSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
             ->children()
                 ->arrayNode('annotations')
-                    ->info('annotation configuration')
-                    ->{$willBeAvailable('doctrine/annotations', Annotation::class) ? 'canBeDisabled' : 'canBeEnabled'}()
-                    ->children()
-                        ->enumNode('cache')
-                            ->values(['none', 'php_array', 'file'])
-                            ->defaultValue('php_array')
-                        ->end()
-                        ->scalarNode('file_cache_dir')->defaultValue('%kernel.cache_dir%/annotations')->end()
-                        ->booleanNode('debug')->defaultValue($this->debug)->end()
-                    ->end()
+                    ->canBeEnabled()
+                    ->validate()
+                        ->ifTrue(static fn (array $v) => $v['enabled'])
+                        ->thenInvalid('Enabling the doctrine/annotations integration is not supported anymore.')
                 ->end()
             ->end()
         ;
@@ -1161,26 +1108,24 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $
 
     private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
+        $defaultContextNode = fn () => (new NodeBuilder())
+            ->arrayNode('default_context')
+                ->normalizeKeys(false)
+                ->validate()
+                    ->ifTrue(fn () => $this->debug && class_exists(JsonParser::class))
+                    ->then(fn (array $v) => $v + [JsonDecode::DETAILED_ERROR_MESSAGES => true])
+                ->end()
+                ->defaultValue([])
+                ->prototype('variable')->end()
+        ;
+
         $rootNode
             ->children()
                 ->arrayNode('serializer')
-                    ->beforeNormalization()
-                        ->ifTrue(fn ($v) => isset($v['enable_annotations']))
-                        ->then(function ($v) {
-                            trigger_deprecation('symfony/framework-bundle', '6.4', 'Option "enable_annotations" at "framework.serializer" is deprecated. Use the "enable_attributes" option instead.');
-
-                            if (isset($v['enable_attributes'])) {
-                                throw new LogicException('The "enable_annotations" and "enable_attributes" options at path "framework.serializer" must not be both set. Only the "enable_attributes" option must be used.');
-                            }
-                            $v['enable_attributes'] = $v['enable_annotations'];
-
-                            return $v;
-                        })
-                    ->end()
-                    ->info('serializer configuration')
+                    ->info('Serializer configuration')
+                    ->fixXmlConfig('named_serializer', 'named_serializers')
                     ->{$enableIfStandalone('symfony/serializer', Serializer::class)}()
                     ->children()
-                        ->booleanNode('enable_annotations')->end()
                         ->booleanNode('enable_attributes')->{class_exists(FullStack::class) ? 'defaultFalse' : 'defaultTrue'}()->end()
                         ->scalarNode('name_converter')->end()
                         ->scalarNode('circular_reference_handler')->end()
@@ -1194,16 +1139,37 @@ private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $e
                                 ->end()
                             ->end()
                         ->end()
-                        ->arrayNode('default_context')
-                            ->normalizeKeys(false)
+                        ->append($defaultContextNode())
+                        ->arrayNode('named_serializers')
+                            ->useAttributeAsKey('name')
+                            ->arrayPrototype()
+                                ->children()
+                                    ->scalarNode('name_converter')->end()
+                                    ->append($defaultContextNode())
+                                    ->booleanNode('include_built_in_normalizers')
+                                        ->info('Whether to include the built-in normalizers')
+                                        ->defaultTrue()
+                                    ->end()
+                                    ->booleanNode('include_built_in_encoders')
+                                        ->info('Whether to include the built-in encoders')
+                                        ->defaultTrue()
+                                    ->end()
+                                ->end()
+                            ->end()
                             ->validate()
-                                ->ifTrue(fn () => $this->debug && class_exists(JsonParser::class))
-                                ->then(fn (array $v) => $v + [JsonDecode::DETAILED_ERROR_MESSAGES => true])
+                                ->ifTrue(fn ($v) => isset($v['default']))
+                                ->thenInvalid('"default" is a reserved name.')
                             ->end()
-                            ->defaultValue([])
-                            ->prototype('variable')->end()
                         ->end()
                     ->end()
+                    ->validate()
+                        ->ifTrue(fn ($v) => $this->debug && class_exists(JsonParser::class) && !isset($v['default_context'][JsonDecode::DETAILED_ERROR_MESSAGES]))
+                        ->then(function ($v) {
+                            $v['default_context'][JsonDecode::DETAILED_ERROR_MESSAGES] = true;
+
+                            return $v;
+                        })
+                    ->end()
                 ->end()
             ->end()
         ;
@@ -1241,6 +1207,18 @@ private function addPropertyInfoSection(ArrayNodeDefinition $rootNode, callable
         ;
     }
 
+    private function addTypeInfoSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
+    {
+        $rootNode
+            ->children()
+                ->arrayNode('type_info')
+                    ->info('Type info configuration')
+                    ->{$enableIfStandalone('symfony/type-info', Type::class)}()
+                ->end()
+            ->end()
+        ;
+    }
+
     private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBeAvailable): void
     {
         $rootNode
@@ -1251,16 +1229,16 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
                     ->fixXmlConfig('pool')
                     ->children()
                         ->scalarNode('prefix_seed')
-                            ->info('Used to namespace cache keys when using several apps with the same shared backend')
+                            ->info('Used to namespace cache keys when using several apps with the same shared backend.')
                             ->defaultValue('_%kernel.project_dir%.%kernel.container_class%')
                             ->example('my-application-name/%kernel.environment%')
                         ->end()
                         ->scalarNode('app')
-                            ->info('App related cache pools configuration')
+                            ->info('App related cache pools configuration.')
                             ->defaultValue('cache.adapter.filesystem')
                         ->end()
                         ->scalarNode('system')
-                            ->info('System related cache pools configuration')
+                            ->info('System related cache pools configuration.')
                             ->defaultValue('cache.adapter.system')
                         ->end()
                         ->scalarNode('directory')->defaultValue('%kernel.cache_dir%/pools/app')->end()
@@ -1309,7 +1287,7 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
                                     ->scalarNode('tags')->defaultNull()->end()
                                     ->booleanNode('public')->defaultFalse()->end()
                                     ->scalarNode('default_lifetime')
-                                        ->info('Default lifetime of the pool')
+                                        ->info('Default lifetime of the pool.')
                                         ->example('"300" for 5 minutes expressed in seconds, "PT5M" for five minutes expressed as ISO 8601 time interval, or "5 minutes" as a date expression')
                                     ->end()
                                     ->scalarNode('provider')
@@ -1335,17 +1313,6 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
     private function addPhpErrorsSection(ArrayNodeDefinition $rootNode): void
     {
         $rootNode
-            ->validate()
-                ->always(function (array $v): array {
-                    if (!\array_key_exists('log', $v['php_errors'])) {
-                        trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.php_errors.log" config option is deprecated. It will default to "true" in 7.0.');
-
-                        $v['php_errors']['log'] = $this->debug;
-                    }
-
-                    return $v;
-                })
-            ->end()
             ->children()
                 ->arrayNode('php_errors')
                     ->info('PHP errors handling configuration')
@@ -1355,6 +1322,7 @@ private function addPhpErrorsSection(ArrayNodeDefinition $rootNode): void
                             ->info('Use the application logger instead of the PHP logger for logging PHP errors.')
                             ->example('"true" to use the default configuration: log all errors. "false" to disable. An integer bit field of E_* constants, or an array mapping E_* constants to log levels.')
                             ->treatNullLike($this->debug)
+                            ->defaultTrue()
                             ->beforeNormalization()
                                 ->ifArray()
                                 ->then(function (array $v): array {
@@ -1398,34 +1366,13 @@ private function addExceptionsSection(ArrayNodeDefinition $rootNode): void
                 ->arrayNode('exceptions')
                     ->info('Exception handling configuration')
                     ->useAttributeAsKey('class')
-                    ->beforeNormalization()
-                        // Handle legacy XML configuration
-                        ->ifArray()
-                        ->then(function (array $v): array {
-                            if (!\array_key_exists('exception', $v)) {
-                                return $v;
-                            }
-
-                            trigger_deprecation('symfony/framework-bundle', '6.3', '"framework:exceptions" tag is deprecated. Unwrap it and replace your "framework:exception" tags\' "name" attribute by "class".');
-
-                            $v = $v['exception'];
-                            unset($v['exception']);
-
-                            foreach ($v as &$exception) {
-                                $exception['class'] = $exception['name'];
-                                unset($exception['name']);
-                            }
-
-                            return $v;
-                        })
-                    ->end()
                     ->prototype('array')
                         ->children()
                             ->scalarNode('log_level')
                                 ->info('The level of log message. Null to let Symfony decide.')
                                 ->validate()
                                     ->ifTrue(fn ($v) => null !== $v && !\in_array($v, $logLevels, true))
-                                    ->thenInvalid(sprintf('The log level is not valid. Pick one among "%s".', implode('", "', $logLevels)))
+                                    ->thenInvalid(\sprintf('The log level is not valid. Pick one among "%s".', implode('", "', $logLevels)))
                                 ->end()
                                 ->defaultNull()
                             ->end()
@@ -1501,7 +1448,7 @@ private function addLockSection(ArrayNodeDefinition $rootNode, callable $enableI
                             ->end()
                             ->prototype('array')
                                 ->performNoDeepMerging()
-                                ->beforeNormalization()->ifString()->then(fn ($v) => [$v])->end()
+                                ->beforeNormalization()->castToArray()->end()
                                 ->prototype('scalar')->end()
                             ->end()
                         ->end()
@@ -1571,7 +1518,7 @@ private function addWebLinkSection(ArrayNodeDefinition $rootNode, callable $enab
         $rootNode
             ->children()
                 ->arrayNode('web_link')
-                    ->info('web links configuration')
+                    ->info('Web links configuration')
                     ->{$enableIfStandalone('symfony/weblink', HttpHeaderSerializer::class)}()
                 ->end()
             ->end()
@@ -1593,7 +1540,7 @@ private function addMessengerSection(ArrayNodeDefinition $rootNode, callable $en
                     ->end()
                     ->validate()
                         ->ifTrue(fn ($v) => isset($v['buses']) && null !== $v['default_bus'] && !isset($v['buses'][$v['default_bus']]))
-                        ->then(fn ($v) => throw new InvalidConfigurationException(sprintf('The specified default bus "%s" is not configured. Available buses are "%s".', $v['default_bus'], implode('", "', array_keys($v['buses'])))))
+                        ->then(fn ($v) => throw new InvalidConfigurationException(\sprintf('The specified default bus "%s" is not configured. Available buses are "%s".', $v['default_bus'], implode('", "', array_keys($v['buses'])))))
                     ->end()
                     ->children()
                         ->arrayNode('routing')
@@ -1697,16 +1644,17 @@ function ($a) {
                                             })
                                         ->end()
                                         ->children()
-                                            ->scalarNode('service')->defaultNull()->info('Service id to override the retry strategy entirely')->end()
+                                            ->scalarNode('service')->defaultNull()->info('Service id to override the retry strategy entirely.')->end()
                                             ->integerNode('max_retries')->defaultValue(3)->min(0)->end()
-                                            ->integerNode('delay')->defaultValue(1000)->min(0)->info('Time in ms to delay (or the initial value when multiplier is used)')->end()
-                                            ->floatNode('multiplier')->defaultValue(2)->min(1)->info('If greater than 1, delay will grow exponentially for each retry: this delay = (delay * (multiple ^ retries))')->end()
-                                            ->integerNode('max_delay')->defaultValue(0)->min(0)->info('Max time in ms that a retry should ever be delayed (0 = infinite)')->end()
+                                            ->integerNode('delay')->defaultValue(1000)->min(0)->info('Time in ms to delay (or the initial value when multiplier is used).')->end()
+                                            ->floatNode('multiplier')->defaultValue(2)->min(1)->info('If greater than 1, delay will grow exponentially for each retry: this delay = (delay * (multiple ^ retries)).')->end()
+                                            ->integerNode('max_delay')->defaultValue(0)->min(0)->info('Max time in ms that a retry should ever be delayed (0 = infinite).')->end()
+                                            ->floatNode('jitter')->defaultValue(0.1)->min(0)->max(1)->info('Randomness to apply to the delay (between 0 and 1).')->end()
                                         ->end()
                                     ->end()
                                     ->scalarNode('rate_limiter')
                                         ->defaultNull()
-                                        ->info('Rate limiter name to use when processing messages')
+                                        ->info('Rate limiter name to use when processing messages.')
                                     ->end()
                                 ->end()
                             ->end()
@@ -1715,15 +1663,6 @@ function ($a) {
                             ->defaultNull()
                             ->info('Transport name to send failed messages to (after all retries have failed).')
                         ->end()
-                        ->booleanNode('reset_on_message')
-                            ->defaultTrue()
-                            ->info('Reset container services after each message.')
-                            ->setDeprecated('symfony/framework-bundle', '6.1', 'Option "%node%" at "%path%" is deprecated. It does nothing and will be removed in version 7.0.')
-                            ->validate()
-                                ->ifTrue(fn ($v) => true !== $v)
-                                ->thenInvalid('The "framework.messenger.reset_on_message" configuration option can be set to "true" only. To prevent services resetting after each message you can set the "--no-reset" option in "messenger:consume" command.')
-                            ->end()
-                        ->end()
                         ->arrayNode('stop_worker_on_signals')
                             ->defaultValue([])
                             ->info('A list of signals that should stop the worker; defaults to SIGTERM and SIGINT.')
@@ -1834,17 +1773,32 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                     ->fixXmlConfig('scoped_client')
                     ->beforeNormalization()
                         ->always(function ($config) {
-                            if (empty($config['scoped_clients']) || !\is_array($config['default_options']['retry_failed'] ?? null)) {
+                            if (empty($config['scoped_clients'])) {
+                                return $config;
+                            }
+
+                            $hasDefaultRateLimiter = isset($config['default_options']['rate_limiter']);
+                            $hasDefaultRetryFailed = \is_array($config['default_options']['retry_failed'] ?? null);
+
+                            if (!$hasDefaultRateLimiter && !$hasDefaultRetryFailed) {
                                 return $config;
                             }
 
                             foreach ($config['scoped_clients'] as &$scopedConfig) {
-                                if (!isset($scopedConfig['retry_failed']) || true === $scopedConfig['retry_failed']) {
-                                    $scopedConfig['retry_failed'] = $config['default_options']['retry_failed'];
-                                    continue;
+                                if ($hasDefaultRateLimiter) {
+                                    if (!isset($scopedConfig['rate_limiter']) || true === $scopedConfig['rate_limiter']) {
+                                        $scopedConfig['rate_limiter'] = $config['default_options']['rate_limiter'];
+                                    } elseif (false === $scopedConfig['rate_limiter']) {
+                                        $scopedConfig['rate_limiter'] = null;
+                                    }
                                 }
-                                if (\is_array($scopedConfig['retry_failed'])) {
-                                    $scopedConfig['retry_failed'] += $config['default_options']['retry_failed'];
+
+                                if ($hasDefaultRetryFailed) {
+                                    if (!isset($scopedConfig['retry_failed']) || true === $scopedConfig['retry_failed']) {
+                                        $scopedConfig['retry_failed'] = $config['default_options']['retry_failed'];
+                                    } elseif (\is_array($scopedConfig['retry_failed'])) {
+                                        $scopedConfig['retry_failed'] += $config['default_options']['retry_failed'];
+                                    }
                                 }
                             }
 
@@ -1945,10 +1899,14 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                                     ->info('The minimum version of TLS to accept; must be one of STREAM_CRYPTO_METHOD_TLSv*_CLIENT constants.')
                                 ->end()
                                 ->arrayNode('extra')
-                                    ->info('Extra options for specific HTTP client')
+                                    ->info('Extra options for specific HTTP client.')
                                     ->normalizeKeys(false)
                                     ->variablePrototype()->end()
                                 ->end()
+                                ->scalarNode('rate_limiter')
+                                    ->defaultNull()
+                                    ->info('Rate limiter name to use for throttling requests.')
+                                ->end()
                                 ->append($this->createHttpClientRetrySection())
                             ->end()
                         ->end()
@@ -2081,7 +2039,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                                         ->info('The passphrase used to encrypt the "local_pk" file.')
                                     ->end()
                                     ->scalarNode('ciphers')
-                                        ->info('A list of TLS ciphers separated by colons, commas or spaces (e.g. "RC3-SHA:TLS13-AES-128-GCM-SHA256"...)')
+                                        ->info('A list of TLS ciphers separated by colons, commas or spaces (e.g. "RC3-SHA:TLS13-AES-128-GCM-SHA256"...).')
                                     ->end()
                                     ->arrayNode('peer_fingerprint')
                                         ->info('Associative array: hashing algorithm => hash(es).')
@@ -2096,10 +2054,14 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode, callable $e
                                         ->info('The minimum version of TLS to accept; must be one of STREAM_CRYPTO_METHOD_TLSv*_CLIENT constants.')
                                     ->end()
                                     ->arrayNode('extra')
-                                        ->info('Extra options for specific HTTP client')
+                                        ->info('Extra options for specific HTTP client.')
                                         ->normalizeKeys(false)
                                         ->variablePrototype()->end()
                                     ->end()
+                                    ->scalarNode('rate_limiter')
+                                        ->defaultNull()
+                                        ->info('Rate limiter name to use for throttling requests.')
+                                    ->end()
                                     ->append($this->createHttpClientRetrySection())
                                 ->end()
                             ->end()
@@ -2129,7 +2091,7 @@ private function createHttpClientRetrySection(): ArrayNodeDefinition
                     })
                 ->end()
                 ->children()
-                    ->scalarNode('retry_strategy')->defaultNull()->info('service id to override the retry strategy')->end()
+                    ->scalarNode('retry_strategy')->defaultNull()->info('service id to override the retry strategy.')->end()
                     ->arrayNode('http_codes')
                         ->performNoDeepMerging()
                         ->beforeNormalization()
@@ -2164,17 +2126,17 @@ private function createHttpClientRetrySection(): ArrayNodeDefinition
                                         ->then(fn ($v) => array_map('strtoupper', $v))
                                     ->end()
                                     ->prototype('scalar')->end()
-                                    ->info('A list of HTTP methods that triggers a retry for this status code. When empty, all methods are retried')
+                                    ->info('A list of HTTP methods that triggers a retry for this status code. When empty, all methods are retried.')
                                 ->end()
                             ->end()
                         ->end()
-                        ->info('A list of HTTP status code that triggers a retry')
+                        ->info('A list of HTTP status code that triggers a retry.')
                     ->end()
                     ->integerNode('max_retries')->defaultValue(3)->min(0)->end()
-                    ->integerNode('delay')->defaultValue(1000)->min(0)->info('Time in ms to delay (or the initial value when multiplier is used)')->end()
-                    ->floatNode('multiplier')->defaultValue(2)->min(1)->info('If greater than 1, delay will grow exponentially for each retry: delay * (multiple ^ retries)')->end()
-                    ->integerNode('max_delay')->defaultValue(0)->min(0)->info('Max time in ms that a retry should ever be delayed (0 = infinite)')->end()
-                    ->floatNode('jitter')->defaultValue(0.1)->min(0)->max(1)->info('Randomness in percent (between 0 and 1) to apply to the delay')->end()
+                    ->integerNode('delay')->defaultValue(1000)->min(0)->info('Time in ms to delay (or the initial value when multiplier is used).')->end()
+                    ->floatNode('multiplier')->defaultValue(2)->min(1)->info('If greater than 1, delay will grow exponentially for each retry: delay * (multiple ^ retries).')->end()
+                    ->integerNode('max_delay')->defaultValue(0)->min(0)->info('Max time in ms that a retry should ever be delayed (0 = infinite).')->end()
+                    ->floatNode('jitter')->defaultValue(0.1)->min(0)->max(1)->info('Randomness in percent (between 0 and 1) to apply to the delay.')->end()
                 ->end()
         ;
     }
@@ -2202,12 +2164,23 @@ private function addMailerSection(ArrayNodeDefinition $rootNode, callable $enabl
                         ->arrayNode('envelope')
                             ->info('Mailer Envelope configuration')
                             ->fixXmlConfig('recipient')
+                            ->fixXmlConfig('allowed_recipient')
                             ->children()
                                 ->scalarNode('sender')->end()
                                 ->arrayNode('recipients')
                                     ->performNoDeepMerging()
                                     ->beforeNormalization()
-                                    ->ifArray()
+                                        ->ifArray()
+                                        ->then(fn ($v) => array_filter(array_values($v)))
+                                    ->end()
+                                    ->prototype('scalar')->end()
+                                ->end()
+                                ->arrayNode('allowed_recipients')
+                                    ->info('A list of regular expressions that allow recipients when "recipients" option is defined.')
+                                    ->example(['.*@example\.com'])
+                                    ->performNoDeepMerging()
+                                    ->beforeNormalization()
+                                        ->ifArray()
                                         ->then(fn ($v) => array_filter(array_values($v)))
                                     ->end()
                                     ->prototype('scalar')->end()
@@ -2265,7 +2238,7 @@ private function addNotifierSection(ArrayNodeDefinition $rootNode, callable $ena
                         ->arrayNode('channel_policy')
                             ->useAttributeAsKey('name')
                             ->prototype('array')
-                                ->beforeNormalization()->ifString()->then(fn ($v) => [$v])->end()
+                                ->beforeNormalization()->castToArray()->end()
                                 ->prototype('scalar')->end()
                             ->end()
                         ->end()
@@ -2354,35 +2327,35 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $
                             ->arrayPrototype()
                                 ->children()
                                     ->scalarNode('lock_factory')
-                                        ->info('The service ID of the lock factory used by this limiter (or null to disable locking)')
+                                        ->info('The service ID of the lock factory used by this limiter (or null to disable locking).')
                                         ->defaultValue('lock.factory')
                                     ->end()
                                     ->scalarNode('cache_pool')
-                                        ->info('The cache pool to use for storing the current limiter state')
+                                        ->info('The cache pool to use for storing the current limiter state.')
                                         ->defaultValue('cache.rate_limiter')
                                     ->end()
                                     ->scalarNode('storage_service')
-                                        ->info('The service ID of a custom storage implementation, this precedes any configured "cache_pool"')
+                                        ->info('The service ID of a custom storage implementation, this precedes any configured "cache_pool".')
                                         ->defaultNull()
                                     ->end()
                                     ->enumNode('policy')
-                                        ->info('The algorithm to be used by this limiter')
+                                        ->info('The algorithm to be used by this limiter.')
                                         ->isRequired()
                                         ->values(['fixed_window', 'token_bucket', 'sliding_window', 'no_limit'])
                                     ->end()
                                     ->integerNode('limit')
-                                        ->info('The maximum allowed hits in a fixed interval or burst')
+                                        ->info('The maximum allowed hits in a fixed interval or burst.')
                                     ->end()
                                     ->scalarNode('interval')
                                         ->info('Configures the fixed interval if "policy" is set to "fixed_window" or "sliding_window". The value must be a number followed by "second", "minute", "hour", "day", "week" or "month" (or their plural equivalent).')
                                     ->end()
                                     ->arrayNode('rate')
-                                        ->info('Configures the fill rate if "policy" is set to "token_bucket"')
+                                        ->info('Configures the fill rate if "policy" is set to "token_bucket".')
                                         ->children()
                                             ->scalarNode('interval')
                                                 ->info('Configures the rate interval. The value must be a number followed by "second", "minute", "hour", "day", "week" or "month" (or their plural equivalent).')
                                             ->end()
-                                            ->integerNode('amount')->info('Amount of tokens to add each interval')->defaultValue(1)->end()
+                                            ->integerNode('amount')->info('Amount of tokens to add each interval.')->defaultValue(1)->end()
                                         ->end()
                                     ->end()
                                 ->end()
@@ -2401,23 +2374,6 @@ private function addRateLimiterSection(ArrayNodeDefinition $rootNode, callable $
     private function addUidSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone): void
     {
         $rootNode
-            ->validate()
-                ->always(function ($v) {
-                    if ($v['uid']['enabled']) {
-                        if (!\array_key_exists('default_uuid_version', $v['uid'])) {
-                            trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.uid.default_uuid_version" config option is deprecated. It will default to "7" in 7.0.');
-                        }
-
-                        if (!\array_key_exists('time_based_uuid_version', $v['uid'])) {
-                            trigger_deprecation('symfony/framework-bundle', '6.4', 'Not setting the "framework.uid.time_based_uuid_version" config option is deprecated. It will default to "7" in 7.0.');
-                        }
-                    }
-
-                    $v['uid'] += ['default_uuid_version' => 6, 'time_based_uuid_version' => 6];
-
-                    return $v;
-                })
-            ->end()
             ->children()
                 ->arrayNode('uid')
                     ->info('Uid configuration')
@@ -2426,6 +2382,7 @@ private function addUidSection(ArrayNodeDefinition $rootNode, callable $enableIf
                     ->children()
                         ->enumNode('default_uuid_version')
                             ->values([7, 6, 4, 1])
+                            ->defaultValue(7)
                         ->end()
                         ->enumNode('name_based_uuid_version')
                             ->defaultValue(5)
@@ -2436,6 +2393,7 @@ private function addUidSection(ArrayNodeDefinition $rootNode, callable $enableIf
                         ->end()
                         ->enumNode('time_based_uuid_version')
                             ->values([7, 6, 1])
+                            ->defaultValue(7)
                         ->end()
                         ->scalarNode('time_based_uuid_node')
                             ->cannotBeEmpty()
@@ -2496,18 +2454,12 @@ private function addHtmlSanitizerSection(ArrayNodeDefinition $rootNode, callable
                                     ->end()
                                     ->arrayNode('block_elements')
                                         ->info('Configures elements as blocked. Blocked elements are elements the sanitizer should remove from the input, but retain their children.')
-                                        ->beforeNormalization()
-                                            ->ifString()
-                                            ->then(fn (string $n): array => (array) $n)
-                                        ->end()
+                                        ->beforeNormalization()->castToArray()->end()
                                         ->scalarPrototype()->end()
                                     ->end()
                                     ->arrayNode('drop_elements')
                                         ->info('Configures elements as dropped. Dropped elements are elements the sanitizer should remove from the input, including their children.')
-                                        ->beforeNormalization()
-                                            ->ifString()
-                                            ->then(fn (string $n): array => (array) $n)
-                                        ->end()
+                                        ->beforeNormalization()->castToArray()->end()
                                         ->scalarPrototype()->end()
                                     ->end()
                                     ->arrayNode('allow_attributes')
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
index f585b5bbb..3c4e4f9f3 100644
--- a/DependencyInjection/FrameworkExtension.php
+++ b/DependencyInjection/FrameworkExtension.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection;
 
 use Composer\InstalledVersions;
-use Doctrine\Common\Annotations\Reader;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 use phpDocumentor\Reflection\DocBlockFactoryInterface;
@@ -54,7 +53,7 @@
 use Symfony\Component\Console\Debug\CliRequest;
 use Symfony\Component\Console\Messenger\RunCommandMessageHandler;
 use Symfony\Component\DependencyInjection\Alias;
-use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -72,6 +71,7 @@
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\Glob;
 use Symfony\Component\Form\Extension\HtmlSanitizer\Type\TextTypeHtmlSanitizerExtension;
@@ -87,13 +87,13 @@
 use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
 use Symfony\Component\HttpClient\RetryableHttpClient;
 use Symfony\Component\HttpClient\ScopingHttpClient;
+use Symfony\Component\HttpClient\ThrottlingHttpClient;
 use Symfony\Component\HttpClient\UriTemplateHttpClient;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Attribute\AsController;
 use Symfony\Component\HttpKernel\Attribute\AsTargetedValueResolver;
 use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
-use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
 use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -109,9 +109,7 @@
 use Symfony\Component\Mercure\HubRegistry;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 use Symfony\Component\Messenger\Bridge as MessengerBridge;
-use Symfony\Component\Messenger\EventListener\StopWorkerOnSignalsListener;
 use Symfony\Component\Messenger\Handler\BatchHandlerInterface;
-use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Symfony\Component\Messenger\MessageBus;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Middleware\RouterContextMiddleware;
@@ -146,7 +144,6 @@
 use Symfony\Component\RateLimiter\Storage\CacheStorage;
 use Symfony\Component\RemoteEvent\Attribute\AsRemoteEventConsumer;
 use Symfony\Component\RemoteEvent\RemoteEvent;
-use Symfony\Component\Routing\Loader\AttributeClassLoader;
 use Symfony\Component\Scheduler\Attribute\AsCronTask;
 use Symfony\Component\Scheduler\Attribute\AsPeriodicTask;
 use Symfony\Component\Scheduler\Attribute\AsSchedule;
@@ -163,6 +160,7 @@
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
 use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
+use Symfony\Component\Serializer\NameConverter\SnakeCaseToCamelCaseNameConverter;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Serializer;
@@ -170,11 +168,15 @@
 use Symfony\Component\String\LazyString;
 use Symfony\Component\String\Slugger\SluggerInterface;
 use Symfony\Component\Translation\Bridge as TranslationBridge;
+use Symfony\Component\Translation\Command\TranslationLintCommand as BaseTranslationLintCommand;
 use Symfony\Component\Translation\Command\XliffLintCommand as BaseXliffLintCommand;
 use Symfony\Component\Translation\Extractor\PhpAstExtractor;
 use Symfony\Component\Translation\LocaleSwitcher;
 use Symfony\Component\Translation\PseudoLocalizationTranslator;
 use Symfony\Component\Translation\Translator;
+use Symfony\Component\TypeInfo\Type;
+use Symfony\Component\TypeInfo\TypeResolver\PhpDocAwareReflectionTypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\StringTypeResolver;
 use Symfony\Component\Uid\Factory\UuidFactory;
 use Symfony\Component\Uid\UuidV4;
 use Symfony\Component\Validator\Constraints\ExpressionLanguageProvider;
@@ -183,7 +185,6 @@
 use Symfony\Component\Validator\Mapping\Loader\PropertyInfoLoader;
 use Symfony\Component\Validator\ObjectInitializerInterface;
 use Symfony\Component\Validator\Validation;
-use Symfony\Component\Validator\ValidatorBuilder;
 use Symfony\Component\Webhook\Controller\WebhookController;
 use Symfony\Component\WebLink\HttpHeaderSerializer;
 use Symfony\Component\Workflow;
@@ -210,16 +211,18 @@ class FrameworkExtension extends Extension
     /**
      * Responds to the app.config configuration parameter.
      *
-     * @return void
-     *
      * @throws LogicException
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
 
         if (class_exists(InstalledVersions::class) && InstalledVersions::isInstalled('symfony/symfony') && 'symfony/symfony' !== (InstalledVersions::getRootPackage()['name'] ?? '')) {
-            trigger_deprecation('symfony/symfony', '6.1', 'Requiring the "symfony/symfony" package is deprecated; replace it with standalone components instead.');
+            throw new \LogicException('Requiring the "symfony/symfony" package is unsupported; replace it with standalone components instead.');
+        }
+
+        if (!ContainerBuilder::willBeAvailable('symfony/validator', Validation::class, ['symfony/framework-bundle', 'symfony/form'])) {
+            $container->setParameter('validator.translation_domain', 'validators');
         }
 
         $loader->load('web.php');
@@ -251,6 +254,10 @@ public function load(array $configs, ContainerBuilder $container)
                 $container->removeDefinition('console.command.yaml_lint');
             }
 
+            if (!class_exists(BaseTranslationLintCommand::class)) {
+                $container->removeDefinition('console.command.translation_lint');
+            }
+
             if (!class_exists(DebugCommand::class)) {
                 $container->removeDefinition('console.command.dotenv_debug');
             }
@@ -268,7 +275,6 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         // warmup config enabled
-        $this->readConfigEnabled('annotations', $container, $config['annotations']);
         $this->readConfigEnabled('translator', $container, $config['translator']);
         $this->readConfigEnabled('property_access', $container, $config['property_access']);
         $this->readConfigEnabled('profiler', $container, $config['profiler']);
@@ -306,20 +312,28 @@ public function load(array $configs, ContainerBuilder $container)
             }
         }
 
+        $emptySecretHint = '"framework.secret" option';
         if (isset($config['secret'])) {
             $container->setParameter('kernel.secret', $config['secret']);
+            $usedEnvs = [];
+            $container->resolveEnvPlaceholders($config['secret'], null, $usedEnvs);
+
+            if ($usedEnvs) {
+                $emptySecretHint = \sprintf('"%s" env var%s', implode('", "', $usedEnvs), 1 === \count($usedEnvs) ? '' : 's');
+            }
         }
+        $container->parameterCannotBeEmpty('kernel.secret', 'A non-empty value for the parameter "kernel.secret" is required. Did you forget to configure the '.$emptySecretHint.'?');
 
         $container->setParameter('kernel.http_method_override', $config['http_method_override']);
         $container->setParameter('kernel.trust_x_sendfile_type_header', $config['trust_x_sendfile_type_header']);
-        $container->setParameter('kernel.trusted_hosts', $config['trusted_hosts']);
+        $container->setParameter('kernel.trusted_hosts', [0] === array_keys($config['trusted_hosts']) ? $config['trusted_hosts'][0] : $config['trusted_hosts']);
         $container->setParameter('kernel.default_locale', $config['default_locale']);
         $container->setParameter('kernel.enabled_locales', $config['enabled_locales']);
         $container->setParameter('kernel.error_controller', $config['error_controller']);
 
         if (($config['trusted_proxies'] ?? false) && ($config['trusted_headers'] ?? false)) {
-            $container->setParameter('kernel.trusted_proxies', $config['trusted_proxies']);
-            $container->setParameter('kernel.trusted_headers', $this->resolveTrustedHeaders($config['trusted_headers']));
+            $container->setParameter('kernel.trusted_proxies', \is_array($config['trusted_proxies']) && [0] === array_keys($config['trusted_proxies']) ? $config['trusted_proxies'][0] : $config['trusted_proxies']);
+            $container->setParameter('kernel.trusted_headers', [0] === array_keys($config['trusted_headers']) ? $config['trusted_headers'][0] : $config['trusted_headers']);
         }
 
         if (!$container->hasParameter('debug.file_link_format')) {
@@ -357,6 +371,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($this->readConfigEnabled('http_client', $container, $config['http_client'])) {
+            $this->readConfigEnabled('rate_limiter', $container, $config['rate_limiter']); // makes sure that isInitializedConfigEnabled() will work
             $this->registerHttpClientConfiguration($config['http_client'], $container, $loader);
         }
 
@@ -377,9 +392,8 @@ public function load(array $configs, ContainerBuilder $container)
         $this->registerWorkflowConfiguration($config['workflows'], $container, $loader);
         $this->registerDebugConfiguration($config['php_errors'], $container, $loader);
         $this->registerRouterConfiguration($config['router'], $container, $loader, $config['enabled_locales']);
-        $this->registerAnnotationsConfiguration($config['annotations'], $container, $loader);
         $this->registerPropertyAccessConfiguration($config['property_access'], $container, $loader);
-        $this->registerSecretsConfiguration($config['secrets'], $container, $loader);
+        $this->registerSecretsConfiguration($config['secrets'], $container, $loader, $config['secret'] ?? null);
 
         $container->getDefinition('exception_listener')->replaceArgument(3, $config['exceptions']);
 
@@ -401,6 +415,10 @@ public function load(array $configs, ContainerBuilder $container)
             $container->removeDefinition('console.command.serializer_debug');
         }
 
+        if ($this->readConfigEnabled('type_info', $container, $config['type_info'])) {
+            $this->registerTypeInfoConfiguration($container, $loader);
+        }
+
         if ($propertyInfoEnabled) {
             $this->registerPropertyInfoConfiguration($container, $loader);
         }
@@ -457,9 +475,9 @@ public function load(array $configs, ContainerBuilder $container)
             $container->removeDefinition('test.session.listener');
         }
 
-        // csrf depends on session being registered
+        // csrf depends on session or stateless token ids being registered
         if (null === $config['csrf_protection']['enabled']) {
-            $this->writeConfigEnabled('csrf_protection', $this->readConfigEnabled('session', $container, $config['session']) && !class_exists(FullStack::class) && ContainerBuilder::willBeAvailable('symfony/security-csrf', CsrfTokenManagerInterface::class, ['symfony/framework-bundle']), $config['csrf_protection']);
+            $this->writeConfigEnabled('csrf_protection', ($config['csrf_protection']['stateless_token_ids'] || $this->readConfigEnabled('session', $container, $config['session'])) && !class_exists(FullStack::class) && ContainerBuilder::willBeAvailable('symfony/security-csrf', CsrfTokenManagerInterface::class, ['symfony/framework-bundle']), $config['csrf_protection']);
         }
         $this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);
 
@@ -474,8 +492,6 @@ public function load(array $configs, ContainerBuilder $container)
             if (ContainerBuilder::willBeAvailable('symfony/validator', Validation::class, ['symfony/framework-bundle', 'symfony/form'])) {
                 $this->writeConfigEnabled('validation', true, $config['validation']);
             } else {
-                $container->setParameter('validator.translation_domain', 'validators');
-
                 $container->removeDefinition('form.type_extension.form.validator');
                 $container->removeDefinition('form.type_guesser.validator');
             }
@@ -495,7 +511,7 @@ public function load(array $configs, ContainerBuilder $container)
             if (!$messengerEnabled) {
                 throw new LogicException('Scheduler support cannot be enabled as the Messenger component is not '.(interface_exists(MessageBusInterface::class) ? 'enabled.' : 'installed. Try running "composer require symfony/messenger".'));
             }
-            $this->registerSchedulerConfiguration($config['scheduler'], $container, $loader);
+            $this->registerSchedulerConfiguration($container, $loader);
         } else {
             $container->removeDefinition('cache.scheduler');
             $container->removeDefinition('console.command.scheduler_debug');
@@ -545,9 +561,9 @@ public function load(array $configs, ContainerBuilder $container)
         $this->registerProfilerConfiguration($config['profiler'], $container, $loader);
 
         if ($this->readConfigEnabled('webhook', $container, $config['webhook'])) {
-            $this->registerWebhookConfiguration($config['webhook'], $container, $loader);
+            $this->registerWebhookConfiguration($config['webhook'], $container, $loader, $this->readConfigEnabled('serializer', $container, $config['serializer']));
 
-            // If Webhook is installed but the HttpClient or Serializer components are not available, we should throw an error
+            // If Webhook is installed but the HttpClient component is not available, we should throw an error
             if (!$this->readConfigEnabled('http_client', $container, $config['http_client'])) {
                 $container->getDefinition('webhook.transport')
                     ->setArguments([])
@@ -556,18 +572,10 @@ public function load(array $configs, ContainerBuilder $container)
                     )
                     ->addTag('container.error');
             }
-            if (!$this->readConfigEnabled('serializer', $container, $config['serializer'])) {
-                $container->getDefinition('webhook.body_configurator.json')
-                    ->setArguments([])
-                    ->addError('You cannot use the "webhook transport" service since the Serializer component is not '
-                        .(class_exists(Serializer::class) ? 'enabled. Try setting "framework.serializer.enabled" to true.' : 'installed. Try running "composer require symfony/serializer-pack".')
-                    )
-                    ->addTag('container.error');
-            }
         }
 
         if ($this->readConfigEnabled('remote-event', $container, $config['remote-event'])) {
-            $this->registerRemoteEventConfiguration($config['remote-event'], $container, $loader);
+            $this->registerRemoteEventConfiguration($loader);
         }
 
         if ($this->readConfigEnabled('html_sanitizer', $container, $config['html_sanitizer'])) {
@@ -578,14 +586,6 @@ public function load(array $configs, ContainerBuilder $container)
             $this->registerHtmlSanitizerConfiguration($config['html_sanitizer'], $container, $loader);
         }
 
-        $this->addAnnotatedClassesToCompile([
-            '**\\Controller\\',
-            '**\\Entity\\',
-
-            // Added explicitly so that we don't rely on the class map being dumped to make it work
-            AbstractController::class,
-        ]);
-
         if (ContainerBuilder::willBeAvailable('symfony/mime', MimeTypes::class, ['symfony/framework-bundle'])) {
             $loader->load('mime_type.php');
         }
@@ -608,8 +608,6 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('container.service_locator');
         $container->registerForAutoconfiguration(ServiceSubscriberInterface::class)
             ->addTag('container.service_subscriber');
-        $container->registerForAutoconfiguration(ArgumentValueResolverInterface::class)
-            ->addTag('controller.argument_value_resolver');
         $container->registerForAutoconfiguration(ValueResolverInterface::class)
             ->addTag('controller.argument_value_resolver');
         $container->registerForAutoconfiguration(AbstractController::class)
@@ -617,7 +615,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->registerForAutoconfiguration(DataCollectorInterface::class)
             ->addTag('data_collector');
         $container->registerForAutoconfiguration(FormTypeInterface::class)
-            ->addTag('form.type');
+            ->addTag('form.type', ['csrf_token_id' => '%.form.type_extension.csrf.token_id%']);
         $container->registerForAutoconfiguration(FormTypeGuesserInterface::class)
             ->addTag('form.type_guesser');
         $container->registerForAutoconfiguration(FormTypeExtensionInterface::class)
@@ -664,8 +662,6 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('validator.group_provider');
         $container->registerForAutoconfiguration(ObjectInitializerInterface::class)
             ->addTag('validator.initializer');
-        $container->registerForAutoconfiguration(MessageHandlerInterface::class)
-            ->addTag('messenger.message_handler');
         $container->registerForAutoconfiguration(BatchHandlerInterface::class)
             ->addTag('messenger.message_handler');
         $container->registerForAutoconfiguration(MessengerTransportFactoryInterface::class)
@@ -679,7 +675,7 @@ public function load(array $configs, ContainerBuilder $container)
             $tagAttributes = get_object_vars($attribute);
             if ($reflector instanceof \ReflectionMethod) {
                 if (isset($tagAttributes['method'])) {
-                    throw new LogicException(sprintf('AsEventListener attribute cannot declare a method on "%s::%s()".', $reflector->class, $reflector->name));
+                    throw new LogicException(\sprintf('AsEventListener attribute cannot declare a method on "%s::%s()".', $reflector->class, $reflector->name));
                 }
                 $tagAttributes['method'] = $reflector->getName();
             }
@@ -697,7 +693,7 @@ public function load(array $configs, ContainerBuilder $container)
             unset($tagAttributes['fromTransport']);
             if ($reflector instanceof \ReflectionMethod) {
                 if (isset($tagAttributes['method'])) {
-                    throw new LogicException(sprintf('AsMessageHandler attribute cannot declare a method on "%s::%s()".', $reflector->class, $reflector->name));
+                    throw new LogicException(\sprintf('AsMessageHandler attribute cannot declare a method on "%s::%s()".', $reflector->class, $reflector->name));
                 }
                 $tagAttributes['method'] = $reflector->getName();
             }
@@ -714,14 +710,14 @@ public function load(array $configs, ContainerBuilder $container)
                 $taskAttributeClass,
                 static function (ChildDefinition $definition, AsPeriodicTask|AsCronTask $attribute, \ReflectionClass|\ReflectionMethod $reflector): void {
                     $tagAttributes = get_object_vars($attribute) + [
-                        'trigger' => match ($attribute::class) {
-                            AsPeriodicTask::class => 'every',
-                            AsCronTask::class => 'cron',
+                        'trigger' => match (true) {
+                            $attribute instanceof AsPeriodicTask => 'every',
+                            $attribute instanceof AsCronTask => 'cron',
                         },
                     ];
                     if ($reflector instanceof \ReflectionMethod) {
                         if (isset($tagAttributes['method'])) {
-                            throw new LogicException(sprintf('"%s" attribute cannot declare a method on "%s::%s()".', $attribute::class, $reflector->class, $reflector->name));
+                            throw new LogicException(\sprintf('"%s" attribute cannot declare a method on "%s::%s()".', $attribute::class, $reflector->class, $reflector->name));
                         }
                         $tagAttributes['method'] = $reflector->getName();
                     }
@@ -735,7 +731,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');
         }
 
@@ -743,7 +739,6 @@ static function (ChildDefinition $definition, AsPeriodicTask|AsCronTask $attribu
             ->addTag('routing.route_loader');
 
         $container->setParameter('container.behavior_describing_tags', [
-            'annotations.cached_reader',
             'container.do_not_inline',
             'container.service_locator',
             'container.service_subscriber',
@@ -781,6 +776,8 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
 
             $container->setParameter('form.type_extension.csrf.enabled', true);
             $container->setParameter('form.type_extension.csrf.field_name', $config['form']['csrf_protection']['field_name']);
+            $container->setParameter('form.type_extension.csrf.field_attr', $config['form']['csrf_protection']['field_attr']);
+            $container->setParameter('.form.type_extension.csrf.token_id', $config['form']['csrf_protection']['token_id']);
         } else {
             $container->setParameter('form.type_extension.csrf.enabled', false);
         }
@@ -908,7 +905,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
         // Choose storage class based on the DSN
         [$class] = explode(':', $config['dsn'], 2);
         if ('file' !== $class) {
-            throw new \LogicException(sprintf('Driver "%s" is not supported for the profiler.', $class));
+            throw new \LogicException(\sprintf('Driver "%s" is not supported for the profiler.', $class));
         }
 
         $container->setParameter('profiler.storage.dsn', $config['dsn']);
@@ -947,7 +944,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
 
         foreach ($config['workflows'] as $name => $workflow) {
             $type = $workflow['type'];
-            $workflowId = sprintf('%s.%s', $type, $name);
+            $workflowId = \sprintf('%s.%s', $type, $name);
 
             // Process Metadata (workflow + places (transition is done in the "create transition" block))
             $metadataStoreDefinition = new Definition(Workflow\Metadata\InMemoryMetadataStore::class, [[], [], null]);
@@ -973,14 +970,14 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             foreach ($workflow['transitions'] as $transition) {
                 if ('workflow' === $type) {
                     $transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $transition['from'], $transition['to']]);
-                    $transitionId = sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
+                    $transitionId = \sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
                     $container->setDefinition($transitionId, $transitionDefinition);
                     $transitions[] = new Reference($transitionId);
                     if (isset($transition['guard'])) {
                         $configuration = new Definition(Workflow\EventListener\GuardExpression::class);
                         $configuration->addArgument(new Reference($transitionId));
                         $configuration->addArgument($transition['guard']);
-                        $eventName = sprintf('workflow.%s.guard.%s', $name, $transition['name']);
+                        $eventName = \sprintf('workflow.%s.guard.%s', $name, $transition['name']);
                         $guardsConfiguration[$eventName][] = $configuration;
                     }
                     if ($transition['metadata']) {
@@ -993,14 +990,14 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                     foreach ($transition['from'] as $from) {
                         foreach ($transition['to'] as $to) {
                             $transitionDefinition = new Definition(Workflow\Transition::class, [$transition['name'], $from, $to]);
-                            $transitionId = sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
+                            $transitionId = \sprintf('.%s.transition.%s', $workflowId, $transitionCounter++);
                             $container->setDefinition($transitionId, $transitionDefinition);
                             $transitions[] = new Reference($transitionId);
                             if (isset($transition['guard'])) {
                                 $configuration = new Definition(Workflow\EventListener\GuardExpression::class);
                                 $configuration->addArgument(new Reference($transitionId));
                                 $configuration->addArgument($transition['guard']);
-                                $eventName = sprintf('workflow.%s.guard.%s', $name, $transition['name']);
+                                $eventName = \sprintf('workflow.%s.guard.%s', $name, $transition['name']);
                                 $guardsConfiguration[$eventName][] = $configuration;
                             }
                             if ($transition['metadata']) {
@@ -1014,7 +1011,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                 }
             }
             $metadataStoreDefinition->replaceArgument(2, $transitionsMetadataDefinition);
-            $container->setDefinition(sprintf('%s.metadata_store', $workflowId), $metadataStoreDefinition);
+            $container->setDefinition(\sprintf('%s.metadata_store', $workflowId), $metadataStoreDefinition);
 
             // Create places
             $places = array_column($workflow['places'], 'name');
@@ -1025,7 +1022,7 @@ 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(\sprintf('%s.metadata_store', $workflowId)));
 
             // Create MarkingStore
             $markingStoreDefinition = null;
@@ -1040,13 +1037,13 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             }
 
             // Create Workflow
-            $workflowDefinition = new ChildDefinition(sprintf('%s.abstract', $type));
-            $workflowDefinition->replaceArgument(0, new Reference(sprintf('%s.definition', $workflowId)));
+            $workflowDefinition = new ChildDefinition(\sprintf('%s.abstract', $type));
+            $workflowDefinition->replaceArgument(0, new Reference(\sprintf('%s.definition', $workflowId)));
             $workflowDefinition->replaceArgument(1, $markingStoreDefinition);
             $workflowDefinition->replaceArgument(3, $name);
             $workflowDefinition->replaceArgument(4, $workflow['events_to_dispatch']);
 
-            $workflowDefinition->addTag('workflow', ['name' => $name]);
+            $workflowDefinition->addTag('workflow', ['name' => $name, 'metadata' => $workflow['metadata']]);
             if ('workflow' === $type) {
                 $workflowDefinition->addTag('workflow.workflow', ['name' => $name]);
             } elseif ('state_machine' === $type) {
@@ -1055,7 +1052,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
 
             // Store to container
             $container->setDefinition($workflowId, $workflowDefinition);
-            $container->setDefinition(sprintf('%s.definition', $workflowId), $definitionDefinition);
+            $container->setDefinition(\sprintf('%s.definition', $workflowId), $definitionDefinition);
             $container->registerAliasForArgument($workflowId, WorkflowInterface::class, $name.'.'.$type);
             $container->registerAliasForArgument($workflowId, WorkflowInterface::class, $name);
 
@@ -1084,11 +1081,11 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             if ($workflow['audit_trail']['enabled']) {
                 $listener = new Definition(Workflow\EventListener\AuditTrailListener::class);
                 $listener->addTag('monolog.logger', ['channel' => 'workflow']);
-                $listener->addTag('kernel.event_listener', ['event' => sprintf('workflow.%s.leave', $name), 'method' => 'onLeave']);
-                $listener->addTag('kernel.event_listener', ['event' => sprintf('workflow.%s.transition', $name), 'method' => 'onTransition']);
-                $listener->addTag('kernel.event_listener', ['event' => sprintf('workflow.%s.enter', $name), 'method' => 'onEnter']);
+                $listener->addTag('kernel.event_listener', ['event' => \sprintf('workflow.%s.leave', $name), 'method' => 'onLeave']);
+                $listener->addTag('kernel.event_listener', ['event' => \sprintf('workflow.%s.transition', $name), 'method' => 'onTransition']);
+                $listener->addTag('kernel.event_listener', ['event' => \sprintf('workflow.%s.enter', $name), 'method' => 'onEnter']);
                 $listener->addArgument(new Reference('logger'));
-                $container->setDefinition(sprintf('.%s.listener.audit_trail', $workflowId), $listener);
+                $container->setDefinition(\sprintf('.%s.listener.audit_trail', $workflowId), $listener);
             }
 
             // Add Guard Listener
@@ -1116,33 +1113,10 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                     $guard->addTag('kernel.event_listener', ['event' => $eventName, 'method' => 'onTransition']);
                 }
 
-                $container->setDefinition(sprintf('.%s.listener.guard', $workflowId), $guard);
+                $container->setDefinition(\sprintf('.%s.listener.guard', $workflowId), $guard);
                 $container->setParameter('workflow.has_guard_listeners', true);
             }
         }
-
-        $listenerAttributes = [
-            Workflow\Attribute\AsAnnounceListener::class,
-            Workflow\Attribute\AsCompletedListener::class,
-            Workflow\Attribute\AsEnterListener::class,
-            Workflow\Attribute\AsEnteredListener::class,
-            Workflow\Attribute\AsGuardListener::class,
-            Workflow\Attribute\AsLeaveListener::class,
-            Workflow\Attribute\AsTransitionListener::class,
-        ];
-
-        foreach ($listenerAttributes as $attribute) {
-            $container->registerAttributeForAutoconfiguration($attribute, static function (ChildDefinition $definition, AsEventListener $attribute, \ReflectionClass|\ReflectionMethod $reflector) {
-                $tagAttributes = get_object_vars($attribute);
-                if ($reflector instanceof \ReflectionMethod) {
-                    if (isset($tagAttributes['method'])) {
-                        throw new LogicException(sprintf('"%s" attribute cannot declare a method on "%s::%s()".', $attribute::class, $reflector->class, $reflector->name));
-                    }
-                    $tagAttributes['method'] = $reflector->getName();
-                }
-                $definition->addTag('kernel.event_listener', $tagAttributes);
-            });
-        }
     }
 
     private function registerDebugConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
@@ -1235,13 +1209,6 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
             $container->getDefinition('router.request_context')
                 ->replaceArgument(0, $config['default_uri']);
         }
-
-        if ($this->isInitializedConfigEnabled('annotations') && (new \ReflectionClass(AttributeClassLoader::class))->hasProperty('reader')) {
-            $container->getDefinition('routing.loader.attribute')->setArguments([
-                new Reference('annotation_reader'),
-                '%kernel.environment%',
-            ]);
-        }
     }
 
     private function registerSessionConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
@@ -1266,13 +1233,18 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
         $container->setParameter('session.storage.options', $options);
 
         // session handler (the internal callback registered with PHP session management)
-        if (null === $config['handler_id']) {
+        if (null === ($config['handler_id'] ?? $config['save_path'] ?? null)) {
             $config['save_path'] = null;
             $container->setAlias('session.handler', 'session.handler.native');
         } else {
+            $config['handler_id'] ??= 'session.handler.native_file';
+
+            if (!\array_key_exists('save_path', $config)) {
+                $config['save_path'] = '%kernel.cache_dir%/sessions';
+            }
             $container->resolveEnvPlaceholders($config['handler_id'], null, $usedEnvs);
 
-            if ($usedEnvs || preg_match('#^[a-z]++://#', $config['handler_id'])) {
+            if ($usedEnvs || str_contains($config['handler_id'], '://')) {
                 $id = '.cache_connection.'.ContainerBuilder::hash($config['handler_id']);
 
                 $container->getDefinition('session.abstract_handler')
@@ -1349,7 +1321,7 @@ private function registerAssetMapperConfiguration(array $config, ContainerBuilde
         $paths = $config['paths'];
         foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
             if ($container->fileExists($dir = $bundle['path'].'/Resources/public') || $container->fileExists($dir = $bundle['path'].'/public')) {
-                $paths[$dir] = sprintf('bundles/%s', preg_replace('/bundle$/', '', strtolower($name)));
+                $paths[$dir] = \sprintf('bundles/%s', preg_replace('/bundle$/', '', strtolower($name)));
             }
         }
         $excludedPathPatterns = [];
@@ -1460,6 +1432,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
             $container->removeDefinition('console.command.translation_extract');
             $container->removeDefinition('console.command.translation_pull');
             $container->removeDefinition('console.command.translation_push');
+            $container->removeDefinition('console.command.translation_lint');
 
             return;
         }
@@ -1525,7 +1498,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
             if ($container->fileExists($dir)) {
                 $dirs[] = $transPaths[] = $dir;
             } else {
-                throw new \UnexpectedValueException(sprintf('"%s" defined in translator.paths does not exist or is not a directory.', $dir));
+                throw new \UnexpectedValueException(\sprintf('"%s" defined in translator.paths does not exist or is not a directory.', $dir));
             }
         }
 
@@ -1609,7 +1582,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
         foreach ($classToServices as $class => $service) {
             $package = substr($service, \strlen('translation.provider_factory.'));
 
-            if (!$container->hasDefinition('http_client') || !ContainerBuilder::willBeAvailable(sprintf('symfony/%s-translation-provider', $package), $class, $parentPackages)) {
+            if (!$container->hasDefinition('http_client') || !ContainerBuilder::willBeAvailable(\sprintf('symfony/%s-translation-provider', $package), $class, $parentPackages)) {
                 $container->removeDefinition($service);
             }
         }
@@ -1682,10 +1655,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
         $definition->replaceArgument(0, $config['email_validation_mode']);
 
         if (\array_key_exists('enable_attributes', $config) && $config['enable_attributes']) {
-            $validatorBuilder->addMethodCall('enableAttributeMapping', [true]);
-            if ($this->isInitializedConfigEnabled('annotations') && method_exists(ValidatorBuilder::class, 'setDoctrineAnnotationReader')) {
-                $validatorBuilder->addMethodCall('setDoctrineAnnotationReader', [new Reference('annotation_reader')]);
-            }
+            $validatorBuilder->addMethodCall('enableAttributeMapping');
         }
 
         if (\array_key_exists('static_method', $config) && $config['static_method']) {
@@ -1770,65 +1740,13 @@ private function registerMappingFilesFromConfig(ContainerBuilder $container, arr
                 $container->addResource(new DirectoryResource($path, '/^$/'));
             } elseif ($container->fileExists($path, false)) {
                 if (!preg_match('/\.(xml|ya?ml)$/', $path, $matches)) {
-                    throw new \RuntimeException(sprintf('Unsupported mapping type in "%s", supported types are XML & Yaml.', $path));
+                    throw new \RuntimeException(\sprintf('Unsupported mapping type in "%s", supported types are XML & Yaml.', $path));
                 }
                 $fileRecorder($matches[1], $path);
             } else {
-                throw new \RuntimeException(sprintf('Could not open file or directory "%s".', $path));
-            }
-        }
-    }
-
-    private function registerAnnotationsConfiguration(array $config, ContainerBuilder $container, LoaderInterface $loader): void
-    {
-        if (!$this->isInitializedConfigEnabled('annotations')) {
-            return;
-        }
-
-        if (!class_exists(\Doctrine\Common\Annotations\Annotation::class)) {
-            throw new LogicException('Annotations cannot be enabled as the Doctrine Annotation library is not installed. Try running "composer require doctrine/annotations".');
-        }
-
-        trigger_deprecation('symfony/framework-bundle', '6.4', 'Enabling the integration of Doctrine annotations is deprecated. Set the "framework.annotations.enabled" config option to false.');
-
-        $loader->load('annotations.php');
-
-        if ('none' === $config['cache']) {
-            $container->removeDefinition('annotations.cached_reader');
-
-            return;
-        }
-
-        if ('php_array' === $config['cache']) {
-            $cacheService = 'annotations.cache_adapter';
-
-            // Enable warmer only if PHP array is used for cache
-            $definition = $container->findDefinition('annotations.cache_warmer');
-            $definition->addTag('kernel.cache_warmer');
-        } else {
-            $cacheService = 'annotations.filesystem_cache_adapter';
-            $cacheDir = $container->getParameterBag()->resolveValue($config['file_cache_dir']);
-
-            if (!is_dir($cacheDir) && false === @mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
-                throw new \RuntimeException(sprintf('Could not create cache directory "%s".', $cacheDir));
+                throw new \RuntimeException(\sprintf('Could not open file or directory "%s".', $path));
             }
-
-            $container
-                ->getDefinition('annotations.filesystem_cache_adapter')
-                ->replaceArgument(2, $cacheDir)
-            ;
         }
-
-        $container
-            ->getDefinition('annotations.cached_reader')
-            ->replaceArgument(2, $config['debug'])
-            // reference the cache provider without using it until AddAnnotationsCachedReaderPass runs
-            ->addArgument(new ServiceClosureArgument(new Reference($cacheService)))
-        ;
-
-        $container->setAlias('annotation_reader', 'annotations.cached_reader');
-        $container->setAlias(Reader::class, new Alias('annotations.cached_reader', false));
-        $container->removeDefinition('annotations.psr_cached_reader');
     }
 
     private function registerPropertyAccessConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
@@ -1857,11 +1775,12 @@ private function registerPropertyAccessConfiguration(array $config, ContainerBui
         ;
     }
 
-    private function registerSecretsConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
+    private function registerSecretsConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, ?string $secret): void
     {
         if (!$this->readConfigEnabled('secrets', $container, $config)) {
             $container->removeDefinition('console.command.secrets_set');
             $container->removeDefinition('console.command.secrets_list');
+            $container->removeDefinition('console.command.secrets_reveal');
             $container->removeDefinition('console.command.secrets_remove');
             $container->removeDefinition('console.command.secrets_generate_key');
             $container->removeDefinition('console.command.secrets_decrypt_to_local');
@@ -1872,6 +1791,9 @@ private function registerSecretsConfiguration(array $config, ContainerBuilder $c
 
         $loader->load('secrets.php');
 
+        $container->resolveEnvPlaceholders($secret, null, $usedEnvs);
+        $secretEnvVar = 1 === \count($usedEnvs ?? []) ? substr(key($usedEnvs), 1 + (strrpos(key($usedEnvs), ':') ?: -1)) : null;
+        $container->getDefinition('secrets.vault')->replaceArgument(2, $secretEnvVar);
         $container->getDefinition('secrets.vault')->replaceArgument(0, $config['vault_directory']);
 
         if ($config['local_dotenv_file']) {
@@ -1882,7 +1804,7 @@ private function registerSecretsConfiguration(array $config, ContainerBuilder $c
 
         if ($config['decryption_env_var']) {
             if (!preg_match('/^(?:[-.\w\\\\]*+:)*+\w++$/', $config['decryption_env_var'])) {
-                throw new InvalidArgumentException(sprintf('Invalid value "%s" set as "decryption_env_var": only "word" characters are allowed.', $config['decryption_env_var']));
+                throw new InvalidArgumentException(\sprintf('Invalid value "%s" set as "decryption_env_var": only "word" characters are allowed.', $config['decryption_env_var']));
             }
 
             if (ContainerBuilder::willBeAvailable('symfony/string', LazyString::class, ['symfony/framework-bundle'])) {
@@ -1906,8 +1828,7 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild
         if (!class_exists(\Symfony\Component\Security\Csrf\CsrfToken::class)) {
             throw new LogicException('CSRF support cannot be enabled as the Security CSRF component is not installed. Try running "composer require symfony/security-csrf".');
         }
-
-        if (!$this->isInitializedConfigEnabled('session')) {
+        if (!$config['stateless_token_ids'] && !$this->isInitializedConfigEnabled('session')) {
             throw new \LogicException('CSRF protection needs sessions to be enabled.');
         }
 
@@ -1917,6 +1838,24 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild
         if (!class_exists(CsrfExtension::class)) {
             $container->removeDefinition('twig.extension.security_csrf');
         }
+
+        if (!$config['stateless_token_ids']) {
+            $container->removeDefinition('security.csrf.same_origin_token_manager');
+
+            return;
+        }
+
+        $container->getDefinition('security.csrf.same_origin_token_manager')
+            ->replaceArgument(3, $config['stateless_token_ids'])
+            ->replaceArgument(4, $config['check_header'])
+            ->replaceArgument(5, $config['cookie_name']);
+
+        if (!$this->isInitializedConfigEnabled('session')) {
+            $container->setAlias('security.csrf.token_manager', 'security.csrf.same_origin_token_manager');
+            $container->getDefinition('security.csrf.same_origin_token_manager')
+                ->setDecoratedService(null)
+                ->replaceArgument(2, null);
+        }
     }
 
     private function registerSerializerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
@@ -1942,6 +1881,11 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $container->removeDefinition('serializer.normalizer.mime_message');
         }
 
+        // BC layer Serializer < 7.2
+        if (!class_exists(SnakeCaseToCamelCaseNameConverter::class)) {
+            $container->removeDefinition('serializer.name_converter.snake_case_to_camel_case');
+        }
+
         if ($container->getParameter('kernel.debug')) {
             $container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
         }
@@ -1952,12 +1896,9 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
 
         $serializerLoaders = [];
         if (isset($config['enable_attributes']) && $config['enable_attributes']) {
-            $annotationLoader = new Definition(
-                AttributeLoader::class,
-                [new Reference('annotation_reader', ContainerInterface::NULL_ON_INVALID_REFERENCE)]
-            );
+            $attributeLoader = new Definition(AttributeLoader::class);
 
-            $serializerLoaders[] = $annotationLoader;
+            $serializerLoaders[] = $attributeLoader;
         }
 
         $fileRecorder = function ($extension, $path) use (&$serializerLoaders) {
@@ -1995,6 +1936,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         $container->getDefinition('serializer.mapping.cache_warmer')->replaceArgument(0, $serializerLoaders);
 
         if (isset($config['name_converter']) && $config['name_converter']) {
+            $container->setParameter('.serializer.name_converter', $config['name_converter']);
             $container->getDefinition('serializer.name_converter.metadata_aware')->setArgument(1, new Reference($config['name_converter']));
         }
 
@@ -2004,23 +1946,17 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             $container->setParameter('serializer.default_context', $defaultContext);
         }
 
-        if ($container->hasDefinition('serializer.normalizer.object')) {
-            $arguments = $container->getDefinition('serializer.normalizer.object')->getArguments();
-            $context = $arguments[6] ?? $defaultContext;
-
-            if (isset($config['circular_reference_handler']) && $config['circular_reference_handler']) {
-                $context += ['circular_reference_handler' => new Reference($config['circular_reference_handler'])];
-                $container->getDefinition('serializer.normalizer.object')->setArgument(5, null);
-            }
-
-            if ($config['max_depth_handler'] ?? false) {
-                $context += ['max_depth_handler' => new Reference($config['max_depth_handler'])];
-            }
+        if ($config['circular_reference_handler'] ?? false) {
+            $container->setParameter('.serializer.circular_reference_handler', $config['circular_reference_handler']);
+        }
 
-            $container->getDefinition('serializer.normalizer.object')->setArgument(6, $context);
+        if ($config['max_depth_handler'] ?? false) {
+            $container->setParameter('.serializer.max_depth_handler', $config['max_depth_handler']);
         }
 
         $container->getDefinition('serializer.normalizer.property')->setArgument(5, $defaultContext);
+
+        $container->setParameter('.serializer.named_serializers', $config['named_serializers'] ?? []);
     }
 
     private function registerPropertyInfoConfiguration(ContainerBuilder $container, PhpFileLoader $loader): void
@@ -2050,6 +1986,35 @@ private function registerPropertyInfoConfiguration(ContainerBuilder $container,
         }
     }
 
+    private function registerTypeInfoConfiguration(ContainerBuilder $container, PhpFileLoader $loader): void
+    {
+        if (!class_exists(Type::class)) {
+            throw new LogicException('TypeInfo support cannot be enabled as the TypeInfo component is not installed. Try running "composer require symfony/type-info".');
+        }
+
+        $loader->load('type_info.php');
+
+        if (ContainerBuilder::willBeAvailable('phpstan/phpdoc-parser', PhpDocParser::class, ['symfony/framework-bundle', 'symfony/type-info'])) {
+            $container->register('type_info.resolver.string', StringTypeResolver::class);
+
+            $container->register('type_info.resolver.reflection_parameter.phpdoc_aware', PhpDocAwareReflectionTypeResolver::class)
+                ->setArguments([new Reference('type_info.resolver.reflection_parameter'), new Reference('type_info.resolver.string'), new Reference('type_info.type_context_factory')]);
+            $container->register('type_info.resolver.reflection_property.phpdoc_aware', PhpDocAwareReflectionTypeResolver::class)
+                ->setArguments([new Reference('type_info.resolver.reflection_property'), new Reference('type_info.resolver.string'), new Reference('type_info.type_context_factory')]);
+            $container->register('type_info.resolver.reflection_return.phpdoc_aware', PhpDocAwareReflectionTypeResolver::class)
+                ->setArguments([new Reference('type_info.resolver.reflection_return'), new Reference('type_info.resolver.string'), new Reference('type_info.type_context_factory')]);
+
+            /** @var ServiceLocatorArgument $resolversLocator */
+            $resolversLocator = $container->getDefinition('type_info.resolver')->getArgument(0);
+            $resolversLocator->setValues([
+                'string' => new Reference('type_info.resolver.string'),
+                \ReflectionParameter::class => new Reference('type_info.resolver.reflection_parameter.phpdoc_aware'),
+                \ReflectionProperty::class => new Reference('type_info.resolver.reflection_property.phpdoc_aware'),
+                \ReflectionFunctionAbstract::class => new Reference('type_info.resolver.reflection_return.phpdoc_aware'),
+            ] + $resolversLocator->getValues());
+        }
+    }
+
     private function registerLockConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('lock.php');
@@ -2062,7 +2027,14 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
             // Generate stores
             $storeDefinitions = [];
             foreach ($resourceStores as $resourceStore) {
+                if (null === $resourceStore) {
+                    $resourceStore = 'null';
+                }
+
                 $storeDsn = $container->resolveEnvPlaceholders($resourceStore, null, $usedEnvs);
+                if (!$usedEnvs && !str_contains($resourceStore, ':') && !\in_array($resourceStore, ['flock', 'semaphore', 'in-memory', 'null'], true)) {
+                    $resourceStore = new Reference($resourceStore);
+                }
                 $storeDefinition = new Definition(PersistingStoreInterface::class);
                 $storeDefinition
                     ->setFactory([StoreFactory::class, 'createStore'])
@@ -2104,6 +2076,9 @@ private function registerSemaphoreConfiguration(array $config, ContainerBuilder
 
         foreach ($config['resources'] as $resourceName => $resourceStore) {
             $storeDsn = $container->resolveEnvPlaceholders($resourceStore, null, $usedEnvs);
+            if (!$usedEnvs && !str_contains($resourceStore, '://')) {
+                $resourceStore = new Reference($resourceStore);
+            }
             $storeDefinition = new Definition(SemaphoreStoreInterface::class);
             $storeDefinition->setFactory([SemaphoreStoreFactory::class, 'createStore']);
             $storeDefinition->setArguments([$resourceStore]);
@@ -2130,7 +2105,7 @@ private function registerSemaphoreConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerSchedulerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
+    private function registerSchedulerConfiguration(ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!class_exists(SchedulerTransportFactory::class)) {
             throw new LogicException('Scheduler support cannot be enabled as the Scheduler component is not installed. Try running "composer require symfony/scheduler".');
@@ -2182,15 +2157,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
                 ->replaceArgument(6, $config['stop_worker_on_signals']);
         }
 
-        if ($this->hasConsole() && $container->hasDefinition('messenger.listener.stop_worker_signals_listener')) {
-            $container->getDefinition('messenger.listener.stop_worker_signals_listener')->clearTag('kernel.event_subscriber');
-        }
-        if (!class_exists(StopWorkerOnSignalsListener::class)) {
-            $container->removeDefinition('messenger.listener.stop_worker_signals_listener');
-        } elseif ($config['stop_worker_on_signals']) {
-            $container->getDefinition('messenger.listener.stop_worker_signals_listener')->replaceArgument(0, $config['stop_worker_on_signals']);
-        }
-
         if (null === $config['default_bus'] && 1 === \count($config['buses'])) {
             $config['default_bus'] = key($config['buses']);
         }
@@ -2258,7 +2224,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
         $failureTransports = [];
         if ($config['failure_transport']) {
             if (!isset($config['transports'][$config['failure_transport']])) {
-                throw new LogicException(sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $config['failure_transport']));
+                throw new LogicException(\sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $config['failure_transport']));
             }
 
             $container->setAlias('messenger.failure_transports.default', 'messenger.transport.'.$config['failure_transport']);
@@ -2282,7 +2248,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $serializerId = $transport['serializer'] ?? 'messenger.default_serializer';
             $tags = [
                 'alias' => $name,
-                'is_failure_transport' => \in_array($name, $failureTransports),
+                'is_failure_transport' => \in_array($name, $failureTransports, true),
             ];
             if (str_starts_with($transport['dsn'], 'sync://')) {
                 $tags['is_consumable'] = false;
@@ -2298,13 +2264,14 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             if (null !== $transport['retry_strategy']['service']) {
                 $transportRetryReferences[$name] = new Reference($transport['retry_strategy']['service']);
             } else {
-                $retryServiceId = sprintf('messenger.retry.multiplier_retry_strategy.%s', $name);
+                $retryServiceId = \sprintf('messenger.retry.multiplier_retry_strategy.%s', $name);
                 $retryDefinition = new ChildDefinition('messenger.retry.abstract_multiplier_retry_strategy');
                 $retryDefinition
                     ->replaceArgument(0, $transport['retry_strategy']['max_retries'])
                     ->replaceArgument(1, $transport['retry_strategy']['delay'])
                     ->replaceArgument(2, $transport['retry_strategy']['multiplier'])
-                    ->replaceArgument(3, $transport['retry_strategy']['max_delay']);
+                    ->replaceArgument(3, $transport['retry_strategy']['max_delay'])
+                    ->replaceArgument(4, $transport['retry_strategy']['jitter']);
                 $container->setDefinition($retryServiceId, $retryDefinition);
 
                 $transportRetryReferences[$name] = new Reference($retryServiceId);
@@ -2332,7 +2299,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
         foreach ($config['transports'] as $name => $transport) {
             if ($transport['failure_transport']) {
                 if (!isset($senderReferences[$transport['failure_transport']])) {
-                    throw new LogicException(sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $transport['failure_transport']));
+                    throw new LogicException(\sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $transport['failure_transport']));
                 }
             }
         }
@@ -2343,16 +2310,16 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
         foreach ($config['routing'] as $message => $messageConfiguration) {
             if ('*' !== $message && !class_exists($message) && !interface_exists($message, false) && !preg_match('/^(?:[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+\\\\)++\*$/', $message)) {
                 if (str_contains($message, '*')) {
-                    throw new LogicException(sprintf('Invalid Messenger routing configuration: invalid namespace "%s" wildcard.', $message));
+                    throw new LogicException(\sprintf('Invalid Messenger routing configuration: invalid namespace "%s" wildcard.', $message));
                 }
 
-                throw new LogicException(sprintf('Invalid Messenger routing configuration: class or interface "%s" not found.', $message));
+                throw new LogicException(\sprintf('Invalid Messenger routing configuration: class or interface "%s" not found.', $message));
             }
 
             // make sure senderAliases contains all senders
             foreach ($messageConfiguration['senders'] as $sender) {
                 if (!isset($senderReferences[$sender])) {
-                    throw new LogicException(sprintf('Invalid Messenger routing configuration: the "%s" class is being routed to a sender called "%s". This is not a valid transport or service id.', $message, $sender));
+                    throw new LogicException(\sprintf('Invalid Messenger routing configuration: the "%s" class is being routed to a sender called "%s". This is not a valid transport or service id.', $message, $sender));
                 }
             }
 
@@ -2516,6 +2483,8 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
         $loader->load('http_client.php');
 
         $options = $config['default_options'] ?? [];
+        $rateLimiter = $options['rate_limiter'] ?? null;
+        unset($options['rate_limiter']);
         $retryOptions = $options['retry_failed'] ?? ['enabled' => false];
         unset($options['retry_failed']);
         $defaultUriTemplateVars = $options['vars'] ?? [];
@@ -2537,6 +2506,10 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
             $container->removeAlias(HttpClient::class);
         }
 
+        if (null !== $rateLimiter) {
+            $this->registerThrottlingHttpClient($rateLimiter, 'http_client', $container);
+        }
+
         if ($this->readConfigEnabled('http_client.retry_failed', $container, $retryOptions)) {
             $this->registerRetryableHttpClient($retryOptions, 'http_client', $container);
         }
@@ -2553,11 +2526,13 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
 
         foreach ($config['scoped_clients'] as $name => $scopeConfig) {
             if ($container->has($name)) {
-                throw new InvalidArgumentException(sprintf('Invalid scope name: "%s" is reserved.', $name));
+                throw new InvalidArgumentException(\sprintf('Invalid scope name: "%s" is reserved.', $name));
             }
 
             $scope = $scopeConfig['scope'] ?? null;
             unset($scopeConfig['scope']);
+            $rateLimiter = $scopeConfig['rate_limiter'] ?? null;
+            unset($scopeConfig['rate_limiter']);
             $retryOptions = $scopeConfig['retry_failed'] ?? ['enabled' => false];
             unset($scopeConfig['retry_failed']);
 
@@ -2579,6 +2554,10 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
                 ;
             }
 
+            if (null !== $rateLimiter) {
+                $this->registerThrottlingHttpClient($rateLimiter, $name, $container);
+            }
+
             if ($this->readConfigEnabled('http_client.scoped_clients.'.$name.'.retry_failed', $container, $retryOptions)) {
                 $this->registerRetryableHttpClient($retryOptions, $name, $container);
             }
@@ -2616,6 +2595,25 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
         }
     }
 
+    private function registerThrottlingHttpClient(string $rateLimiter, string $name, ContainerBuilder $container): void
+    {
+        if (!class_exists(ThrottlingHttpClient::class)) {
+            throw new LogicException('Rate limiter support cannot be enabled as version 7.1+ of the HttpClient component is required.');
+        }
+
+        if (!$this->isInitializedConfigEnabled('rate_limiter')) {
+            throw new LogicException('Rate limiter cannot be used within HttpClient as the RateLimiter component is not enabled.');
+        }
+
+        $container->register($name.'.throttling.limiter', LimiterInterface::class)
+            ->setFactory([new Reference('limiter.'.$rateLimiter), 'create']);
+
+        $container
+            ->register($name.'.throttling', ThrottlingHttpClient::class)
+            ->setDecoratedService($name, null, 15) // higher priority than RetryableHttpClient (10)
+            ->setArguments([new Reference($name.'.throttling.inner'), new Reference($name.'.throttling.limiter')]);
+    }
+
     private function registerRetryableHttpClient(array $options, string $name, ContainerBuilder $container): void
     {
         if (null !== $options['retry_strategy']) {
@@ -2671,26 +2669,30 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
         }
 
         $classToServices = [
+            MailerBridge\Azure\Transport\AzureTransportFactory::class => 'mailer.transport_factory.azure',
             MailerBridge\Brevo\Transport\BrevoTransportFactory::class => 'mailer.transport_factory.brevo',
             MailerBridge\Google\Transport\GmailTransportFactory::class => 'mailer.transport_factory.gmail',
             MailerBridge\Infobip\Transport\InfobipTransportFactory::class => 'mailer.transport_factory.infobip',
             MailerBridge\MailerSend\Transport\MailerSendTransportFactory::class => 'mailer.transport_factory.mailersend',
             MailerBridge\Mailgun\Transport\MailgunTransportFactory::class => 'mailer.transport_factory.mailgun',
             MailerBridge\Mailjet\Transport\MailjetTransportFactory::class => 'mailer.transport_factory.mailjet',
+            MailerBridge\Mailomat\Transport\MailomatTransportFactory::class => 'mailer.transport_factory.mailomat',
             MailerBridge\MailPace\Transport\MailPaceTransportFactory::class => 'mailer.transport_factory.mailpace',
             MailerBridge\Mailchimp\Transport\MandrillTransportFactory::class => 'mailer.transport_factory.mailchimp',
-            MailerBridge\OhMySmtp\Transport\OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
+            MailerBridge\Postal\Transport\PostalTransportFactory::class => 'mailer.transport_factory.postal',
             MailerBridge\Postmark\Transport\PostmarkTransportFactory::class => 'mailer.transport_factory.postmark',
+            MailerBridge\Mailtrap\Transport\MailtrapTransportFactory::class => 'mailer.transport_factory.mailtrap',
+            MailerBridge\Resend\Transport\ResendTransportFactory::class => 'mailer.transport_factory.resend',
             MailerBridge\Scaleway\Transport\ScalewayTransportFactory::class => 'mailer.transport_factory.scaleway',
             MailerBridge\Sendgrid\Transport\SendgridTransportFactory::class => 'mailer.transport_factory.sendgrid',
-            MailerBridge\Sendinblue\Transport\SendinblueTransportFactory::class => 'mailer.transport_factory.sendinblue',
             MailerBridge\Amazon\Transport\SesTransportFactory::class => 'mailer.transport_factory.amazon',
+            MailerBridge\Sweego\Transport\SweegoTransportFactory::class => 'mailer.transport_factory.sweego',
         ];
 
         foreach ($classToServices as $class => $service) {
             $package = substr($service, \strlen('mailer.transport_factory.'));
 
-            if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
+            if (!ContainerBuilder::willBeAvailable(\sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
                 $container->removeDefinition($service);
             }
         }
@@ -2698,16 +2700,22 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
         if ($webhookEnabled) {
             $webhookRequestParsers = [
                 MailerBridge\Brevo\Webhook\BrevoRequestParser::class => 'mailer.webhook.request_parser.brevo',
+                MailerBridge\MailerSend\Webhook\MailerSendRequestParser::class => 'mailer.webhook.request_parser.mailersend',
+                MailerBridge\Mailchimp\Webhook\MailchimpRequestParser::class => 'mailer.webhook.request_parser.mailchimp',
                 MailerBridge\Mailgun\Webhook\MailgunRequestParser::class => 'mailer.webhook.request_parser.mailgun',
                 MailerBridge\Mailjet\Webhook\MailjetRequestParser::class => 'mailer.webhook.request_parser.mailjet',
+                MailerBridge\Mailomat\Webhook\MailomatRequestParser::class => 'mailer.webhook.request_parser.mailomat',
                 MailerBridge\Postmark\Webhook\PostmarkRequestParser::class => 'mailer.webhook.request_parser.postmark',
+                MailerBridge\Mailtrap\Webhook\MailtrapRequestParser::class => 'mailer.webhook.request_parser.mailtrap',
+                MailerBridge\Resend\Webhook\ResendRequestParser::class => 'mailer.webhook.request_parser.resend',
                 MailerBridge\Sendgrid\Webhook\SendgridRequestParser::class => 'mailer.webhook.request_parser.sendgrid',
+                MailerBridge\Sweego\Webhook\SweegoRequestParser::class => 'mailer.webhook.request_parser.sweego',
             ];
 
             foreach ($webhookRequestParsers as $class => $service) {
                 $package = substr($service, \strlen('mailer.webhook.request_parser.'));
 
-                if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
+                if (!ContainerBuilder::willBeAvailable(\sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
                     $container->removeDefinition($service);
                 }
             }
@@ -2716,6 +2724,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
         $envelopeListener = $container->getDefinition('mailer.envelope_listener');
         $envelopeListener->setArgument(0, $config['envelope']['sender'] ?? null);
         $envelopeListener->setArgument(1, $config['envelope']['recipients'] ?? null);
+        $envelopeListener->setArgument(2, $config['envelope']['allowed_recipients'] ?? []);
 
         if ($config['headers']) {
             $headers = new Definition(Headers::class);
@@ -2770,7 +2779,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             $container->removeDefinition('notifier.channel.email');
         }
 
-        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms', 'notifier.channel.push'] as $serviceId) {
+        foreach (['texter', 'chatter', 'notifier.channel.chat', 'notifier.channel.email', 'notifier.channel.sms', 'notifier.channel.push', 'notifier.channel.desktop'] as $serviceId) {
             if (!$container->hasDefinition($serviceId)) {
                 continue;
             }
@@ -2794,6 +2803,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             }
             $container->getDefinition('notifier.channel.sms')->setArgument(0, null);
             $container->getDefinition('notifier.channel.push')->setArgument(0, null);
+            $container->getDefinition('notifier.channel.desktop')->setArgument(0, null);
         }
 
         $container->getDefinition('notifier.channel_policy')->setArgument(0, $config['channel_policy']);
@@ -2808,6 +2818,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             NotifierBridge\AllMySms\AllMySmsTransportFactory::class => 'notifier.transport_factory.all-my-sms',
             NotifierBridge\AmazonSns\AmazonSnsTransportFactory::class => 'notifier.transport_factory.amazon-sns',
             NotifierBridge\Bandwidth\BandwidthTransportFactory::class => 'notifier.transport_factory.bandwidth',
+            NotifierBridge\Bluesky\BlueskyTransportFactory::class => 'notifier.transport_factory.bluesky',
             NotifierBridge\Brevo\BrevoTransportFactory::class => 'notifier.transport_factory.brevo',
             NotifierBridge\Chatwork\ChatworkTransportFactory::class => 'notifier.transport_factory.chatwork',
             NotifierBridge\Clickatell\ClickatellTransportFactory::class => 'notifier.transport_factory.clickatell',
@@ -2821,16 +2832,18 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             NotifierBridge\FortySixElks\FortySixElksTransportFactory::class => 'notifier.transport_factory.forty-six-elks',
             NotifierBridge\FreeMobile\FreeMobileTransportFactory::class => 'notifier.transport_factory.free-mobile',
             NotifierBridge\GatewayApi\GatewayApiTransportFactory::class => 'notifier.transport_factory.gateway-api',
-            NotifierBridge\Gitter\GitterTransportFactory::class => 'notifier.transport_factory.gitter',
             NotifierBridge\GoIp\GoIpTransportFactory::class => 'notifier.transport_factory.go-ip',
             NotifierBridge\GoogleChat\GoogleChatTransportFactory::class => 'notifier.transport_factory.google-chat',
             NotifierBridge\Infobip\InfobipTransportFactory::class => 'notifier.transport_factory.infobip',
             NotifierBridge\Iqsms\IqsmsTransportFactory::class => 'notifier.transport_factory.iqsms',
             NotifierBridge\Isendpro\IsendproTransportFactory::class => 'notifier.transport_factory.isendpro',
+            NotifierBridge\JoliNotif\JoliNotifTransportFactory::class => 'notifier.transport_factory.joli-notif',
             NotifierBridge\KazInfoTeh\KazInfoTehTransportFactory::class => 'notifier.transport_factory.kaz-info-teh',
             NotifierBridge\LightSms\LightSmsTransportFactory::class => 'notifier.transport_factory.light-sms',
+            NotifierBridge\LineBot\LineBotTransportFactory::class => 'notifier.transport_factory.line-bot',
             NotifierBridge\LineNotify\LineNotifyTransportFactory::class => 'notifier.transport_factory.line-notify',
             NotifierBridge\LinkedIn\LinkedInTransportFactory::class => 'notifier.transport_factory.linked-in',
+            NotifierBridge\Lox24\Lox24TransportFactory::class => 'notifier.transport_factory.lox24',
             NotifierBridge\Mailjet\MailjetTransportFactory::class => 'notifier.transport_factory.mailjet',
             NotifierBridge\Mastodon\MastodonTransportFactory::class => 'notifier.transport_factory.mastodon',
             NotifierBridge\Mattermost\MattermostTransportFactory::class => 'notifier.transport_factory.mattermost',
@@ -2847,28 +2860,36 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             NotifierBridge\OvhCloud\OvhCloudTransportFactory::class => 'notifier.transport_factory.ovh-cloud',
             NotifierBridge\PagerDuty\PagerDutyTransportFactory::class => 'notifier.transport_factory.pager-duty',
             NotifierBridge\Plivo\PlivoTransportFactory::class => 'notifier.transport_factory.plivo',
+            NotifierBridge\Primotexto\PrimotextoTransportFactory::class => 'notifier.transport_factory.primotexto',
             NotifierBridge\Pushover\PushoverTransportFactory::class => 'notifier.transport_factory.pushover',
+            NotifierBridge\Pushy\PushyTransportFactory::class => 'notifier.transport_factory.pushy',
             NotifierBridge\Redlink\RedlinkTransportFactory::class => 'notifier.transport_factory.redlink',
             NotifierBridge\RingCentral\RingCentralTransportFactory::class => 'notifier.transport_factory.ring-central',
             NotifierBridge\RocketChat\RocketChatTransportFactory::class => 'notifier.transport_factory.rocket-chat',
             NotifierBridge\Sendberry\SendberryTransportFactory::class => 'notifier.transport_factory.sendberry',
+            NotifierBridge\Sipgate\SipgateTransportFactory::class => 'notifier.transport_factory.sipgate',
             NotifierBridge\SimpleTextin\SimpleTextinTransportFactory::class => 'notifier.transport_factory.simple-textin',
-            NotifierBridge\Sendinblue\SendinblueTransportFactory::class => 'notifier.transport_factory.sendinblue',
+            NotifierBridge\Sevenio\SevenIoTransportFactory::class => 'notifier.transport_factory.sevenio',
             NotifierBridge\Sinch\SinchTransportFactory::class => 'notifier.transport_factory.sinch',
             NotifierBridge\Slack\SlackTransportFactory::class => 'notifier.transport_factory.slack',
             NotifierBridge\Sms77\Sms77TransportFactory::class => 'notifier.transport_factory.sms77',
             NotifierBridge\Smsapi\SmsapiTransportFactory::class => 'notifier.transport_factory.smsapi',
             NotifierBridge\SmsBiuras\SmsBiurasTransportFactory::class => 'notifier.transport_factory.sms-biuras',
+            NotifierBridge\Smsbox\SmsboxTransportFactory::class => 'notifier.transport_factory.smsbox',
             NotifierBridge\Smsc\SmscTransportFactory::class => 'notifier.transport_factory.smsc',
             NotifierBridge\SmsFactor\SmsFactorTransportFactory::class => 'notifier.transport_factory.sms-factor',
             NotifierBridge\Smsmode\SmsmodeTransportFactory::class => 'notifier.transport_factory.smsmode',
+            NotifierBridge\SmsSluzba\SmsSluzbaTransportFactory::class => 'notifier.transport_factory.sms-sluzba',
+            NotifierBridge\Smsense\SmsenseTransportFactory::class => 'notifier.transport_factory.smsense',
             NotifierBridge\SpotHit\SpotHitTransportFactory::class => 'notifier.transport_factory.spot-hit',
+            NotifierBridge\Sweego\SweegoTransportFactory::class => 'notifier.transport_factory.sweego',
             NotifierBridge\Telegram\TelegramTransportFactory::class => 'notifier.transport_factory.telegram',
             NotifierBridge\Telnyx\TelnyxTransportFactory::class => 'notifier.transport_factory.telnyx',
             NotifierBridge\Termii\TermiiTransportFactory::class => 'notifier.transport_factory.termii',
             NotifierBridge\TurboSms\TurboSmsTransportFactory::class => 'notifier.transport_factory.turbo-sms',
             NotifierBridge\Twilio\TwilioTransportFactory::class => 'notifier.transport_factory.twilio',
             NotifierBridge\Twitter\TwitterTransportFactory::class => 'notifier.transport_factory.twitter',
+            NotifierBridge\Unifonic\UnifonicTransportFactory::class => 'notifier.transport_factory.unifonic',
             NotifierBridge\Vonage\VonageTransportFactory::class => 'notifier.transport_factory.vonage',
             NotifierBridge\Yunpian\YunpianTransportFactory::class => 'notifier.transport_factory.yunpian',
             NotifierBridge\Zendesk\ZendeskTransportFactory::class => 'notifier.transport_factory.zendesk',
@@ -2880,7 +2901,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
         foreach ($classToServices as $class => $service) {
             $package = substr($service, \strlen('notifier.transport_factory.'));
 
-            if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-notifier', $package), $class, $parentPackages)) {
+            if (!ContainerBuilder::willBeAvailable(\sprintf('symfony/%s-notifier', $package), $class, $parentPackages)) {
                 $container->removeDefinition($service);
             }
         }
@@ -2916,6 +2937,12 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             $container->removeDefinition('notifier.transport_factory.fake-sms');
         }
 
+        if (ContainerBuilder::willBeAvailable('symfony/bluesky-notifier', NotifierBridge\Bluesky\BlueskyTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier'])) {
+            $container->getDefinition($classToServices[NotifierBridge\Bluesky\BlueskyTransportFactory::class])
+                ->addArgument(new Reference('logger'))
+                ->addArgument(new Reference('clock', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
+        }
+
         if (isset($config['admin_recipients'])) {
             $notifier = $container->getDefinition('notifier');
             foreach ($config['admin_recipients'] as $i => $recipient) {
@@ -2929,6 +2956,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             $loader->load('notifier_webhook.php');
 
             $webhookRequestParsers = [
+                NotifierBridge\Sweego\Webhook\SweegoRequestParser::class => 'notifier.webhook.request_parser.sweego',
                 NotifierBridge\Twilio\Webhook\TwilioRequestParser::class => 'notifier.webhook.request_parser.twilio',
                 NotifierBridge\Vonage\Webhook\VonageRequestParser::class => 'notifier.webhook.request_parser.vonage',
             ];
@@ -2936,14 +2964,14 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
             foreach ($webhookRequestParsers as $class => $service) {
                 $package = substr($service, \strlen('notifier.webhook.request_parser.'));
 
-                if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-notifier', $package), $class, ['symfony/framework-bundle', 'symfony/notifier'])) {
+                if (!ContainerBuilder::willBeAvailable(\sprintf('symfony/%s-notifier', $package), $class, ['symfony/framework-bundle', 'symfony/notifier'])) {
                     $container->removeDefinition($service);
                 }
             }
         }
     }
 
-    private function registerWebhookConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
+    private function registerWebhookConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $serializerEnabled): void
     {
         if (!class_exists(WebhookController::class)) {
             throw new LogicException('Webhook support cannot be enabled as the component is not installed. Try running "composer require symfony/webhook".');
@@ -2962,9 +2990,12 @@ private function registerWebhookConfiguration(array $config, ContainerBuilder $c
         $controller = $container->getDefinition('webhook.controller');
         $controller->replaceArgument(0, $parsers);
         $controller->replaceArgument(1, new Reference($config['message_bus']));
+
+        $jsonBodyConfigurator = $container->getDefinition('webhook.body_configurator.json');
+        $jsonBodyConfigurator->replaceArgument(0, new Reference($serializerEnabled ? 'webhook.payload_serializer.serializer' : 'webhook.payload_serializer.json'));
     }
 
-    private function registerRemoteEventConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
+    private function registerRemoteEventConfiguration(PhpFileLoader $loader): void
     {
         if (!class_exists(RemoteEvent::class)) {
             throw new LogicException('RemoteEvent support cannot be enabled as the component is not installed. Try running "composer require symfony/remote-event".');
@@ -2981,15 +3012,16 @@ private function registerRateLimiterConfiguration(array $config, ContainerBuilde
             // default configuration (when used by other DI extensions)
             $limiterConfig += ['lock_factory' => 'lock.factory', 'cache_pool' => 'cache.rate_limiter'];
 
-            $limiter = $container->setDefinition($limiterId = 'limiter.'.$name, new ChildDefinition('limiter'));
+            $limiter = $container->setDefinition($limiterId = 'limiter.'.$name, new ChildDefinition('limiter'))
+                ->addTag('rate_limiter', ['name' => $name]);
 
             if (null !== $limiterConfig['lock_factory']) {
                 if (!interface_exists(LockInterface::class)) {
-                    throw new LogicException(sprintf('Rate limiter "%s" requires the Lock component to be installed. Try running "composer require symfony/lock".', $name));
+                    throw new LogicException(\sprintf('Rate limiter "%s" requires the Lock component to be installed. Try running "composer require symfony/lock".', $name));
                 }
 
                 if (!$this->isInitializedConfigEnabled('lock')) {
-                    throw new LogicException(sprintf('Rate limiter "%s" requires the Lock component to be configured.', $name));
+                    throw new LogicException(\sprintf('Rate limiter "%s" requires the Lock component to be configured.', $name));
                 }
 
                 $limiter->replaceArgument(2, new Reference($limiterConfig['lock_factory']));
@@ -3010,45 +3042,6 @@ private function registerRateLimiterConfiguration(array $config, ContainerBuilde
         }
     }
 
-    /**
-     * @deprecated since Symfony 6.2
-     *
-     * @return void
-     */
-    public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
-    {
-        trigger_deprecation('symfony/framework-bundle', '6.2', 'The "%s()" method is deprecated.', __METHOD__);
-
-        // default configuration (when used by other DI extensions)
-        $limiterConfig += ['lock_factory' => 'lock.factory', 'cache_pool' => 'cache.rate_limiter'];
-
-        $limiter = $container->setDefinition($limiterId = 'limiter.'.$name, new ChildDefinition('limiter'));
-
-        if (null !== $limiterConfig['lock_factory']) {
-            if (!interface_exists(LockInterface::class)) {
-                throw new LogicException(sprintf('Rate limiter "%s" requires the Lock component to be installed. Try running "composer require symfony/lock".', $name));
-            }
-            if (!$container->hasDefinition('lock.factory.abstract')) {
-                throw new LogicException(sprintf('Rate limiter "%s" requires the Lock component to be configured.', $name));
-            }
-
-            $limiter->replaceArgument(2, new Reference($limiterConfig['lock_factory']));
-        }
-        unset($limiterConfig['lock_factory']);
-
-        if (null === $storageId = $limiterConfig['storage_service'] ?? null) {
-            $container->register($storageId = 'limiter.storage.'.$name, CacheStorage::class)->addArgument(new Reference($limiterConfig['cache_pool']));
-        }
-
-        $limiter->replaceArgument(1, new Reference($storageId));
-        unset($limiterConfig['storage_service'], $limiterConfig['cache_pool']);
-
-        $limiterConfig['id'] = $name;
-        $limiter->replaceArgument(0, $limiterConfig);
-
-        $container->registerAliasForArgument($limiterId, RateLimiterFactory::class, $name.'.limiter');
-    }
-
     private function registerUidConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
     {
         $loader->load('uid.php');
@@ -3154,25 +3147,6 @@ private function registerHtmlSanitizerConfiguration(array $config, ContainerBuil
         }
     }
 
-    private function resolveTrustedHeaders(array $headers): int
-    {
-        $trustedHeaders = 0;
-
-        foreach ($headers as $h) {
-            $trustedHeaders |= match ($h) {
-                'forwarded' => Request::HEADER_FORWARDED,
-                'x-forwarded-for' => Request::HEADER_X_FORWARDED_FOR,
-                'x-forwarded-host' => Request::HEADER_X_FORWARDED_HOST,
-                'x-forwarded-proto' => Request::HEADER_X_FORWARDED_PROTO,
-                'x-forwarded-port' => Request::HEADER_X_FORWARDED_PORT,
-                'x-forwarded-prefix' => Request::HEADER_X_FORWARDED_PREFIX,
-                default => 0,
-            };
-        }
-
-        return $trustedHeaders;
-    }
-
     public function getXsdValidationBasePath(): string|false
     {
         return \dirname(__DIR__).'/Resources/config/schema';
@@ -3194,7 +3168,7 @@ private function isInitializedConfigEnabled(string $path): bool
             return $this->configsEnabled[$path];
         }
 
-        throw new LogicException(sprintf('Can not read config enabled at "%s" because it has not been initialized.', $path));
+        throw new LogicException(\sprintf('Can not read config enabled at "%s" because it has not been initialized.', $path));
     }
 
     private function readConfigEnabled(string $path, ContainerBuilder $container, array $config): bool
@@ -3224,7 +3198,7 @@ private function getPublicDirectory(ContainerBuilder $container): string
         }
 
         $container->addResource(new FileResource($composerFilePath));
-        $composerConfig = json_decode(file_get_contents($composerFilePath), true);
+        $composerConfig = json_decode((new Filesystem())->readFile($composerFilePath), true, flags: \JSON_THROW_ON_ERROR);
 
         return isset($composerConfig['extra']['public-dir']) ? $projectDir.'/'.$composerConfig['extra']['public-dir'] : $defaultPublicDir;
     }
diff --git a/EventListener/ConsoleProfilerListener.php b/EventListener/ConsoleProfilerListener.php
index 03274450d..712e2ead3 100644
--- a/EventListener/ConsoleProfilerListener.php
+++ b/EventListener/ConsoleProfilerListener.php
@@ -79,7 +79,7 @@ public function initialize(ConsoleCommandEvent $event): void
             return;
         }
 
-        $request->attributes->set('_stopwatch_token', substr(hash('sha256', uniqid(mt_rand(), true)), 0, 6));
+        $request->attributes->set('_stopwatch_token', bin2hex(random_bytes(3)));
         $this->stopwatch->openSection();
     }
 
@@ -148,7 +148,7 @@ public function profile(ConsoleTerminateEvent $event): void
 
             if ($this->urlGenerator && $output) {
                 $token = $p->getToken();
-                $output->writeln(sprintf(
+                $output->writeln(\sprintf(
                     'See profile <href=%s>%s</>',
                     $this->urlGenerator->generate('_profiler', ['token' => $token], UrlGeneratorInterface::ABSOLUTE_URL),
                     $token
diff --git a/EventListener/SuggestMissingPackageSubscriber.php b/EventListener/SuggestMissingPackageSubscriber.php
index d7bdc8e66..a5a0d5d63 100644
--- a/EventListener/SuggestMissingPackageSubscriber.php
+++ b/EventListener/SuggestMissingPackageSubscriber.php
@@ -66,7 +66,7 @@ public function onConsoleError(ConsoleErrorEvent $event): void
             return;
         }
 
-        $message = sprintf("%s\n\nYou may be looking for a command provided by the \"%s\" which is currently not installed. Try running \"composer require %s\".", $error->getMessage(), $suggestion[0], $suggestion[1]);
+        $message = \sprintf("%s\n\nYou may be looking for a command provided by the \"%s\" which is currently not installed. Try running \"composer require %s\".", $error->getMessage(), $suggestion[0], $suggestion[1]);
         $event->setError(new CommandNotFoundException($message));
     }
 
diff --git a/FrameworkBundle.php b/FrameworkBundle.php
index c371d10db..e83c4dfe6 100644
--- a/FrameworkBundle.php
+++ b/FrameworkBundle.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle;
 
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AssetsContextPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ContainerBuilderDebugDumpPass;
@@ -20,6 +19,7 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RemoveUnusedSessionMarshallingHandlerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TestServiceContainerRealRefPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TestServiceContainerWeakRefPass;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationLintCommandPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TranslationUpdateCommandPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\VirtualRequestStackPass;
@@ -94,10 +94,7 @@ class_exists(Registry::class);
  */
 class FrameworkBundle extends Bundle
 {
-    /**
-     * @return void
-     */
-    public function boot()
+    public function boot(): void
     {
         $_ENV['DOCTRINE_DEPRECATIONS'] = $_SERVER['DOCTRINE_DEPRECATIONS'] ??= 'trigger';
 
@@ -108,11 +105,7 @@ public function boot()
             $handler = [ErrorHandler::register(null, false)];
         }
 
-        if (!$this->container->has('debug.error_handler_configurator')) {
-            // When upgrading an existing Symfony application from 6.2 to 6.3, and
-            // the cache is warmed up, the service is not available yet, so we need
-            // to check if it exists.
-        } elseif (\is_array($handler) && $handler[0] instanceof ErrorHandler) {
+        if (\is_array($handler) && $handler[0] instanceof ErrorHandler) {
             $this->container->get('debug.error_handler_configurator')->configure($handler[0]);
         }
 
@@ -125,10 +118,7 @@ public function boot()
         }
     }
 
-    /**
-     * @return void
-     */
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
@@ -159,9 +149,10 @@ public function build(ContainerBuilder $container)
         // but as late as possible to get resolved parameters
         $container->addCompilerPass($registerListenersPass, PassConfig::TYPE_BEFORE_REMOVING);
         $this->addCompilerPassIfExists($container, AddConstraintValidatorsPass::class);
-        $container->addCompilerPass(new AddAnnotationsCachedReaderPass(), PassConfig::TYPE_AFTER_REMOVING, -255);
         $this->addCompilerPassIfExists($container, AddValidatorInitializersPass::class);
         $this->addCompilerPassIfExists($container, AddConsoleCommandPass::class, PassConfig::TYPE_BEFORE_REMOVING);
+        // must be registered before the AddConsoleCommandPass
+        $container->addCompilerPass(new TranslationLintCommandPass(), PassConfig::TYPE_BEFORE_REMOVING, 10);
         // must be registered as late as possible to get access to all Twig paths registered in
         // twig.template_iterator definition
         $this->addCompilerPassIfExists($container, TranslatorPass::class, PassConfig::TYPE_BEFORE_OPTIMIZATION, -32);
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
index 481e8cf3c..f163708cc 100644
--- a/HttpCache/HttpCache.php
+++ b/HttpCache/HttpCache.php
@@ -27,20 +27,20 @@
  */
 class HttpCache extends BaseHttpCache
 {
-    protected $cacheDir;
-    protected $kernel;
+    protected ?string $cacheDir = null;
 
     private ?StoreInterface $store = null;
-    private ?SurrogateInterface $surrogate;
     private array $options;
 
     /**
      * @param $cache The cache directory (default used if null) or the storage instance
      */
-    public function __construct(KernelInterface $kernel, string|StoreInterface|null $cache = null, ?SurrogateInterface $surrogate = null, ?array $options = null)
-    {
-        $this->kernel = $kernel;
-        $this->surrogate = $surrogate;
+    public function __construct(
+        protected KernelInterface $kernel,
+        string|StoreInterface|null $cache = null,
+        private ?SurrogateInterface $surrogate = null,
+        ?array $options = null,
+    ) {
         $this->options = $options ?? [];
 
         if ($cache instanceof StoreInterface) {
diff --git a/Kernel/MicroKernelTrait.php b/Kernel/MicroKernelTrait.php
index 7d0de3d7c..f40373a30 100644
--- a/Kernel/MicroKernelTrait.php
+++ b/Kernel/MicroKernelTrait.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Kernel;
 
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\AbstractConfigurator;
@@ -48,12 +49,12 @@ trait MicroKernelTrait
      */
     private function configureContainer(ContainerConfigurator $container, LoaderInterface $loader, ContainerBuilder $builder): void
     {
-        $configDir = $this->getConfigDir();
+        $configDir = preg_replace('{/config$}', '/{config}', $this->getConfigDir());
 
         $container->import($configDir.'/{packages}/*.{php,yaml}');
         $container->import($configDir.'/{packages}/'.$this->environment.'/*.{php,yaml}');
 
-        if (is_file($configDir.'/services.yaml')) {
+        if (is_file($this->getConfigDir().'/services.yaml')) {
             $container->import($configDir.'/services.yaml');
             $container->import($configDir.'/{services}_'.$this->environment.'.yaml');
         } else {
@@ -73,18 +74,18 @@ private function configureContainer(ContainerConfigurator $container, LoaderInte
      */
     private function configureRoutes(RoutingConfigurator $routes): void
     {
-        $configDir = $this->getConfigDir();
+        $configDir = preg_replace('{/config$}', '/{config}', $this->getConfigDir());
 
         $routes->import($configDir.'/{routes}/'.$this->environment.'/*.{php,yaml}');
         $routes->import($configDir.'/{routes}/*.{php,yaml}');
 
-        if (is_file($configDir.'/routes.yaml')) {
+        if (is_file($this->getConfigDir().'/routes.yaml')) {
             $routes->import($configDir.'/routes.yaml');
         } else {
             $routes->import($configDir.'/{routes}.php');
         }
 
-        if (false !== ($fileName = (new \ReflectionObject($this))->getFileName())) {
+        if ($fileName = (new \ReflectionObject($this))->getFileName()) {
             $routes->import($fileName, 'attribute');
         }
     }
@@ -130,7 +131,13 @@ public function getLogDir(): string
 
     public function registerBundles(): iterable
     {
-        $contents = require $this->getBundlesPath();
+        if (!is_file($bundlesPath = $this->getBundlesPath())) {
+            yield new FrameworkBundle();
+
+            return;
+        }
+
+        $contents = require $bundlesPath;
         foreach ($contents as $class => $envs) {
             if ($envs[$this->environment] ?? $envs['all'] ?? false) {
                 yield new $class();
@@ -138,10 +145,7 @@ public function registerBundles(): iterable
         }
     }
 
-    /**
-     * @return void
-     */
-    public function registerContainerConfiguration(LoaderInterface $loader)
+    public function registerContainerConfiguration(LoaderInterface $loader): void
     {
         $loader->load(function (ContainerBuilder $container) use ($loader) {
             $container->loadFromExtension('framework', [
@@ -217,8 +221,10 @@ public function loadRoutes(LoaderInterface $loader): RouteCollection
 
             if (\is_array($controller) && [0, 1] === array_keys($controller) && $this === $controller[0]) {
                 $route->setDefault('_controller', ['kernel', $controller[1]]);
-            } elseif ($controller instanceof \Closure && $this === ($r = new \ReflectionFunction($controller))->getClosureThis() && !str_contains($r->name, '{closure')) {
+            } elseif ($controller instanceof \Closure && $this === ($r = new \ReflectionFunction($controller))->getClosureThis() && !$r->isAnonymous()) {
                 $route->setDefault('_controller', ['kernel', $r->name]);
+            } elseif ($this::class === $controller && method_exists($this, '__invoke')) {
+                $route->setDefault('_controller', 'kernel');
             }
         }
 
diff --git a/KernelBrowser.php b/KernelBrowser.php
index 8fb78790f..add2508ff 100644
--- a/KernelBrowser.php
+++ b/KernelBrowser.php
@@ -39,9 +39,6 @@ public function __construct(KernelInterface $kernel, array $server = [], ?Histor
         parent::__construct($kernel, $server, $history, $cookieJar);
     }
 
-    /**
-     * Returns the container.
-     */
     public function getContainer(): ContainerInterface
     {
         $container = $this->kernel->getContainer();
@@ -49,9 +46,6 @@ public function getContainer(): ContainerInterface
         return $container->has('test.service_container') ? $container->get('test.service_container') : $container;
     }
 
-    /**
-     * Returns the kernel.
-     */
     public function getKernel(): KernelInterface
     {
         return $this->kernel;
@@ -62,7 +56,7 @@ public function getKernel(): KernelInterface
      */
     public function getProfile(): HttpProfile|false|null
     {
-        if (null === $this->response || !$this->getContainer()->has('profiler')) {
+        if (!isset($this->response) || !$this->getContainer()->has('profiler')) {
             return false;
         }
 
@@ -73,10 +67,8 @@ public function getProfile(): HttpProfile|false|null
      * Enables the profiler for the very next request.
      *
      * If the profiler is not enabled, the call to this method does nothing.
-     *
-     * @return void
      */
-    public function enableProfiler()
+    public function enableProfiler(): void
     {
         if ($this->getContainer()->has('profiler')) {
             $this->profiler = true;
@@ -88,20 +80,16 @@ public function enableProfiler()
      *
      * By default, the Client reboots the Kernel for each request. This method
      * allows to keep the same kernel across requests.
-     *
-     * @return void
      */
-    public function disableReboot()
+    public function disableReboot(): void
     {
         $this->reboot = false;
     }
 
     /**
      * Enables kernel reboot between requests.
-     *
-     * @return void
      */
-    public function enableReboot()
+    public function enableReboot(): void
     {
         $this->reboot = true;
     }
@@ -112,24 +100,18 @@ public function enableReboot()
      *
      * @return $this
      */
-    public function loginUser(object $user, string $firewallContext = 'main'/* , array $tokenAttributes = [] */): static
+    public function loginUser(object $user, string $firewallContext = 'main', array $tokenAttributes = []): static
     {
-        $tokenAttributes = 2 < \func_num_args() ? func_get_arg(2) : [];
-
         if (!interface_exists(UserInterface::class)) {
-            throw new \LogicException(sprintf('"%s" requires symfony/security-core to be installed. Try running "composer require symfony/security-core".', __METHOD__));
+            throw new \LogicException(\sprintf('"%s" requires symfony/security-core to be installed. Try running "composer require symfony/security-core".', __METHOD__));
         }
 
         if (!$user instanceof UserInterface) {
-            throw new \LogicException(sprintf('The first argument of "%s" must be instance of "%s", "%s" provided.', __METHOD__, UserInterface::class, get_debug_type($user)));
+            throw new \LogicException(\sprintf('The first argument of "%s" must be instance of "%s", "%s" provided.', __METHOD__, UserInterface::class, get_debug_type($user)));
         }
 
         $token = new TestBrowserToken($user->getRoles(), $user, $firewallContext);
         $token->setAttributes($tokenAttributes);
-        // required for compatibility with Symfony 5.4
-        if (method_exists($token, 'isAuthenticated')) {
-            $token->setAuthenticated(true, false);
-        }
 
         $container = $this->getContainer();
         $container->get('security.untracked_token_storage')->setToken($token);
diff --git a/Resources/config/annotations.php b/Resources/config/annotations.php
deleted file mode 100644
index 7667acc5d..000000000
--- a/Resources/config/annotations.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\PsrCachedReader;
-use Doctrine\Common\Annotations\Reader;
-use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
-
-return static function (ContainerConfigurator $container) {
-    $container->services()
-        ->set('annotations.reader', AnnotationReader::class)
-            ->call('addGlobalIgnoredName', ['required']) // @deprecated since Symfony 6.3
-            ->deprecate('symfony/framework-bundle', '6.4', 'The "%service_id%" service is deprecated without replacement.')
-
-        ->set('annotations.cached_reader', PsrCachedReader::class)
-            ->args([
-                service('annotations.reader'),
-                inline_service(ArrayAdapter::class),
-                abstract_arg('Debug-Flag'),
-            ])
-            ->tag('annotations.cached_reader')
-            ->tag('container.do_not_inline')
-            ->deprecate('symfony/framework-bundle', '6.4', 'The "%service_id%" service is deprecated without replacement.')
-
-        ->set('annotations.filesystem_cache_adapter', FilesystemAdapter::class)
-            ->args([
-                '',
-                0,
-                abstract_arg('Cache-Directory'),
-            ])
-            ->deprecate('symfony/framework-bundle', '6.4', 'The "%service_id%" service is deprecated without replacement.')
-
-        ->set('annotations.cache_warmer', AnnotationsCacheWarmer::class)
-            ->args([
-                service('annotations.reader'),
-                param('kernel.cache_dir').'/annotations.php',
-                '#^Symfony\\\\(?:Component\\\\HttpKernel\\\\|Bundle\\\\FrameworkBundle\\\\Controller\\\\(?!.*Controller$))#',
-                param('kernel.debug'),
-                false,
-            ])
-            ->deprecate('symfony/framework-bundle', '6.4', 'The "%service_id%" service is deprecated without replacement.')
-
-        ->set('annotations.cache_adapter', PhpArrayAdapter::class)
-            ->factory([PhpArrayAdapter::class, 'create'])
-            ->args([
-                param('kernel.cache_dir').'/annotations.php',
-                service('cache.annotations'),
-            ])
-            ->tag('container.hot_path')
-            ->deprecate('symfony/framework-bundle', '6.4', 'The "%service_id%" service is deprecated without replacement.')
-
-        ->alias('annotation_reader', 'annotations.reader')
-            ->deprecate('symfony/framework-bundle', '6.4', 'The "%alias_id%" service alias is deprecated without replacement.')
-
-        ->alias(Reader::class, 'annotation_reader')
-            ->deprecate('symfony/framework-bundle', '6.4', 'The "%alias_id%" service alias is deprecated without replacement.')
-    ;
-};
diff --git a/Resources/config/cache.php b/Resources/config/cache.php
index 87207cf95..ad4dca42d 100644
--- a/Resources/config/cache.php
+++ b/Resources/config/cache.php
@@ -56,11 +56,6 @@
             ->private()
             ->tag('cache.pool')
 
-        ->set('cache.annotations')
-            ->parent('cache.system')
-            ->private()
-            ->tag('cache.pool')
-
         ->set('cache.property_info')
             ->parent('cache.system')
             ->private()
@@ -88,7 +83,7 @@
                 '', // namespace
                 0, // default lifetime
                 abstract_arg('version'),
-                sprintf('%s/pools/system', param('kernel.cache_dir')),
+                \sprintf('%s/pools/system', param('kernel.cache_dir')),
                 service('logger')->ignoreOnInvalid(),
             ])
             ->tag('cache.pool', ['clearer' => 'cache.system_clearer', 'reset' => 'reset'])
@@ -110,7 +105,7 @@
             ->args([
                 '', // namespace
                 0, // default lifetime
-                sprintf('%s/pools/app', param('kernel.cache_dir')),
+                \sprintf('%s/pools/app', param('kernel.cache_dir')),
                 service('cache.default_marshaller')->ignoreOnInvalid(),
             ])
             ->call('setLogger', [service('logger')->ignoreOnInvalid()])
diff --git a/Resources/config/collectors.php b/Resources/config/collectors.php
index aa6d4e33c..954ddeffa 100644
--- a/Resources/config/collectors.php
+++ b/Resources/config/collectors.php
@@ -56,7 +56,7 @@
         ->set('data_collector.logger', LoggerDataCollector::class)
             ->args([
                 service('logger')->ignoreOnInvalid(),
-                sprintf('%s/%s', param('kernel.build_dir'), param('kernel.container_class')),
+                \sprintf('%s/%s', param('kernel.build_dir'), param('kernel.container_class')),
                 service('.virtual_request_stack')->ignoreOnInvalid(),
             ])
             ->tag('monolog.logger', ['channel' => 'profiler'])
diff --git a/Resources/config/console.php b/Resources/config/console.php
index 334d20426..9df82e20e 100644
--- a/Resources/config/console.php
+++ b/Resources/config/console.php
@@ -33,6 +33,7 @@
 use Symfony\Bundle\FrameworkBundle\Command\SecretsGenerateKeysCommand;
 use Symfony\Bundle\FrameworkBundle\Command\SecretsListCommand;
 use Symfony\Bundle\FrameworkBundle\Command\SecretsRemoveCommand;
+use Symfony\Bundle\FrameworkBundle\Command\SecretsRevealCommand;
 use Symfony\Bundle\FrameworkBundle\Command\SecretsSetCommand;
 use Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand;
 use Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand;
@@ -53,6 +54,7 @@
 use Symfony\Component\Messenger\Command\StopWorkersCommand;
 use Symfony\Component\Scheduler\Command\DebugCommand as SchedulerDebugCommand;
 use Symfony\Component\Serializer\Command\DebugCommand as SerializerDebugCommand;
+use Symfony\Component\Translation\Command\TranslationLintCommand;
 use Symfony\Component\Translation\Command\TranslationPullCommand;
 use Symfony\Component\Translation\Command\TranslationPushCommand;
 use Symfony\Component\Translation\Command\XliffLintCommand;
@@ -316,6 +318,13 @@
         ->set('console.command.yaml_lint', YamlLintCommand::class)
             ->tag('console.command')
 
+        ->set('console.command.translation_lint', TranslationLintCommand::class)
+            ->args([
+                service('translator'),
+                param('kernel.enabled_locales'),
+            ])
+            ->tag('console.command')
+
         ->set('console.command.form_debug', \Symfony\Component\Form\Command\DebugCommand::class)
             ->args([
                 service('form.registry'),
@@ -355,6 +364,13 @@
             ])
             ->tag('console.command')
 
+        ->set('console.command.secrets_reveal', SecretsRevealCommand::class)
+            ->args([
+                service('secrets.vault'),
+                service('secrets.local_vault')->ignoreOnInvalid(),
+            ])
+            ->tag('console.command')
+
         ->set('console.command.secrets_decrypt_to_local', SecretsDecryptToLocalCommand::class)
             ->args([
                 service('secrets.vault'),
diff --git a/Resources/config/form_csrf.php b/Resources/config/form_csrf.php
index c8e5e973e..a86bb7c60 100644
--- a/Resources/config/form_csrf.php
+++ b/Resources/config/form_csrf.php
@@ -23,6 +23,8 @@
                 service('translator')->nullOnInvalid(),
                 param('validator.translation_domain'),
                 service('form.server_params'),
+                param('form.type_extension.csrf.field_attr'),
+                param('.form.type_extension.csrf.token_id'),
             ])
             ->tag('form.type_extension')
     ;
diff --git a/Resources/config/http_client.php b/Resources/config/http_client.php
index 593b78fdd..a562c2598 100644
--- a/Resources/config/http_client.php
+++ b/Resources/config/http_client.php
@@ -60,8 +60,6 @@
             ])
 
         ->alias(HttpAsyncClient::class, 'httplug.http_client')
-        ->alias(\Http\Client\HttpClient::class, 'httplug.http_client')
-            ->deprecate('symfony/framework-bundle', '6.3', 'The "%alias_id%" service is deprecated, use "'.ClientInterface::class.'" instead.')
 
         ->set('http_client.abstract_retry_strategy', GenericRetryStrategy::class)
             ->abstract()
diff --git a/Resources/config/mailer.php b/Resources/config/mailer.php
index 7a3a95739..f1dc560ab 100644
--- a/Resources/config/mailer.php
+++ b/Resources/config/mailer.php
@@ -45,7 +45,6 @@
                 tagged_iterator('mailer.transport_factory'),
             ])
 
-        ->set('mailer.default_transport', TransportInterface::class)
         ->alias('mailer.default_transport', 'mailer.transports')
         ->alias(TransportInterface::class, 'mailer.default_transport')
 
diff --git a/Resources/config/mailer_transports.php b/Resources/config/mailer_transports.php
index ed6e644a5..c0e7cc06a 100644
--- a/Resources/config/mailer_transports.php
+++ b/Resources/config/mailer_transports.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesTransportFactory;
+use Symfony\Component\Mailer\Bridge\Azure\Transport\AzureTransportFactory;
 use Symfony\Component\Mailer\Bridge\Brevo\Transport\BrevoTransportFactory;
 use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
 use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipTransportFactory;
@@ -19,12 +20,15 @@
 use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
 use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
+use Symfony\Component\Mailer\Bridge\Mailomat\Transport\MailomatTransportFactory;
 use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceTransportFactory;
-use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory;
+use Symfony\Component\Mailer\Bridge\Mailtrap\Transport\MailtrapTransportFactory;
+use Symfony\Component\Mailer\Bridge\Postal\Transport\PostalTransportFactory;
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
+use Symfony\Component\Mailer\Bridge\Resend\Transport\ResendTransportFactory;
 use Symfony\Component\Mailer\Bridge\Scaleway\Transport\ScalewayTransportFactory;
 use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
-use Symfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueTransportFactory;
+use Symfony\Component\Mailer\Bridge\Sweego\Transport\SweegoTransportFactory;
 use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
 use Symfony\Component\Mailer\Transport\NativeTransportFactory;
 use Symfony\Component\Mailer\Transport\NullTransportFactory;
@@ -40,77 +44,37 @@
                 service('http_client')->ignoreOnInvalid(),
                 service('logger')->ignoreOnInvalid(),
             ])
-            ->tag('monolog.logger', ['channel' => 'mailer'])
-
-        ->set('mailer.transport_factory.amazon', SesTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.brevo', BrevoTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.gmail', GmailTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.infobip', InfobipTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.mailersend', MailerSendTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.mailchimp', MandrillTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.mailjet', MailjetTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.mailgun', MailgunTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.mailpace', MailPaceTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.postmark', PostmarkTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.sendgrid', SendgridTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.null', NullTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.scaleway', ScalewayTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.sendmail', SendmailTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.sendinblue', SendinblueTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.ohmysmtp', OhMySmtpTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory')
-
-        ->set('mailer.transport_factory.smtp', EsmtpTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory', ['priority' => -100])
-
-        ->set('mailer.transport_factory.native', NativeTransportFactory::class)
-            ->parent('mailer.transport_factory.abstract')
-            ->tag('mailer.transport_factory');
+            ->tag('monolog.logger', ['channel' => 'mailer']);
+
+    $factories = [
+        'amazon' => SesTransportFactory::class,
+        'azure' => AzureTransportFactory::class,
+        'brevo' => BrevoTransportFactory::class,
+        'gmail' => GmailTransportFactory::class,
+        'infobip' => InfobipTransportFactory::class,
+        'mailchimp' => MandrillTransportFactory::class,
+        'mailersend' => MailerSendTransportFactory::class,
+        'mailgun' => MailgunTransportFactory::class,
+        'mailjet' => MailjetTransportFactory::class,
+        'mailomat' => MailomatTransportFactory::class,
+        'mailpace' => MailPaceTransportFactory::class,
+        'native' => NativeTransportFactory::class,
+        'null' => NullTransportFactory::class,
+        'postal' => PostalTransportFactory::class,
+        'postmark' => PostmarkTransportFactory::class,
+        'mailtrap' => MailtrapTransportFactory::class,
+        'resend' => ResendTransportFactory::class,
+        'scaleway' => ScalewayTransportFactory::class,
+        'sendgrid' => SendgridTransportFactory::class,
+        'sendmail' => SendmailTransportFactory::class,
+        'smtp' => EsmtpTransportFactory::class,
+        'sweego' => SweegoTransportFactory::class,
+    ];
+
+    foreach ($factories as $name => $class) {
+        $container->services()
+            ->set('mailer.transport_factory.'.$name, $class)
+                ->parent('mailer.transport_factory.abstract')
+                ->tag('mailer.transport_factory');
+    }
 };
diff --git a/Resources/config/mailer_webhook.php b/Resources/config/mailer_webhook.php
index bb487b36c..c574324db 100644
--- a/Resources/config/mailer_webhook.php
+++ b/Resources/config/mailer_webhook.php
@@ -13,14 +13,26 @@
 
 use Symfony\Component\Mailer\Bridge\Brevo\RemoteEvent\BrevoPayloadConverter;
 use Symfony\Component\Mailer\Bridge\Brevo\Webhook\BrevoRequestParser;
+use Symfony\Component\Mailer\Bridge\Mailchimp\RemoteEvent\MailchimpPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Mailchimp\Webhook\MailchimpRequestParser;
+use Symfony\Component\Mailer\Bridge\MailerSend\RemoteEvent\MailerSendPayloadConverter;
+use Symfony\Component\Mailer\Bridge\MailerSend\Webhook\MailerSendRequestParser;
 use Symfony\Component\Mailer\Bridge\Mailgun\RemoteEvent\MailgunPayloadConverter;
 use Symfony\Component\Mailer\Bridge\Mailgun\Webhook\MailgunRequestParser;
 use Symfony\Component\Mailer\Bridge\Mailjet\RemoteEvent\MailjetPayloadConverter;
 use Symfony\Component\Mailer\Bridge\Mailjet\Webhook\MailjetRequestParser;
+use Symfony\Component\Mailer\Bridge\Mailomat\RemoteEvent\MailomatPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Mailomat\Webhook\MailomatRequestParser;
+use Symfony\Component\Mailer\Bridge\Mailtrap\RemoteEvent\MailtrapPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Mailtrap\Webhook\MailtrapRequestParser;
 use Symfony\Component\Mailer\Bridge\Postmark\RemoteEvent\PostmarkPayloadConverter;
 use Symfony\Component\Mailer\Bridge\Postmark\Webhook\PostmarkRequestParser;
+use Symfony\Component\Mailer\Bridge\Resend\RemoteEvent\ResendPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Resend\Webhook\ResendRequestParser;
 use Symfony\Component\Mailer\Bridge\Sendgrid\RemoteEvent\SendgridPayloadConverter;
 use Symfony\Component\Mailer\Bridge\Sendgrid\Webhook\SendgridRequestParser;
+use Symfony\Component\Mailer\Bridge\Sweego\RemoteEvent\SweegoPayloadConverter;
+use Symfony\Component\Mailer\Bridge\Sweego\Webhook\SweegoRequestParser;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
@@ -29,6 +41,11 @@
             ->args([service('mailer.payload_converter.brevo')])
         ->alias(BrevoRequestParser::class, 'mailer.webhook.request_parser.brevo')
 
+        ->set('mailer.payload_converter.mailersend', MailerSendPayloadConverter::class)
+        ->set('mailer.webhook.request_parser.mailersend', MailerSendRequestParser::class)
+            ->args([service('mailer.payload_converter.mailersend')])
+        ->alias(MailerSendRequestParser::class, 'mailer.webhook.request_parser.mailersend')
+
         ->set('mailer.payload_converter.mailgun', MailgunPayloadConverter::class)
         ->set('mailer.webhook.request_parser.mailgun', MailgunRequestParser::class)
             ->args([service('mailer.payload_converter.mailgun')])
@@ -39,14 +56,39 @@
             ->args([service('mailer.payload_converter.mailjet')])
         ->alias(MailjetRequestParser::class, 'mailer.webhook.request_parser.mailjet')
 
+        ->set('mailer.payload_converter.mailomat', MailomatPayloadConverter::class)
+        ->set('mailer.webhook.request_parser.mailomat', MailomatRequestParser::class)
+            ->args([service('mailer.payload_converter.mailomat')])
+        ->alias(MailomatRequestParser::class, 'mailer.webhook.request_parser.mailomat')
+
         ->set('mailer.payload_converter.postmark', PostmarkPayloadConverter::class)
         ->set('mailer.webhook.request_parser.postmark', PostmarkRequestParser::class)
             ->args([service('mailer.payload_converter.postmark')])
         ->alias(PostmarkRequestParser::class, 'mailer.webhook.request_parser.postmark')
 
+        ->set('mailer.payload_converter.mailtrap', MailtrapPayloadConverter::class)
+        ->set('mailer.webhook.request_parser.mailtrap', MailtrapRequestParser::class)
+            ->args([service('mailer.payload_converter.mailtrap')])
+        ->alias(MailtrapRequestParser::class, 'mailer.webhook.request_parser.mailtrap')
+
+        ->set('mailer.payload_converter.resend', ResendPayloadConverter::class)
+        ->set('mailer.webhook.request_parser.resend', ResendRequestParser::class)
+            ->args([service('mailer.payload_converter.resend')])
+        ->alias(ResendRequestParser::class, 'mailer.webhook.request_parser.resend')
+
         ->set('mailer.payload_converter.sendgrid', SendgridPayloadConverter::class)
         ->set('mailer.webhook.request_parser.sendgrid', SendgridRequestParser::class)
             ->args([service('mailer.payload_converter.sendgrid')])
         ->alias(SendgridRequestParser::class, 'mailer.webhook.request_parser.sendgrid')
+
+        ->set('mailer.payload_converter.sweego', SweegoPayloadConverter::class)
+        ->set('mailer.webhook.request_parser.sweego', SweegoRequestParser::class)
+            ->args([service('mailer.payload_converter.sweego')])
+        ->alias(SweegoRequestParser::class, 'mailer.webhook.request_parser.sweego')
+
+        ->set('mailer.payload_converter.mailchimp', MailchimpPayloadConverter::class)
+        ->set('mailer.webhook.request_parser.mailchimp', MailchimpRequestParser::class)
+            ->args([service('mailer.payload_converter.mailchimp')])
+        ->alias(MailchimpRequestParser::class, 'mailer.webhook.request_parser.mailchimp')
     ;
 };
diff --git a/Resources/config/messenger.php b/Resources/config/messenger.php
index 5e4726265..40f5b84ca 100644
--- a/Resources/config/messenger.php
+++ b/Resources/config/messenger.php
@@ -23,7 +23,6 @@
 use Symfony\Component\Messenger\EventListener\SendFailedMessageToFailureTransportListener;
 use Symfony\Component\Messenger\EventListener\StopWorkerOnCustomStopExceptionListener;
 use Symfony\Component\Messenger\EventListener\StopWorkerOnRestartSignalListener;
-use Symfony\Component\Messenger\EventListener\StopWorkerOnSignalsListener;
 use Symfony\Component\Messenger\Handler\RedispatchMessageHandler;
 use Symfony\Component\Messenger\Middleware\AddBusNameStampMiddleware;
 use Symfony\Component\Messenger\Middleware\DispatchAfterCurrentBusMiddleware;
@@ -73,7 +72,7 @@
             ])
 
         ->set('serializer.normalizer.flatten_exception', FlattenExceptionNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => -880])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -880])
 
         ->set('messenger.transport.native_php_serializer', PhpSerializer::class)
         ->alias('messenger.default_serializer', 'messenger.transport.native_php_serializer')
@@ -136,6 +135,9 @@
             ->tag('messenger.transport_factory')
 
         ->set('messenger.transport.in_memory.factory', InMemoryTransportFactory::class)
+            ->args([
+                service('clock')->nullOnInvalid(),
+            ])
             ->tag('messenger.transport_factory')
             ->tag('kernel.reset', ['method' => 'reset'])
 
@@ -161,6 +163,7 @@
                 abstract_arg('delay ms'),
                 abstract_arg('multiplier'),
                 abstract_arg('max delay ms'),
+                abstract_arg('jitter'),
             ])
 
         // rate limiter
@@ -201,18 +204,6 @@
             ->tag('kernel.event_subscriber')
             ->tag('monolog.logger', ['channel' => 'messenger'])
 
-        ->set('messenger.listener.stop_worker_signals_listener', StopWorkerOnSignalsListener::class)
-            ->deprecate('6.4', 'symfony/messenger', 'The "%service_id%" service is deprecated, use the "Symfony\Component\Console\Command\SignalableCommandInterface" instead.')
-            ->args([
-                null,
-                service('logger')->ignoreOnInvalid(),
-            ])
-            ->tag('kernel.event_subscriber')
-            ->tag('monolog.logger', ['channel' => 'messenger'])
-
-        ->alias('messenger.listener.stop_worker_on_sigterm_signal_listener', 'messenger.listener.stop_worker_signals_listener')
-            ->deprecate('6.3', 'symfony/messenger', 'The "%alias_id%" service is deprecated, use the "Symfony\Component\Console\Command\SignalableCommandInterface" instead.')
-
         ->set('messenger.listener.stop_worker_on_stop_exception_listener', StopWorkerOnCustomStopExceptionListener::class)
             ->tag('kernel.event_subscriber')
 
diff --git a/Resources/config/notifier.php b/Resources/config/notifier.php
index bcc124820..28900ad10 100644
--- a/Resources/config/notifier.php
+++ b/Resources/config/notifier.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Notifier\Channel\BrowserChannel;
 use Symfony\Component\Notifier\Channel\ChannelPolicy;
 use Symfony\Component\Notifier\Channel\ChatChannel;
+use Symfony\Component\Notifier\Channel\DesktopChannel;
 use Symfony\Component\Notifier\Channel\EmailChannel;
 use Symfony\Component\Notifier\Channel\PushChannel;
 use Symfony\Component\Notifier\Channel\SmsChannel;
@@ -24,6 +25,7 @@
 use Symfony\Component\Notifier\EventListener\SendFailedMessageToNotifierListener;
 use Symfony\Component\Notifier\FlashMessage\DefaultFlashMessageImportanceMapper;
 use Symfony\Component\Notifier\Message\ChatMessage;
+use Symfony\Component\Notifier\Message\DesktopMessage;
 use Symfony\Component\Notifier\Message\PushMessage;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Messenger\MessageHandler;
@@ -79,6 +81,13 @@
             ])
             ->tag('notifier.channel', ['channel' => 'push'])
 
+        ->set('notifier.channel.desktop', DesktopChannel::class)
+            ->args([
+                service('texter.transports'),
+                abstract_arg('message bus'),
+            ])
+            ->tag('notifier.channel', ['channel' => 'desktop'])
+
         ->set('notifier.monolog_handler', NotifierHandler::class)
             ->args([service('notifier')])
 
@@ -131,9 +140,12 @@
 
         ->set('notifier.notification_logger_listener', NotificationLoggerListener::class)
             ->tag('kernel.event_subscriber')
-
-        ->alias('notifier.logger_notification_listener', 'notifier.notification_logger_listener')
-            ->deprecate('symfony/framework-bundle', '6.3', 'The "%alias_id%" service is deprecated, use "notifier.notification_logger_listener" instead.')
-
     ;
+
+    if (class_exists(DesktopMessage::class)) {
+        $container->services()
+            ->set('texter.messenger.desktop_handler', MessageHandler::class)
+                ->args([service('texter.transports')])
+                ->tag('messenger.message_handler', ['handles' => DesktopMessage::class]);
+    }
 };
diff --git a/Resources/config/notifier_transports.php b/Resources/config/notifier_transports.php
index 1a8936361..f28007dec 100644
--- a/Resources/config/notifier_transports.php
+++ b/Resources/config/notifier_transports.php
@@ -20,152 +20,112 @@
 
         ->set('notifier.transport_factory.abstract', AbstractTransportFactory::class)
             ->abstract()
-            ->args([service('event_dispatcher'), service('http_client')->ignoreOnInvalid()])
-
-        ->set('notifier.transport_factory.brevo', Bridge\Brevo\BrevoTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.slack', Bridge\Slack\SlackTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.linked-in', Bridge\LinkedIn\LinkedInTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.telegram', Bridge\Telegram\TelegramTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.mattermost', Bridge\Mattermost\MattermostTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.vonage', Bridge\Vonage\VonageTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.rocket-chat', Bridge\RocketChat\RocketChatTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.google-chat', Bridge\GoogleChat\GoogleChatTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.twilio', Bridge\Twilio\TwilioTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.twitter', Bridge\Twitter\TwitterTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.all-my-sms', Bridge\AllMySms\AllMySmsTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.firebase', Bridge\Firebase\FirebaseTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.forty-six-elks', Bridge\FortySixElks\FortySixElksTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.free-mobile', Bridge\FreeMobile\FreeMobileTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.spot-hit', Bridge\SpotHit\SpotHitTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.fake-chat', Bridge\FakeChat\FakeChatTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.fake-sms', Bridge\FakeSms\FakeSmsTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.ovh-cloud', Bridge\OvhCloud\OvhCloudTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.sinch', Bridge\Sinch\SinchTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.zulip', Bridge\Zulip\ZulipTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.infobip', Bridge\Infobip\InfobipTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.isendpro', Bridge\Isendpro\IsendproTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.mobyt', Bridge\Mobyt\MobytTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.smsapi', Bridge\Smsapi\SmsapiTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.esendex', Bridge\Esendex\EsendexTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.sendberry', Bridge\Sendberry\SendberryTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.sendinblue', Bridge\Sendinblue\SendinblueTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.iqsms', Bridge\Iqsms\IqsmsTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.octopush', Bridge\Octopush\OctopushTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.discord', Bridge\Discord\DiscordTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.microsoft-teams', Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.gateway-api', Bridge\GatewayApi\GatewayApiTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.mercure', Bridge\Mercure\MercureTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.gitter', Bridge\Gitter\GitterTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.clickatell', Bridge\Clickatell\ClickatellTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.contact-everyone', Bridge\ContactEveryone\ContactEveryoneTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
+            ->args([
+                service('event_dispatcher'),
+                service('http_client')->ignoreOnInvalid(),
+            ]);
+
+    $chatterFactories = [
+        'bluesky' => Bridge\Bluesky\BlueskyTransportFactory::class,
+        'chatwork' => Bridge\Chatwork\ChatworkTransportFactory::class,
+        'discord' => Bridge\Discord\DiscordTransportFactory::class,
+        'fake-chat' => Bridge\FakeChat\FakeChatTransportFactory::class,
+        'firebase' => Bridge\Firebase\FirebaseTransportFactory::class,
+        'google-chat' => Bridge\GoogleChat\GoogleChatTransportFactory::class,
+        'line-bot' => Bridge\LineBot\LineBotTransportFactory::class,
+        'line-notify' => Bridge\LineNotify\LineNotifyTransportFactory::class,
+        'linked-in' => Bridge\LinkedIn\LinkedInTransportFactory::class,
+        'mastodon' => Bridge\Mastodon\MastodonTransportFactory::class,
+        'mattermost' => Bridge\Mattermost\MattermostTransportFactory::class,
+        'mercure' => Bridge\Mercure\MercureTransportFactory::class,
+        'microsoft-teams' => Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory::class,
+        'pager-duty' => Bridge\PagerDuty\PagerDutyTransportFactory::class,
+        'rocket-chat' => Bridge\RocketChat\RocketChatTransportFactory::class,
+        'slack' => Bridge\Slack\SlackTransportFactory::class,
+        'telegram' => Bridge\Telegram\TelegramTransportFactory::class,
+        'twitter' => Bridge\Twitter\TwitterTransportFactory::class,
+        'zendesk' => Bridge\Zendesk\ZendeskTransportFactory::class,
+        'zulip' => Bridge\Zulip\ZulipTransportFactory::class,
+    ];
+
+    foreach ($chatterFactories as $name => $class) {
+        $container->services()
+            ->set('notifier.transport_factory.'.$name, $class)
+                ->parent('notifier.transport_factory.abstract')
+                ->tag('chatter.transport_factory');
+    }
+
+    $texterFactories = [
+        'all-my-sms' => Bridge\AllMySms\AllMySmsTransportFactory::class,
+        'bandwidth' => Bridge\Bandwidth\BandwidthTransportFactory::class,
+        'brevo' => Bridge\Brevo\BrevoTransportFactory::class,
+        'click-send' => Bridge\ClickSend\ClickSendTransportFactory::class,
+        'clickatell' => Bridge\Clickatell\ClickatellTransportFactory::class,
+        'contact-everyone' => Bridge\ContactEveryone\ContactEveryoneTransportFactory::class,
+        'engagespot' => Bridge\Engagespot\EngagespotTransportFactory::class,
+        'esendex' => Bridge\Esendex\EsendexTransportFactory::class,
+        'expo' => Bridge\Expo\ExpoTransportFactory::class,
+        'fake-sms' => Bridge\FakeSms\FakeSmsTransportFactory::class,
+        'forty-six-elks' => Bridge\FortySixElks\FortySixElksTransportFactory::class,
+        'free-mobile' => Bridge\FreeMobile\FreeMobileTransportFactory::class,
+        'gateway-api' => Bridge\GatewayApi\GatewayApiTransportFactory::class,
+        'go-ip' => Bridge\GoIp\GoIpTransportFactory::class,
+        'infobip' => Bridge\Infobip\InfobipTransportFactory::class,
+        'iqsms' => Bridge\Iqsms\IqsmsTransportFactory::class,
+        'isendpro' => Bridge\Isendpro\IsendproTransportFactory::class,
+        'joli-notif' => Bridge\JoliNotif\JoliNotifTransportFactory::class,
+        'kaz-info-teh' => Bridge\KazInfoTeh\KazInfoTehTransportFactory::class,
+        'light-sms' => Bridge\LightSms\LightSmsTransportFactory::class,
+        'lox24' => Bridge\Lox24\Lox24TransportFactory::class,
+        'mailjet' => Bridge\Mailjet\MailjetTransportFactory::class,
+        'message-bird' => Bridge\MessageBird\MessageBirdTransportFactory::class,
+        'message-media' => Bridge\MessageMedia\MessageMediaTransportFactory::class,
+        'mobyt' => Bridge\Mobyt\MobytTransportFactory::class,
+        'novu' => Bridge\Novu\NovuTransportFactory::class,
+        'ntfy' => Bridge\Ntfy\NtfyTransportFactory::class,
+        'octopush' => Bridge\Octopush\OctopushTransportFactory::class,
+        'one-signal' => Bridge\OneSignal\OneSignalTransportFactory::class,
+        'orange-sms' => Bridge\OrangeSms\OrangeSmsTransportFactory::class,
+        'ovh-cloud' => Bridge\OvhCloud\OvhCloudTransportFactory::class,
+        'plivo' => Bridge\Plivo\PlivoTransportFactory::class,
+        'primotexto' => Bridge\Primotexto\PrimotextoTransportFactory::class,
+        'pushover' => Bridge\Pushover\PushoverTransportFactory::class,
+        'pushy' => Bridge\Pushy\PushyTransportFactory::class,
+        'redlink' => Bridge\Redlink\RedlinkTransportFactory::class,
+        'ring-central' => Bridge\RingCentral\RingCentralTransportFactory::class,
+        'sendberry' => Bridge\Sendberry\SendberryTransportFactory::class,
+        'sevenio' => Bridge\Sevenio\SevenIoTransportFactory::class,
+        'sipgate' => Bridge\Sipgate\SipgateTransportFactory::class,
+        'simple-textin' => Bridge\SimpleTextin\SimpleTextinTransportFactory::class,
+        'sinch' => Bridge\Sinch\SinchTransportFactory::class,
+        'sms-biuras' => Bridge\SmsBiuras\SmsBiurasTransportFactory::class,
+        'sms-factor' => Bridge\SmsFactor\SmsFactorTransportFactory::class,
+        'sms-sluzba' => Bridge\SmsSluzba\SmsSluzbaTransportFactory::class,
+        'sms77' => Bridge\Sms77\Sms77TransportFactory::class,
+        'smsapi' => Bridge\Smsapi\SmsapiTransportFactory::class,
+        'smsbox' => Bridge\Smsbox\SmsboxTransportFactory::class,
+        'smsc' => Bridge\Smsc\SmscTransportFactory::class,
+        'smsense' => Bridge\Smsense\SmsenseTransportFactory::class,
+        'smsmode' => Bridge\Smsmode\SmsmodeTransportFactory::class,
+        'spot-hit' => Bridge\SpotHit\SpotHitTransportFactory::class,
+        'sweego' => Bridge\Sweego\SweegoTransportFactory::class,
+        'telnyx' => Bridge\Telnyx\TelnyxTransportFactory::class,
+        'termii' => Bridge\Termii\TermiiTransportFactory::class,
+        'turbo-sms' => Bridge\TurboSms\TurboSmsTransportFactory::class,
+        'twilio' => Bridge\Twilio\TwilioTransportFactory::class,
+        'unifonic' => Bridge\Unifonic\UnifonicTransportFactory::class,
+        'vonage' => Bridge\Vonage\VonageTransportFactory::class,
+        'yunpian' => Bridge\Yunpian\YunpianTransportFactory::class,
+    ];
+
+    foreach ($texterFactories as $name => $class) {
+        $container->services()
+            ->set('notifier.transport_factory.'.$name, $class)
+                ->parent('notifier.transport_factory.abstract')
+                ->tag('texter.transport_factory');
+    }
 
+    $container->services()
         ->set('notifier.transport_factory.amazon-sns', Bridge\AmazonSns\AmazonSnsTransportFactory::class)
             ->parent('notifier.transport_factory.abstract')
             ->tag('texter.transport_factory')
@@ -175,136 +135,5 @@
             ->parent('notifier.transport_factory.abstract')
             ->tag('chatter.transport_factory')
             ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.light-sms', Bridge\LightSms\LightSmsTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.sms-biuras', Bridge\SmsBiuras\SmsBiurasTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.smsc', Bridge\Smsc\SmscTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.sms-factor', Bridge\SmsFactor\SmsFactorTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.message-bird', Bridge\MessageBird\MessageBirdTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.message-media', Bridge\MessageMedia\MessageMediaTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.telnyx', Bridge\Telnyx\TelnyxTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.mailjet', Bridge\Mailjet\MailjetTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.yunpian', Bridge\Yunpian\YunpianTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.turbo-sms', Bridge\TurboSms\TurboSmsTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.sms77', Bridge\Sms77\Sms77TransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.one-signal', Bridge\OneSignal\OneSignalTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.orange-sms', Bridge\OrangeSms\OrangeSmsTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.expo', Bridge\Expo\ExpoTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.kaz-info-teh', Bridge\KazInfoTeh\KazInfoTehTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.engagespot', Bridge\Engagespot\EngagespotTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.zendesk', Bridge\Zendesk\ZendeskTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.chatwork', Bridge\Chatwork\ChatworkTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.termii', Bridge\Termii\TermiiTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.ring-central', Bridge\RingCentral\RingCentralTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.plivo', Bridge\Plivo\PlivoTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.bandwidth', Bridge\Bandwidth\BandwidthTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.line-notify', Bridge\LineNotify\LineNotifyTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.mastodon', Bridge\Mastodon\MastodonTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.pager-duty', Bridge\PagerDuty\PagerDutyTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('chatter.transport_factory')
-
-        ->set('notifier.transport_factory.pushover', Bridge\Pushover\PushoverTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.simple-textin', Bridge\SimpleTextin\SimpleTextinTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.click-send', Bridge\ClickSend\ClickSendTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.smsmode', Bridge\Smsmode\SmsmodeTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.novu', Bridge\Novu\NovuTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.ntfy', Bridge\Ntfy\NtfyTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-
-        ->set('notifier.transport_factory.redlink', Bridge\Redlink\RedlinkTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
-        ->set('notifier.transport_factory.go-ip', Bridge\GoIp\GoIpTransportFactory::class)
-            ->parent('notifier.transport_factory.abstract')
-            ->tag('texter.transport_factory')
     ;
 };
diff --git a/Resources/config/notifier_webhook.php b/Resources/config/notifier_webhook.php
index fc541fd99..6447f4139 100644
--- a/Resources/config/notifier_webhook.php
+++ b/Resources/config/notifier_webhook.php
@@ -11,11 +11,15 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Symfony\Component\Notifier\Bridge\Sweego\Webhook\SweegoRequestParser;
 use Symfony\Component\Notifier\Bridge\Twilio\Webhook\TwilioRequestParser;
 use Symfony\Component\Notifier\Bridge\Vonage\Webhook\VonageRequestParser;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
+        ->set('notifier.webhook.request_parser.sweego', SweegoRequestParser::class)
+        ->alias(SweegoRequestParser::class, 'notifier.webhook.request_parser.sweego')
+
         ->set('notifier.webhook.request_parser.twilio', TwilioRequestParser::class)
         ->alias(TwilioRequestParser::class, 'notifier.webhook.request_parser.twilio')
 
diff --git a/Resources/config/routing.php b/Resources/config/routing.php
index 5fc0cbb3e..8cdbbf33a 100644
--- a/Resources/config/routing.php
+++ b/Resources/config/routing.php
@@ -98,9 +98,6 @@
             ])
             ->tag('routing.loader', ['priority' => -10])
 
-        ->alias('routing.loader.annotation', 'routing.loader.attribute')
-            ->deprecate('symfony/routing', '6.4', 'The "%alias_id%" service is deprecated, use the "routing.loader.attribute" service instead.')
-
         ->set('routing.loader.attribute.directory', AttributeDirectoryLoader::class)
             ->args([
                 service('file_locator'),
@@ -108,9 +105,6 @@
             ])
             ->tag('routing.loader', ['priority' => -10])
 
-        ->alias('routing.loader.annotation.directory', 'routing.loader.attribute.directory')
-            ->deprecate('symfony/routing', '6.4', 'The "%alias_id%" service is deprecated, use the "routing.loader.attribute.directory" service instead.')
-
         ->set('routing.loader.attribute.file', AttributeFileLoader::class)
             ->args([
                 service('file_locator'),
@@ -118,9 +112,6 @@
             ])
             ->tag('routing.loader', ['priority' => -10])
 
-        ->alias('routing.loader.annotation.file', 'routing.loader.attribute.file')
-            ->deprecate('symfony/routing', '6.4', 'The "%alias_id%" service is deprecated, use the "routing.loader.attribute.file" service instead.')
-
         ->set('routing.loader.psr4', Psr4DirectoryLoader::class)
             ->args([
                 service('file_locator'),
diff --git a/Resources/config/schema/symfony-1.0.xsd b/Resources/config/schema/symfony-1.0.xsd
index 7d9828eeb..491cd1e4f 100644
--- a/Resources/config/schema/symfony-1.0.xsd
+++ b/Resources/config/schema/symfony-1.0.xsd
@@ -27,12 +27,12 @@
             <xsd:element name="property-access" type="property_access" minOccurs="0" maxOccurs="1" />
             <xsd:element name="scheduler" type="scheduler" minOccurs="0" maxOccurs="1" />
             <xsd:element name="serializer" type="serializer" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="type-info" type="type_info" minOccurs="0" maxOccurs="1" />
             <xsd:element name="property-info" type="property_info" minOccurs="0" maxOccurs="1" />
             <xsd:element name="cache" type="cache" minOccurs="0" maxOccurs="1" />
             <xsd:element name="workflow" type="workflow" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="php-errors" type="php-errors" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="exceptions" type="exceptions" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="exception" type="new-exception" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="exception" type="exception" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="lock" type="lock" minOccurs="0" maxOccurs="1" />
             <xsd:element name="semaphore" type="semaphore" minOccurs="0" maxOccurs="1" />
             <xsd:element name="messenger" type="messenger" minOccurs="0" maxOccurs="1" />
@@ -68,16 +68,28 @@
             <xsd:element name="csrf-protection" type="form_csrf_protection" minOccurs="0" maxOccurs="1" />
         </xsd:all>
         <xsd:attribute name="enabled" type="xsd:boolean" />
-        <xsd:attribute name="legacy-error-messages" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:complexType name="form_csrf_protection">
+        <xsd:sequence>
+            <xsd:element name="field-attr" type="field_attr" minOccurs="0" maxOccurs="unbounded" />
+        </xsd:sequence>
         <xsd:attribute name="enabled" type="xsd:boolean" />
+        <xsd:attribute name="token-id" type="xsd:string" />
         <xsd:attribute name="field-name" type="xsd:string" />
     </xsd:complexType>
 
+    <xsd:complexType name="field_attr">
+        <xsd:attribute name="name" type="xsd:string" use="required"/>
+    </xsd:complexType>
+
     <xsd:complexType name="csrf_protection">
+        <xsd:sequence>
+            <xsd:element name="stateless-token-id" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+        </xsd:sequence>
         <xsd:attribute name="enabled" type="xsd:boolean" />
+        <xsd:attribute name="check-header" type="xsd:string" />
+        <xsd:attribute name="cookie-name" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:complexType name="esi">
@@ -271,7 +283,6 @@
 
         <xsd:attribute name="enabled" type="xsd:boolean" />
         <xsd:attribute name="cache" type="xsd:string" />
-        <xsd:attribute name="enable-annotations" type="xsd:boolean" />
         <xsd:attribute name="enable-attributes" type="xsd:boolean" />
         <xsd:attribute name="static-method" type="xsd:boolean" />
         <xsd:attribute name="translation-domain" type="xsd:string" />
@@ -328,15 +339,29 @@
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="mapping" type="file_mapping" />
             <xsd:element name="default-context" type="metadata" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="named-serializer" type="named_serializer_options" />
         </xsd:choice>
         <xsd:attribute name="enabled" type="xsd:boolean" />
-        <xsd:attribute name="enable-annotations" type="xsd:boolean" />
         <xsd:attribute name="enable-attributes" type="xsd:boolean" />
         <xsd:attribute name="name-converter" type="xsd:string" />
         <xsd:attribute name="circular-reference-handler" type="xsd:string" />
         <xsd:attribute name="max-depth-handler" type="xsd:string" />
     </xsd:complexType>
 
+    <xsd:complexType name="type_info">
+        <xsd:attribute name="enabled" type="xsd:boolean" />
+    </xsd:complexType>
+
+    <xsd:complexType name="named_serializer_options">
+        <xsd:sequence>
+            <xsd:element name="default-context" type="metadata" minOccurs="0" maxOccurs="1" />
+        </xsd:sequence>
+        <xsd:attribute name="name" type="xsd:string" />
+        <xsd:attribute name="name-converter" type="xsd:string" />
+        <xsd:attribute name="include-built-in-normalizers" type="xsd:boolean" />
+        <xsd:attribute name="include-built-in-encoders" type="xsd:boolean" />
+    </xsd:complexType>
+
     <xsd:complexType name="property_info">
         <xsd:attribute name="enabled" type="xsd:boolean" />
     </xsd:complexType>
@@ -421,31 +446,10 @@
         <xsd:attribute name="enabled" type="xsd:boolean" />
     </xsd:complexType>
 
-    <xsd:complexType name="exceptions">
-        <xsd:sequence>
-            <xsd:element name="exception" type="old-exception" minOccurs="0" maxOccurs="unbounded" />
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="exception" abstract="true">
+    <xsd:complexType name="exception">
         <xsd:attribute name="log-level" type="xsd:string" />
         <xsd:attribute name="status-code" type="xsd:integer" />
-    </xsd:complexType>
-
-    <xsd:complexType name="old-exception">
-        <xsd:complexContent>
-            <xsd:extension base="exception">
-                <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:extension>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="new-exception">
-        <xsd:complexContent>
-            <xsd:extension base="exception">
-                <xsd:attribute name="class" type="xsd:string" use="required" />
-            </xsd:extension>
-        </xsd:complexContent>
+        <xsd:attribute name="class" type="xsd:string" use="required" />
     </xsd:complexType>
 
     <xsd:complexType name="marking_store">
@@ -595,7 +599,6 @@
         <xsd:attribute name="default-bus" type="xsd:string" />
         <xsd:attribute name="enabled" type="xsd:boolean" />
         <xsd:attribute name="failure-transport" type="xsd:string" />
-        <xsd:attribute name="reset-on-message" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:complexType name="messenger_serializer">
@@ -641,6 +644,7 @@
         <xsd:attribute name="delay" type="xsd:integer" />
         <xsd:attribute name="multiplier" type="xsd:float" />
         <xsd:attribute name="max-delay" type="xsd:float" />
+        <xsd:attribute name="jitter" type="xsd:float" />
     </xsd:complexType>
 
     <xsd:complexType name="messenger_bus">
@@ -692,6 +696,7 @@
         <xsd:attribute name="local-pk" type="xsd:string" />
         <xsd:attribute name="passphrase" type="xsd:string" />
         <xsd:attribute name="ciphers" type="xsd:string" />
+        <xsd:attribute name="rate-limiter" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:complexType name="http_client_scope_options" mixed="true">
@@ -722,6 +727,7 @@
         <xsd:attribute name="local-pk" type="xsd:string" />
         <xsd:attribute name="passphrase" type="xsd:string" />
         <xsd:attribute name="ciphers" type="xsd:string" />
+        <xsd:attribute name="rate-limiter" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:complexType name="fingerprint">
@@ -788,6 +794,7 @@
         <xsd:sequence>
             <xsd:element name="sender" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="recipient" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="allowed-recipient" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
     </xsd:complexType>
 
diff --git a/Resources/config/secrets.php b/Resources/config/secrets.php
index a21d28270..a82f397b8 100644
--- a/Resources/config/secrets.php
+++ b/Resources/config/secrets.php
@@ -13,6 +13,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Secrets\DotenvVault;
 use Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault;
+use Symfony\Component\DependencyInjection\StaticEnvVarLoader;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
@@ -20,7 +21,11 @@
             ->args([
                 abstract_arg('Secret dir, set in FrameworkExtension'),
                 service('secrets.decryption_key')->ignoreOnInvalid(),
+                abstract_arg('Secret env var, set in FrameworkExtension'),
             ])
+
+        ->set('secrets.env_var_loader', StaticEnvVarLoader::class)
+            ->args([service('secrets.vault')])
             ->tag('container.env_var_loader')
 
         ->set('secrets.decryption_key')
diff --git a/Resources/config/security_csrf.php b/Resources/config/security_csrf.php
index bad2284bf..ca5d69be3 100644
--- a/Resources/config/security_csrf.php
+++ b/Resources/config/security_csrf.php
@@ -15,6 +15,7 @@
 use Symfony\Bridge\Twig\Extension\CsrfRuntime;
 use Symfony\Component\Security\Csrf\CsrfTokenManager;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+use Symfony\Component\Security\Csrf\SameOriginCsrfTokenManager;
 use Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface;
 use Symfony\Component\Security\Csrf\TokenGenerator\UriSafeTokenGenerator;
 use Symfony\Component\Security\Csrf\TokenStorage\SessionTokenStorage;
@@ -46,5 +47,18 @@
 
         ->set('twig.extension.security_csrf', CsrfExtension::class)
             ->tag('twig.extension')
+
+        ->set('security.csrf.same_origin_token_manager', SameOriginCsrfTokenManager::class)
+            ->decorate('security.csrf.token_manager')
+            ->args([
+                service('request_stack'),
+                service('logger')->nullOnInvalid(),
+                service('.inner'),
+                abstract_arg('framework.csrf_protection.stateless_token_ids'),
+                abstract_arg('framework.csrf_protection.check_header'),
+                abstract_arg('framework.csrf_protection.cookie_name'),
+            ])
+            ->tag('monolog.logger', ['channel' => 'request'])
+            ->tag('kernel.event_listener', ['event' => 'kernel.response', 'method' => 'onKernelResponse'])
     ;
 };
diff --git a/Resources/config/serializer.php b/Resources/config/serializer.php
index c29258d52..b291f51ac 100644
--- a/Resources/config/serializer.php
+++ b/Resources/config/serializer.php
@@ -31,6 +31,7 @@
 use Symfony\Component\Serializer\Mapping\Loader\LoaderChain;
 use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
 use Symfony\Component\Serializer\NameConverter\MetadataAwareNameConverter;
+use Symfony\Component\Serializer\NameConverter\SnakeCaseToCamelCaseNameConverter;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\Normalizer\BackedEnumNormalizer;
 use Symfony\Component\Serializer\Normalizer\ConstraintViolationListNormalizer;
@@ -42,7 +43,6 @@
 use Symfony\Component\Serializer\Normalizer\FormErrorNormalizer;
 use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
 use Symfony\Component\Serializer\Normalizer\MimeMessageNormalizer;
-use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Symfony\Component\Serializer\Normalizer\ProblemNormalizer;
@@ -80,46 +80,46 @@
         ->set('serializer.normalizer.constraint_violation_list', ConstraintViolationListNormalizer::class)
             ->args([1 => service('serializer.name_converter.metadata_aware')])
             ->autowire(true)
-            ->tag('serializer.normalizer', ['priority' => -915])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -915])
 
         ->set('serializer.normalizer.mime_message', MimeMessageNormalizer::class)
             ->args([service('serializer.normalizer.property')])
-            ->tag('serializer.normalizer', ['priority' => -915])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -915])
 
         ->set('serializer.normalizer.datetimezone', DateTimeZoneNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => -915])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -915])
 
         ->set('serializer.normalizer.dateinterval', DateIntervalNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => -915])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -915])
 
         ->set('serializer.normalizer.data_uri', DataUriNormalizer::class)
             ->args([service('mime_types')->nullOnInvalid()])
-            ->tag('serializer.normalizer', ['priority' => -920])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -920])
 
         ->set('serializer.normalizer.datetime', DateTimeNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => -910])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -910])
 
         ->set('serializer.normalizer.json_serializable', JsonSerializableNormalizer::class)
             ->args([null, null])
-            ->tag('serializer.normalizer', ['priority' => -950])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -950])
 
         ->set('serializer.normalizer.problem', ProblemNormalizer::class)
             ->args([param('kernel.debug'), '$translator' => service('translator')->nullOnInvalid()])
-            ->tag('serializer.normalizer', ['priority' => -890])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -890])
 
         ->set('serializer.denormalizer.unwrapping', UnwrappingDenormalizer::class)
             ->args([service('serializer.property_accessor')])
-            ->tag('serializer.normalizer', ['priority' => 1000])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => 1000])
 
         ->set('serializer.normalizer.uid', UidNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => -890])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -890])
 
         ->set('serializer.normalizer.translatable', TranslatableNormalizer::class)
             ->args(['$translator' => service('translator')])
-            ->tag('serializer.normalizer', ['priority' => -920])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -920])
 
         ->set('serializer.normalizer.form_error', FormErrorNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => -915])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -915])
 
         ->set('serializer.normalizer.object', ObjectNormalizer::class)
             ->args([
@@ -129,13 +129,10 @@
                 service('property_info')->ignoreOnInvalid(),
                 service('serializer.mapping.class_discriminator_resolver')->ignoreOnInvalid(),
                 null,
-                null,
+                abstract_arg('default context, set in the SerializerPass'),
                 service('property_info')->ignoreOnInvalid(),
             ])
-            ->tag('serializer.normalizer', ['priority' => -1000])
-
-        ->alias(ObjectNormalizer::class, 'serializer.normalizer.object')
-            ->deprecate('symfony/serializer', '6.2', 'The "%alias_id%" service alias is deprecated, type-hint against "'.NormalizerInterface::class.'" or implement "'.NormalizerAwareInterface::class.'" instead.')
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -1000])
 
         ->set('serializer.normalizer.property', PropertyNormalizer::class)
             ->args([
@@ -146,11 +143,8 @@
                 null,
             ])
 
-        ->alias(PropertyNormalizer::class, 'serializer.normalizer.property')
-            ->deprecate('symfony/serializer', '6.2', 'The "%alias_id%" service alias is deprecated, type-hint against "'.NormalizerInterface::class.'" or implement "'.NormalizerAwareInterface::class.'" instead.')
-
         ->set('serializer.denormalizer.array', ArrayDenormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => -990])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -990])
 
         // Loader
         ->set('serializer.mapping.chain_loader', LoaderChain::class)
@@ -180,25 +174,30 @@
 
         // Encoders
         ->set('serializer.encoder.xml', XmlEncoder::class)
-            ->tag('serializer.encoder')
+            ->tag('serializer.encoder', ['built_in' => true])
 
         ->set('serializer.encoder.json', JsonEncoder::class)
             ->args([null, null])
-            ->tag('serializer.encoder')
+            ->tag('serializer.encoder', ['built_in' => true])
 
         ->set('serializer.encoder.yaml', YamlEncoder::class)
             ->args([null, null])
-            ->tag('serializer.encoder')
+            ->tag('serializer.encoder', ['built_in' => true])
 
         ->set('serializer.encoder.csv', CsvEncoder::class)
-            ->tag('serializer.encoder')
+            ->tag('serializer.encoder', ['built_in' => true])
 
-        // Name converter
+        // Name converters
         ->set('serializer.name_converter.camel_case_to_snake_case', CamelCaseToSnakeCaseNameConverter::class)
+        ->set('serializer.name_converter.snake_case_to_camel_case', SnakeCaseToCamelCaseNameConverter::class)
 
-        ->set('serializer.name_converter.metadata_aware', MetadataAwareNameConverter::class)
+        ->set('serializer.name_converter.metadata_aware.abstract', MetadataAwareNameConverter::class)
+            ->abstract()
             ->args([service('serializer.mapping.class_metadata_factory')])
 
+        ->set('serializer.name_converter.metadata_aware')
+            ->parent('serializer.name_converter.metadata_aware.abstract')
+
         // PropertyInfo extractor
         ->set('property_info.serializer_extractor', SerializerExtractor::class)
             ->args([service('serializer.mapping.class_metadata_factory')])
@@ -221,6 +220,6 @@
             ])
 
         ->set('serializer.normalizer.backed_enum', BackedEnumNormalizer::class)
-            ->tag('serializer.normalizer', ['priority' => -915])
+            ->tag('serializer.normalizer', ['built_in' => true, 'priority' => -915])
     ;
 };
diff --git a/Resources/config/serializer_debug.php b/Resources/config/serializer_debug.php
index 45b764fdd..520d145cb 100644
--- a/Resources/config/serializer_debug.php
+++ b/Resources/config/serializer_debug.php
@@ -21,6 +21,7 @@
             ->args([
                 service('debug.serializer.inner'),
                 service('serializer.data_collector'),
+                'default',
             ])
 
         ->set('serializer.data_collector', SerializerDataCollector::class)
diff --git a/Resources/config/services.php b/Resources/config/services.php
index 5f280bdfb..e5a86d8f4 100644
--- a/Resources/config/services.php
+++ b/Resources/config/services.php
@@ -23,6 +23,7 @@
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker;
 use Symfony\Component\DependencyInjection\EnvVarProcessor;
+use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\ParameterBag\ContainerBag;
 use Symfony\Component\DependencyInjection\ParameterBag\ContainerBagInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
@@ -48,7 +49,6 @@
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Component\HttpKernel\UriSigner as HttpKernelUriSigner;
 use Symfony\Component\Runtime\Runner\Symfony\HttpKernelRunner;
 use Symfony\Component\Runtime\Runner\Symfony\ResponseRunner;
 use Symfony\Component\Runtime\SymfonyRuntime;
@@ -131,7 +131,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
             ->args([
                 tagged_iterator('kernel.cache_warmer'),
                 param('kernel.debug'),
-                sprintf('%s/%sDeprecations.log', param('kernel.build_dir'), param('kernel.container_class')),
+                \sprintf('%s/%sDeprecations.log', param('kernel.build_dir'), param('kernel.container_class')),
             ])
             ->tag('container.no_preload')
 
@@ -156,11 +156,10 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
 
         ->set('uri_signer', UriSigner::class)
             ->args([
-                param('kernel.secret'),
+                new Parameter('kernel.secret'),
             ])
+            ->lazy()
         ->alias(UriSigner::class, 'uri_signer')
-        ->alias(HttpKernelUriSigner::class, 'uri_signer')
-            ->deprecate('symfony/framework-bundle', '6.4', 'The "%alias_id%" alias is deprecated, use "'.UriSigner::class.'" instead.')
 
         ->set('config_cache_factory', ResourceCheckerConfigCacheFactory::class)
             ->args([
@@ -199,6 +198,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
                 tagged_iterator('container.env_var_loader'),
             ])
             ->tag('container.env_var_processor')
+            ->tag('kernel.reset', ['method' => 'reset'])
 
         ->set('slugger', AsciiSlugger::class)
             ->args([
diff --git a/Resources/config/translation.php b/Resources/config/translation.php
index dcfa2bc15..a450e6894 100644
--- a/Resources/config/translation.php
+++ b/Resources/config/translation.php
@@ -27,7 +27,6 @@
 use Symfony\Component\Translation\Extractor\ChainExtractor;
 use Symfony\Component\Translation\Extractor\ExtractorInterface;
 use Symfony\Component\Translation\Extractor\PhpAstExtractor;
-use Symfony\Component\Translation\Extractor\PhpExtractor;
 use Symfony\Component\Translation\Extractor\Visitor\ConstraintVisitor;
 use Symfony\Component\Translation\Extractor\Visitor\TranslatableMessageVisitor;
 use Symfony\Component\Translation\Extractor\Visitor\TransMethodVisitor;
@@ -152,10 +151,6 @@
         ->set('translation.dumper.res', IcuResFileDumper::class)
             ->tag('translation.dumper', ['alias' => 'res'])
 
-        ->set('translation.extractor.php', PhpExtractor::class)
-            ->deprecate('symfony/framework-bundle', '6.2', 'The "%service_id%" service is deprecated, use "translation.extractor.php_ast" instead.')
-            ->tag('translation.extractor', ['alias' => 'php'])
-
         ->set('translation.extractor.php_ast', PhpAstExtractor::class)
             ->args([tagged_iterator('translation.extractor.visitor')])
             ->tag('translation.extractor', ['alias' => 'php'])
diff --git a/Resources/config/type_info.php b/Resources/config/type_info.php
new file mode 100644
index 000000000..71e3646a1
--- /dev/null
+++ b/Resources/config/type_info.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
+use Symfony\Component\TypeInfo\TypeResolver\ReflectionParameterTypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\ReflectionPropertyTypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\ReflectionReturnTypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\ReflectionTypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\TypeResolver;
+use Symfony\Component\TypeInfo\TypeResolver\TypeResolverInterface;
+
+return static function (ContainerConfigurator $container) {
+    $container->services()
+        // type context
+        ->set('type_info.type_context_factory', TypeContextFactory::class)
+            ->args([service('type_info.resolver.string')->nullOnInvalid()])
+
+        // type resolvers
+        ->set('type_info.resolver', TypeResolver::class)
+            ->args([service_locator([
+                \ReflectionType::class => service('type_info.resolver.reflection_type'),
+                \ReflectionParameter::class => service('type_info.resolver.reflection_parameter'),
+                \ReflectionProperty::class => service('type_info.resolver.reflection_property'),
+                \ReflectionFunctionAbstract::class => service('type_info.resolver.reflection_return'),
+            ])])
+        ->alias(TypeResolverInterface::class, 'type_info.resolver')
+
+        ->set('type_info.resolver.reflection_type', ReflectionTypeResolver::class)
+            ->args([service('type_info.type_context_factory')])
+
+        ->set('type_info.resolver.reflection_parameter', ReflectionParameterTypeResolver::class)
+            ->args([service('type_info.resolver.reflection_type'), service('type_info.type_context_factory')])
+
+        ->set('type_info.resolver.reflection_property', ReflectionPropertyTypeResolver::class)
+            ->args([service('type_info.resolver.reflection_type'), service('type_info.type_context_factory')])
+
+        ->set('type_info.resolver.reflection_return', ReflectionReturnTypeResolver::class)
+            ->args([service('type_info.resolver.reflection_type'), service('type_info.type_context_factory')])
+    ;
+};
diff --git a/Resources/config/web.php b/Resources/config/web.php
index 6710dabda..6f8358fb0 100644
--- a/Resources/config/web.php
+++ b/Resources/config/web.php
@@ -71,6 +71,7 @@
                 service('serializer'),
                 service('validator')->nullOnInvalid(),
                 service('translator')->nullOnInvalid(),
+                param('validator.translation_domain'),
             ])
             ->tag('controller.targeted_value_resolver', ['name' => RequestPayloadValueResolver::class])
             ->tag('kernel.event_subscriber')
diff --git a/Resources/config/webhook.php b/Resources/config/webhook.php
index a7e9d58ce..85cf9bb40 100644
--- a/Resources/config/webhook.php
+++ b/Resources/config/webhook.php
@@ -17,6 +17,8 @@
 use Symfony\Component\Webhook\Server\HeadersConfigurator;
 use Symfony\Component\Webhook\Server\HeaderSignatureConfigurator;
 use Symfony\Component\Webhook\Server\JsonBodyConfigurator;
+use Symfony\Component\Webhook\Server\NativeJsonPayloadSerializer;
+use Symfony\Component\Webhook\Server\SerializerPayloadSerializer;
 use Symfony\Component\Webhook\Server\Transport;
 
 return static function (ContainerConfigurator $container) {
@@ -32,6 +34,13 @@
         ->set('webhook.headers_configurator', HeadersConfigurator::class)
 
         ->set('webhook.body_configurator.json', JsonBodyConfigurator::class)
+            ->args([
+                abstract_arg('payload serializer'),
+            ])
+
+        ->set('webhook.payload_serializer.json', NativeJsonPayloadSerializer::class)
+
+        ->set('webhook.payload_serializer.serializer', SerializerPayloadSerializer::class)
             ->args([
                 service('serializer'),
             ])
diff --git a/Routing/AnnotatedRouteControllerLoader.php b/Routing/AnnotatedRouteControllerLoader.php
deleted file mode 100644
index e9cf9b95c..000000000
--- a/Routing/AnnotatedRouteControllerLoader.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\Routing;
-
-trigger_deprecation('symfony/framework-bundle', '6.4', 'The "%s" class is deprecated, use "%s" instead.', AnnotatedRouteControllerLoader::class, AttributeRouteControllerLoader::class);
-
-class_exists(AttributeRouteControllerLoader::class);
-
-if (false) {
-    /**
-     * @deprecated since Symfony 6.4, to be removed in 7.0, use {@link AttributeRouteControllerLoader} instead
-     */
-    class AnnotatedRouteControllerLoader extends AttributeRouteControllerLoader
-    {
-    }
-}
diff --git a/Routing/Attribute/AsRoutingConditionService.php b/Routing/Attribute/AsRoutingConditionService.php
index 13f8ff26a..5e481d73a 100644
--- a/Routing/Attribute/AsRoutingConditionService.php
+++ b/Routing/Attribute/AsRoutingConditionService.php
@@ -41,6 +41,10 @@
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class AsRoutingConditionService extends AutoconfigureTag
 {
+    /**
+     * @param string|null $alias    The alias of the service to use it in routing condition expressions
+     * @param int         $priority Defines a priority that allows the routing condition service to override a service with the same alias
+     */
     public function __construct(
         ?string $alias = null,
         int $priority = 0,
diff --git a/Routing/AttributeRouteControllerLoader.php b/Routing/AttributeRouteControllerLoader.php
index a629f4387..1d3d547c8 100644
--- a/Routing/AttributeRouteControllerLoader.php
+++ b/Routing/AttributeRouteControllerLoader.php
@@ -25,10 +25,8 @@ class AttributeRouteControllerLoader extends AttributeClassLoader
 {
     /**
      * Configures the _controller default parameter of a given Route instance.
-     *
-     * @return void
      */
-    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
+    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $attr): void
     {
         if ('__invoke' === $method->getName()) {
             $route->setDefault('_controller', $class->getName());
@@ -51,7 +49,3 @@ protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMetho
         return str_replace('__', '_', $name);
     }
 }
-
-if (!class_exists(AnnotatedRouteControllerLoader::class, false)) {
-    class_alias(AttributeRouteControllerLoader::class, AnnotatedRouteControllerLoader::class);
-}
diff --git a/Routing/DelegatingLoader.php b/Routing/DelegatingLoader.php
index 3239d1094..42d461773 100644
--- a/Routing/DelegatingLoader.php
+++ b/Routing/DelegatingLoader.php
@@ -29,14 +29,12 @@
 class DelegatingLoader extends BaseDelegatingLoader
 {
     private bool $loading = false;
-    private array $defaultOptions;
-    private array $defaultRequirements;
-
-    public function __construct(LoaderResolverInterface $resolver, array $defaultOptions = [], array $defaultRequirements = [])
-    {
-        $this->defaultOptions = $defaultOptions;
-        $this->defaultRequirements = $defaultRequirements;
 
+    public function __construct(
+        LoaderResolverInterface $resolver,
+        private array $defaultOptions = [],
+        private array $defaultRequirements = [],
+    ) {
         parent::__construct($resolver);
     }
 
diff --git a/Routing/Router.php b/Routing/Router.php
index b264a8fa7..9efa07fae 100644
--- a/Routing/Router.php
+++ b/Routing/Router.php
@@ -30,19 +30,26 @@
  * This Router creates the Loader only when the cache is empty.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final since Symfony 7.1
  */
 class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberInterface
 {
-    private ContainerInterface $container;
     private array $collectedParameters = [];
     private \Closure $paramFetcher;
 
     /**
      * @param mixed $resource The main resource to load
      */
-    public function __construct(ContainerInterface $container, mixed $resource, array $options = [], ?RequestContext $context = null, ?ContainerInterface $parameters = null, ?LoggerInterface $logger = null, ?string $defaultLocale = null)
-    {
-        $this->container = $container;
+    public function __construct(
+        private ContainerInterface $container,
+        mixed $resource,
+        array $options = [],
+        ?RequestContext $context = null,
+        ?ContainerInterface $parameters = null,
+        ?LoggerInterface $logger = null,
+        ?string $defaultLocale = null,
+    ) {
         $this->resource = $resource;
         $this->context = $context ?? new RequestContext();
         $this->logger = $logger;
@@ -53,7 +60,7 @@ public function __construct(ContainerInterface $container, mixed $resource, arra
         } elseif ($container instanceof SymfonyContainerInterface) {
             $this->paramFetcher = $container->getParameter(...);
         } else {
-            throw new \LogicException(sprintf('You should either pass a "%s" instance or provide the $parameters argument of the "%s" method.', SymfonyContainerInterface::class, __METHOD__));
+            throw new \LogicException(\sprintf('You should either pass a "%s" instance or provide the $parameters argument of the "%s" method.', SymfonyContainerInterface::class, __METHOD__));
         }
 
         $this->defaultLocale = $defaultLocale;
@@ -67,7 +74,7 @@ public function getRouteCollection(): RouteCollection
             $this->collection->addResource(new ContainerParametersResource($this->collectedParameters));
 
             try {
-                $containerFile = ($this->paramFetcher)('kernel.cache_dir').'/'.($this->paramFetcher)('kernel.container_class').'.php';
+                $containerFile = ($this->paramFetcher)('kernel.build_dir').'/'.($this->paramFetcher)('kernel.container_class').'.php';
                 if (file_exists($containerFile)) {
                     $this->collection->addResource(new FileResource($containerFile));
                 } else {
@@ -80,15 +87,14 @@ public function getRouteCollection(): RouteCollection
         return $this->collection;
     }
 
-    /**
-     * @param string|null $buildDir
-     */
-    public function warmUp(string $cacheDir /* , string $buildDir = null */): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
-        $currentDir = $this->getOption('cache_dir');
+        if (null === $currentDir = $this->getOption('cache_dir')) {
+            return []; // skip warmUp when router doesn't use cache
+        }
 
         // force cache generation
-        $this->setOption('cache_dir', $cacheDir);
+        $this->setOption('cache_dir', $buildDir ?? $cacheDir);
         $this->getMatcher();
         $this->getGenerator();
 
@@ -165,7 +171,7 @@ private function resolve(mixed $value): mixed
             }
 
             if (preg_match('/^env\((?:\w++:)*+\w++\)$/', $match[1])) {
-                throw new RuntimeException(sprintf('Using "%%%s%%" is not allowed in routing configuration.', $match[1]));
+                throw new RuntimeException(\sprintf('Using "%%%s%%" is not allowed in routing configuration.', $match[1]));
             }
 
             $resolved = ($this->paramFetcher)($match[1]);
@@ -182,7 +188,7 @@ private function resolve(mixed $value): mixed
                 }
             }
 
-            throw new RuntimeException(sprintf('The container parameter "%s", used in the route configuration value "%s", must be a string or numeric, but it is of type "%s".', $match[1], $value, get_debug_type($resolved)));
+            throw new RuntimeException(\sprintf('The container parameter "%s", used in the route configuration value "%s", must be a string or numeric, but it is of type "%s".', $match[1], $value, get_debug_type($resolved)));
         }, $value);
 
         return str_replace('%%', '%', $escapedValue);
diff --git a/Secrets/AbstractVault.php b/Secrets/AbstractVault.php
index b3eb0c6bc..882ec7862 100644
--- a/Secrets/AbstractVault.php
+++ b/Secrets/AbstractVault.php
@@ -16,7 +16,7 @@
  */
 abstract class AbstractVault
 {
-    protected $lastMessage;
+    protected ?string $lastMessage = null;
 
     public function getLastMessage(): ?string
     {
@@ -36,14 +36,11 @@ abstract public function list(bool $reveal = false): array;
     protected function validateName(string $name): void
     {
         if (!preg_match('/^\w++$/D', $name)) {
-            throw new \LogicException(sprintf('Invalid secret name "%s": only "word" characters are allowed.', $name));
+            throw new \LogicException(\sprintf('Invalid secret name "%s": only "word" characters are allowed.', $name));
         }
     }
 
-    /**
-     * @return string
-     */
-    protected function getPrettyPath(string $path)
+    protected function getPrettyPath(string $path): string
     {
         return str_replace(getcwd().\DIRECTORY_SEPARATOR, '', $path);
     }
diff --git a/Secrets/DotenvVault.php b/Secrets/DotenvVault.php
index 994b31d18..15952611a 100644
--- a/Secrets/DotenvVault.php
+++ b/Secrets/DotenvVault.php
@@ -16,10 +16,9 @@
  */
 class DotenvVault extends AbstractVault
 {
-    private string $dotenvFile;
-
-    public function __construct(string $dotenvFile)
-    {
+    public function __construct(
+        private string $dotenvFile,
+    ) {
         $this->dotenvFile = strtr($dotenvFile, '/', \DIRECTORY_SEPARATOR);
     }
 
@@ -45,7 +44,7 @@ public function seal(string $name, string $value): void
 
         file_put_contents($this->dotenvFile, $content);
 
-        $this->lastMessage = sprintf('Secret "%s" %s in "%s".', $name, $count ? 'added' : 'updated', $this->getPrettyPath($this->dotenvFile));
+        $this->lastMessage = \sprintf('Secret "%s" %s in "%s".', $name, $count ? 'added' : 'updated', $this->getPrettyPath($this->dotenvFile));
     }
 
     public function reveal(string $name): ?string
@@ -55,7 +54,7 @@ public function reveal(string $name): ?string
         $v = $_ENV[$name] ?? (str_starts_with($name, 'HTTP_') ? null : ($_SERVER[$name] ?? null));
 
         if ('' === ($v ?? '')) {
-            $this->lastMessage = sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath($this->dotenvFile));
+            $this->lastMessage = \sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath($this->dotenvFile));
 
             return null;
         }
@@ -73,12 +72,12 @@ public function remove(string $name): bool
 
         if ($count) {
             file_put_contents($this->dotenvFile, $content);
-            $this->lastMessage = sprintf('Secret "%s" removed from file "%s".', $name, $this->getPrettyPath($this->dotenvFile));
+            $this->lastMessage = \sprintf('Secret "%s" removed from file "%s".', $name, $this->getPrettyPath($this->dotenvFile));
 
             return true;
         }
 
-        $this->lastMessage = sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath($this->dotenvFile));
+        $this->lastMessage = \sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath($this->dotenvFile));
 
         return false;
     }
diff --git a/Secrets/SodiumVault.php b/Secrets/SodiumVault.php
index dcf79869f..2a8e5dcc8 100644
--- a/Secrets/SodiumVault.php
+++ b/Secrets/SodiumVault.php
@@ -31,8 +31,11 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
      * @param $decryptionKey A string or a stringable object that defines the private key to use to decrypt the vault
      *                       or null to store generated keys in the provided $secretsDir
      */
-    public function __construct(string $secretsDir, #[\SensitiveParameter] string|\Stringable|null $decryptionKey = null)
-    {
+    public function __construct(
+        string $secretsDir,
+        #[\SensitiveParameter] string|\Stringable|null $decryptionKey = null,
+        private ?string $derivedSecretEnvVar = null,
+    ) {
         $this->pathPrefix = rtrim(strtr($secretsDir, '/', \DIRECTORY_SEPARATOR), \DIRECTORY_SEPARATOR).\DIRECTORY_SEPARATOR.basename($secretsDir).'.';
         $this->decryptionKey = $decryptionKey;
         $this->secretsDir = $secretsDir;
@@ -59,7 +62,7 @@ public function generateKeys(bool $override = false): bool
         }
 
         if (!$override && null !== $this->encryptionKey) {
-            $this->lastMessage = sprintf('Sodium keys already exist at "%s*.{public,private}" and won\'t be overridden.', $this->getPrettyPath($this->pathPrefix));
+            $this->lastMessage = \sprintf('Sodium keys already exist at "%s*.{public,private}" and won\'t be overridden.', $this->getPrettyPath($this->pathPrefix));
 
             return false;
         }
@@ -70,7 +73,7 @@ public function generateKeys(bool $override = false): bool
         $this->export('encrypt.public', $this->encryptionKey);
         $this->export('decrypt.private', $this->decryptionKey);
 
-        $this->lastMessage = sprintf('Sodium keys have been generated at "%s*.public/private.php".', $this->getPrettyPath($this->pathPrefix));
+        $this->lastMessage = \sprintf('Sodium keys have been generated at "%s*.public/private.php".', $this->getPrettyPath($this->pathPrefix));
 
         return true;
     }
@@ -86,9 +89,9 @@ public function seal(string $name, string $value): void
         $list = $this->list();
         $list[$name] = null;
         uksort($list, 'strnatcmp');
-        file_put_contents($this->pathPrefix.'list.php', sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list)), \LOCK_EX);
+        file_put_contents($this->pathPrefix.'list.php', \sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list)), \LOCK_EX);
 
-        $this->lastMessage = sprintf('Secret "%s" encrypted in "%s"; you can commit it.', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+        $this->lastMessage = \sprintf('Secret "%s" encrypted in "%s"; you can commit it.', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
     }
 
     public function reveal(string $name): ?string
@@ -98,27 +101,27 @@ public function reveal(string $name): ?string
 
         $filename = $this->getFilename($name);
         if (!is_file($file = $this->pathPrefix.$filename.'.php')) {
-            $this->lastMessage = sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+            $this->lastMessage = \sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 
             return null;
         }
 
         if (!\function_exists('sodium_crypto_box_seal')) {
-            $this->lastMessage = sprintf('Secret "%s" cannot be revealed as the "sodium" PHP extension missing. Try running "composer require paragonie/sodium_compat" if you cannot enable the extension."', $name);
+            $this->lastMessage = \sprintf('Secret "%s" cannot be revealed as the "sodium" PHP extension missing. Try running "composer require paragonie/sodium_compat" if you cannot enable the extension."', $name);
 
             return null;
         }
 
         $this->loadKeys();
 
-        if ('' === $this->decryptionKey) {
-            $this->lastMessage = sprintf('Secret "%s" cannot be revealed as no decryption key was found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+        if ('' === $this->decryptionKey = (string) $this->decryptionKey) {
+            $this->lastMessage = \sprintf('Secret "%s" cannot be revealed as no decryption key was found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 
             return null;
         }
 
         if (false === $value = sodium_crypto_box_seal_open(include $file, $this->decryptionKey)) {
-            $this->lastMessage = sprintf('Secret "%s" cannot be revealed as the wrong decryption key was provided for "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+            $this->lastMessage = \sprintf('Secret "%s" cannot be revealed as the wrong decryption key was provided for "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 
             return null;
         }
@@ -133,16 +136,16 @@ public function remove(string $name): bool
 
         $filename = $this->getFilename($name);
         if (!is_file($file = $this->pathPrefix.$filename.'.php')) {
-            $this->lastMessage = sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+            $this->lastMessage = \sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 
             return false;
         }
 
         $list = $this->list();
         unset($list[$name]);
-        file_put_contents($this->pathPrefix.'list.php', sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list)), \LOCK_EX);
+        file_put_contents($this->pathPrefix.'list.php', \sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list)), \LOCK_EX);
 
-        $this->lastMessage = sprintf('Secret "%s" removed from "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+        $this->lastMessage = \sprintf('Secret "%s" removed from "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 
         return @unlink($file) || !file_exists($file);
     }
@@ -177,6 +180,11 @@ public function loadEnvVars(): array
             $envs[$name] = LazyString::fromCallable($reveal, $name);
         }
 
+        if ($this->derivedSecretEnvVar && !\array_key_exists($this->derivedSecretEnvVar, $envs)) {
+            $k = $this->decryptionKey;
+            $envs[$this->derivedSecretEnvVar] = LazyString::fromCallable(static fn () => '' !== ($k = (string) $k) ? base64_encode(hash('sha256', $k, true)) : '');
+        }
+
         return $envs;
     }
 
@@ -199,7 +207,7 @@ private function loadKeys(): void
         } elseif ('' !== $this->decryptionKey) {
             $this->encryptionKey = sodium_crypto_box_publickey($this->decryptionKey);
         } else {
-            throw new \RuntimeException(sprintf('Encryption key not found in "%s".', \dirname($this->pathPrefix)));
+            throw new \RuntimeException(\sprintf('Encryption key not found in "%s".', \dirname($this->pathPrefix)));
         }
     }
 
@@ -208,7 +216,7 @@ private function export(string $filename, string $data): void
         $b64 = 'decrypt.private' === $filename ? '// SYMFONY_DECRYPTION_SECRET='.base64_encode($data)."\n" : '';
         $name = basename($this->pathPrefix.$filename);
         $data = str_replace('%', '\x', rawurlencode($data));
-        $data = sprintf("<?php // %s on %s\n\n%sreturn \"%s\";\n", $name, date('r'), $b64, $data);
+        $data = \sprintf("<?php // %s on %s\n\n%sreturn \"%s\";\n", $name, date('r'), $b64, $data);
 
         $this->createSecretsDir();
 
@@ -221,7 +229,7 @@ private function export(string $filename, string $data): void
     private function createSecretsDir(): void
     {
         if ($this->secretsDir && !is_dir($this->secretsDir) && !@mkdir($this->secretsDir, 0777, true) && !is_dir($this->secretsDir)) {
-            throw new \RuntimeException(sprintf('Unable to create the secrets directory (%s).', $this->secretsDir));
+            throw new \RuntimeException(\sprintf('Unable to create the secrets directory (%s).', $this->secretsDir));
         }
 
         $this->secretsDir = null;
diff --git a/Test/BrowserKitAssertionsTrait.php b/Test/BrowserKitAssertionsTrait.php
index 125aa45a7..1b7437b77 100644
--- a/Test/BrowserKitAssertionsTrait.php
+++ b/Test/BrowserKitAssertionsTrait.php
@@ -28,14 +28,14 @@
  */
 trait BrowserKitAssertionsTrait
 {
-    public static function assertResponseIsSuccessful(string $message = ''): void
+    public static function assertResponseIsSuccessful(string $message = '', bool $verbose = true): void
     {
-        self::assertThatForResponse(new ResponseConstraint\ResponseIsSuccessful(), $message);
+        self::assertThatForResponse(new ResponseConstraint\ResponseIsSuccessful($verbose), $message);
     }
 
-    public static function assertResponseStatusCodeSame(int $expectedCode, string $message = ''): void
+    public static function assertResponseStatusCodeSame(int $expectedCode, string $message = '', bool $verbose = true): void
     {
-        self::assertThatForResponse(new ResponseConstraint\ResponseStatusCodeSame($expectedCode), $message);
+        self::assertThatForResponse(new ResponseConstraint\ResponseStatusCodeSame($expectedCode, $verbose), $message);
     }
 
     public static function assertResponseFormatSame(?string $expectedFormat, string $message = ''): void
@@ -43,9 +43,9 @@ public static function assertResponseFormatSame(?string $expectedFormat, string
         self::assertThatForResponse(new ResponseConstraint\ResponseFormatSame(self::getRequest(), $expectedFormat), $message);
     }
 
-    public static function assertResponseRedirects(?string $expectedLocation = null, ?int $expectedCode = null, string $message = ''): void
+    public static function assertResponseRedirects(?string $expectedLocation = null, ?int $expectedCode = null, string $message = '', bool $verbose = true): void
     {
-        $constraint = new ResponseConstraint\ResponseIsRedirected();
+        $constraint = new ResponseConstraint\ResponseIsRedirected($verbose);
         if ($expectedLocation) {
             if (class_exists(ResponseConstraint\ResponseHeaderLocationSame::class)) {
                 $locationConstraint = new ResponseConstraint\ResponseHeaderLocationSame(self::getRequest(), $expectedLocation);
@@ -100,9 +100,9 @@ public static function assertResponseCookieValueSame(string $name, string $expec
         ), $message);
     }
 
-    public static function assertResponseIsUnprocessable(string $message = ''): void
+    public static function assertResponseIsUnprocessable(string $message = '', bool $verbose = true): void
     {
-        self::assertThatForResponse(new ResponseConstraint\ResponseIsUnprocessable(), $message);
+        self::assertThatForResponse(new ResponseConstraint\ResponseIsUnprocessable($verbose), $message);
     }
 
     public static function assertBrowserHasCookie(string $name, string $path = '/', ?string $domain = null, string $message = ''): void
@@ -171,7 +171,7 @@ protected static function getClient(?AbstractBrowser $newClient = null): ?Abstra
         }
 
         if (!$client instanceof AbstractBrowser) {
-            static::fail(sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
+            static::fail(\sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
         }
 
         return $client;
diff --git a/Test/DomCrawlerAssertionsTrait.php b/Test/DomCrawlerAssertionsTrait.php
index a16709461..ede359bcc 100644
--- a/Test/DomCrawlerAssertionsTrait.php
+++ b/Test/DomCrawlerAssertionsTrait.php
@@ -26,12 +26,12 @@ trait DomCrawlerAssertionsTrait
 {
     public static function assertSelectorExists(string $selector, string $message = ''): void
     {
-        self::assertThat(self::getCrawler(), new DomCrawlerConstraint\CrawlerSelectorExists($selector), $message);
+        self::assertThat(self::getCrawler(), new CrawlerSelectorExists($selector), $message);
     }
 
     public static function assertSelectorNotExists(string $selector, string $message = ''): void
     {
-        self::assertThat(self::getCrawler(), new LogicalNot(new DomCrawlerConstraint\CrawlerSelectorExists($selector)), $message);
+        self::assertThat(self::getCrawler(), new LogicalNot(new CrawlerSelectorExists($selector)), $message);
     }
 
     public static function assertSelectorCount(int $expectedCount, string $selector, string $message = ''): void
@@ -42,7 +42,7 @@ public static function assertSelectorCount(int $expectedCount, string $selector,
     public static function assertSelectorTextContains(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new DomCrawlerConstraint\CrawlerSelectorTextContains($selector, $text)
         ), $message);
     }
@@ -50,7 +50,7 @@ public static function assertSelectorTextContains(string $selector, string $text
     public static function assertAnySelectorTextContains(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new DomCrawlerConstraint\CrawlerAnySelectorTextContains($selector, $text)
         ), $message);
     }
@@ -58,7 +58,7 @@ public static function assertAnySelectorTextContains(string $selector, string $t
     public static function assertSelectorTextSame(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new DomCrawlerConstraint\CrawlerSelectorTextSame($selector, $text)
         ), $message);
     }
@@ -66,7 +66,7 @@ public static function assertSelectorTextSame(string $selector, string $text, st
     public static function assertAnySelectorTextSame(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new DomCrawlerConstraint\CrawlerAnySelectorTextSame($selector, $text)
         ), $message);
     }
@@ -74,7 +74,7 @@ public static function assertAnySelectorTextSame(string $selector, string $text,
     public static function assertSelectorTextNotContains(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new LogicalNot(new DomCrawlerConstraint\CrawlerSelectorTextContains($selector, $text))
         ), $message);
     }
@@ -82,7 +82,7 @@ public static function assertSelectorTextNotContains(string $selector, string $t
     public static function assertAnySelectorTextNotContains(string $selector, string $text, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists($selector),
+            new CrawlerSelectorExists($selector),
             new LogicalNot(new DomCrawlerConstraint\CrawlerAnySelectorTextContains($selector, $text))
         ), $message);
     }
@@ -100,7 +100,7 @@ public static function assertPageTitleContains(string $expectedTitle, string $me
     public static function assertInputValueSame(string $fieldName, string $expectedValue, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists("input[name=\"$fieldName\"]"),
+            new CrawlerSelectorExists("input[name=\"$fieldName\"]"),
             new DomCrawlerConstraint\CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'value', $expectedValue)
         ), $message);
     }
@@ -108,7 +108,7 @@ public static function assertInputValueSame(string $fieldName, string $expectedV
     public static function assertInputValueNotSame(string $fieldName, string $expectedValue, string $message = ''): void
     {
         self::assertThat(self::getCrawler(), LogicalAnd::fromConstraints(
-            new DomCrawlerConstraint\CrawlerSelectorExists("input[name=\"$fieldName\"]"),
+            new CrawlerSelectorExists("input[name=\"$fieldName\"]"),
             new LogicalNot(new DomCrawlerConstraint\CrawlerSelectorAttributeValueSame("input[name=\"$fieldName\"]", 'value', $expectedValue))
         ), $message);
     }
@@ -126,18 +126,18 @@ public static function assertCheckboxNotChecked(string $fieldName, string $messa
     public static function assertFormValue(string $formSelector, string $fieldName, string $value, string $message = ''): void
     {
         $node = self::getCrawler()->filter($formSelector);
-        self::assertNotEmpty($node, sprintf('Form "%s" not found.', $formSelector));
+        self::assertNotEmpty($node, \sprintf('Form "%s" not found.', $formSelector));
         $values = $node->form()->getValues();
-        self::assertArrayHasKey($fieldName, $values, $message ?: sprintf('Field "%s" not found in form "%s".', $fieldName, $formSelector));
+        self::assertArrayHasKey($fieldName, $values, $message ?: \sprintf('Field "%s" not found in form "%s".', $fieldName, $formSelector));
         self::assertSame($value, $values[$fieldName]);
     }
 
     public static function assertNoFormValue(string $formSelector, string $fieldName, string $message = ''): void
     {
         $node = self::getCrawler()->filter($formSelector);
-        self::assertNotEmpty($node, sprintf('Form "%s" not found.', $formSelector));
+        self::assertNotEmpty($node, \sprintf('Form "%s" not found.', $formSelector));
         $values = $node->form()->getValues();
-        self::assertArrayNotHasKey($fieldName, $values, $message ?: sprintf('Field "%s" has a value in form "%s".', $fieldName, $formSelector));
+        self::assertArrayNotHasKey($fieldName, $values, $message ?: \sprintf('Field "%s" has a value in form "%s".', $fieldName, $formSelector));
     }
 
     private static function getCrawler(): Crawler
diff --git a/Test/HttpClientAssertionsTrait.php b/Test/HttpClientAssertionsTrait.php
index 01a27ea87..4a8afbab4 100644
--- a/Test/HttpClientAssertionsTrait.php
+++ b/Test/HttpClientAssertionsTrait.php
@@ -33,7 +33,7 @@ public static function assertHttpClientRequest(string $expectedUrl, string $expe
         $expectedRequestHasBeenFound = false;
 
         if (!\array_key_exists($httpClientId, $httpClientDataCollector->getClients())) {
-            static::fail(sprintf('HttpClient "%s" is not registered.', $httpClientId));
+            static::fail(\sprintf('HttpClient "%s" is not registered.', $httpClientId));
         }
 
         foreach ($httpClientDataCollector->getClients()[$httpClientId]['traces'] as $trace) {
@@ -101,7 +101,7 @@ public function assertNotHttpClientRequest(string $unexpectedUrl, string $expect
         $unexpectedUrlHasBeenFound = false;
 
         if (!\array_key_exists($httpClientId, $httpClientDataCollector->getClients())) {
-            static::fail(sprintf('HttpClient "%s" is not registered.', $httpClientId));
+            static::fail(\sprintf('HttpClient "%s" is not registered.', $httpClientId));
         }
 
         foreach ($httpClientDataCollector->getClients()[$httpClientId]['traces'] as $trace) {
@@ -113,7 +113,7 @@ public function assertNotHttpClientRequest(string $unexpectedUrl, string $expect
             }
         }
 
-        self::assertFalse($unexpectedUrlHasBeenFound, sprintf('Unexpected URL called: "%s" - "%s"', $expectedMethod, $unexpectedUrl));
+        self::assertFalse($unexpectedUrlHasBeenFound, \sprintf('Unexpected URL called: "%s" - "%s"', $expectedMethod, $unexpectedUrl));
     }
 
     public static function assertHttpClientRequestCount(int $count, string $httpClientId = 'http_client'): void
diff --git a/Test/KernelTestCase.php b/Test/KernelTestCase.php
index ee67fa7af..b2c2eb4d2 100644
--- a/Test/KernelTestCase.php
+++ b/Test/KernelTestCase.php
@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Contracts\Service\ResetInterface;
@@ -28,14 +27,9 @@ abstract class KernelTestCase extends TestCase
     use MailerAssertionsTrait;
     use NotificationAssertionsTrait;
 
-    protected static $class;
-
-    /**
-     * @var KernelInterface
-     */
-    protected static $kernel;
-
-    protected static $booted = false;
+    protected static ?string $class = null;
+    protected static ?KernelInterface $kernel = null;
+    protected static bool $booted = false;
 
     protected function tearDown(): void
     {
@@ -52,11 +46,11 @@ protected function tearDown(): void
     protected static function getKernelClass(): string
     {
         if (!isset($_SERVER['KERNEL_CLASS']) && !isset($_ENV['KERNEL_CLASS'])) {
-            throw new \LogicException(sprintf('You must set the KERNEL_CLASS environment variable to the fully-qualified class name of your Kernel in phpunit.xml / phpunit.xml.dist or override the "%1$s::createKernel()" or "%1$s::getKernelClass()" method.', static::class));
+            throw new \LogicException(\sprintf('You must set the KERNEL_CLASS environment variable to the fully-qualified class name of your Kernel in phpunit.xml / phpunit.xml.dist or override the "%1$s::createKernel()" or "%1$s::getKernelClass()" method.', static::class));
         }
 
         if (!class_exists($class = $_ENV['KERNEL_CLASS'] ?? $_SERVER['KERNEL_CLASS'])) {
-            throw new \RuntimeException(sprintf('Class "%s" doesn\'t exist or cannot be autoloaded. Check that the KERNEL_CLASS value in phpunit.xml matches the fully-qualified class name of your Kernel or override the "%s::createKernel()" method.', $class, static::class));
+            throw new \RuntimeException(\sprintf('Class "%s" doesn\'t exist or cannot be autoloaded. Check that the KERNEL_CLASS value in phpunit.xml matches the fully-qualified class name of your Kernel or override the "%s::createKernel()" method.', $class, static::class));
         }
 
         return $class;
@@ -84,10 +78,8 @@ protected static function bootKernel(array $options = []): KernelInterface
      * used by other services.
      *
      * Using this method is the best way to get a container from your test code.
-     *
-     * @return Container
      */
-    protected static function getContainer(): ContainerInterface
+    protected static function getContainer(): Container
     {
         if (!static::$booted) {
             static::bootKernel();
diff --git a/Test/TestBrowserToken.php b/Test/TestBrowserToken.php
index 25d71d084..e186b2c44 100644
--- a/Test/TestBrowserToken.php
+++ b/Test/TestBrowserToken.php
@@ -21,17 +21,16 @@
  */
 class TestBrowserToken extends AbstractToken
 {
-    private string $firewallName;
-
-    public function __construct(array $roles = [], ?UserInterface $user = null, string $firewallName = 'main')
-    {
+    public function __construct(
+        array $roles = [],
+        ?UserInterface $user = null,
+        private string $firewallName = 'main',
+    ) {
         parent::__construct($roles);
 
         if (null !== $user) {
             $this->setUser($user);
         }
-
-        $this->firewallName = $firewallName;
     }
 
     public function getFirewallName(): string
diff --git a/Test/TestContainer.php b/Test/TestContainer.php
index e1e7a8592..77135fa06 100644
--- a/Test/TestContainer.php
+++ b/Test/TestContainer.php
@@ -78,7 +78,7 @@ public function set(string $id, mixed $service): void
                 throw $e;
             }
             if (isset($container->privates[$renamedId])) {
-                throw new InvalidArgumentException(sprintf('The "%s" service is already initialized, you cannot replace it.', $id));
+                throw new InvalidArgumentException(\sprintf('The "%s" service is already initialized, you cannot replace it.', $id));
             }
             $container->privates[$renamedId] = $service;
         }
diff --git a/Test/WebTestCase.php b/Test/WebTestCase.php
index de31d4ba9..9c6ee9c98 100644
--- a/Test/WebTestCase.php
+++ b/Test/WebTestCase.php
@@ -38,7 +38,7 @@ protected function tearDown(): void
     protected static function createClient(array $options = [], array $server = []): KernelBrowser
     {
         if (static::$booted) {
-            throw new \LogicException(sprintf('Booting the kernel before calling "%s()" is not supported, the kernel should only be booted once.', __METHOD__));
+            throw new \LogicException(\sprintf('Booting the kernel before calling "%s()" is not supported, the kernel should only be booted once.', __METHOD__));
         }
 
         $kernel = static::bootKernel($options);
diff --git a/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php b/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
deleted file mode 100644
index 3b017dd08..000000000
--- a/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
-
-use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\PsrCachedReader;
-use Doctrine\Common\Annotations\Reader;
-use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
-use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
-use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\NullAdapter;
-use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
-use Symfony\Component\Filesystem\Filesystem;
-
-/**
- * @group legacy
- */
-class AnnotationsCacheWarmerTest extends TestCase
-{
-    use ExpectDeprecationTrait;
-
-    private string $cacheDir;
-
-    protected function setUp(): void
-    {
-        $this->cacheDir = sys_get_temp_dir().'/'.uniqid('', true);
-        $fs = new Filesystem();
-        $fs->mkdir($this->cacheDir);
-        parent::setUp();
-    }
-
-    protected function tearDown(): void
-    {
-        $fs = new Filesystem();
-        $fs->remove($this->cacheDir);
-        parent::tearDown();
-    }
-
-    public function testAnnotationsCacheWarmerWithDebugDisabled()
-    {
-        file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([__CLASS__], true)));
-        $cacheFile = tempnam($this->cacheDir, __FUNCTION__);
-        $reader = new AnnotationReader();
-
-        $this->expectDeprecation('Since symfony/framework-bundle 6.4: The "Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer" class is deprecated without replacement.');
-        $warmer = new AnnotationsCacheWarmer($reader, $cacheFile);
-
-        $warmer->warmUp($this->cacheDir);
-        $this->assertFileExists($cacheFile);
-
-        // Assert cache is valid
-        $reader = new PsrCachedReader(
-            $this->getReadOnlyReader(),
-            new PhpArrayAdapter($cacheFile, new NullAdapter())
-        );
-        $refClass = new \ReflectionClass($this);
-        $reader->getClassAnnotations($refClass);
-        $reader->getMethodAnnotations($refClass->getMethod(__FUNCTION__));
-        $reader->getPropertyAnnotations($refClass->getProperty('cacheDir'));
-    }
-
-    public function testAnnotationsCacheWarmerWithDebugEnabled()
-    {
-        file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([__CLASS__], true)));
-        $cacheFile = tempnam($this->cacheDir, __FUNCTION__);
-        $reader = new AnnotationReader();
-
-        $this->expectDeprecation('Since symfony/framework-bundle 6.4: The "Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer" class is deprecated without replacement.');
-        $warmer = new AnnotationsCacheWarmer($reader, $cacheFile, null, true);
-
-        $warmer->warmUp($this->cacheDir);
-        $this->assertFileExists($cacheFile);
-
-        // Assert cache is valid
-        $phpArrayAdapter = new PhpArrayAdapter($cacheFile, new NullAdapter());
-        $reader = new PsrCachedReader(
-            $this->getReadOnlyReader(),
-            $phpArrayAdapter,
-            true
-        );
-        $refClass = new \ReflectionClass($this);
-        $reader->getClassAnnotations($refClass);
-        $reader->getMethodAnnotations($refClass->getMethod(__FUNCTION__));
-        $reader->getPropertyAnnotations($refClass->getProperty('cacheDir'));
-    }
-
-    /**
-     * Test that the cache warming process is not broken if a class loader
-     * throws an exception (on class / file not found for example).
-     */
-    public function testClassAutoloadException()
-    {
-        $this->assertFalse(class_exists($annotatedClass = 'C\C\C', false));
-
-        file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([$annotatedClass], true)));
-
-        $this->expectDeprecation('Since symfony/framework-bundle 6.4: The "Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer" class is deprecated without replacement.');
-        $warmer = new AnnotationsCacheWarmer(new AnnotationReader(), tempnam($this->cacheDir, __FUNCTION__));
-
-        spl_autoload_register($classLoader = function ($class) use ($annotatedClass) {
-            if ($class === $annotatedClass) {
-                throw new \DomainException('This exception should be caught by the warmer.');
-            }
-        }, true, true);
-
-        $warmer->warmUp($this->cacheDir);
-
-        spl_autoload_unregister($classLoader);
-    }
-
-    /**
-     * Test that the cache warming process is broken if a class loader throws an
-     * exception but that is unrelated to the class load.
-     */
-    public function testClassAutoloadExceptionWithUnrelatedException()
-    {
-        $this->expectException(\DomainException::class);
-        $this->expectExceptionMessage('This exception should not be caught by the warmer.');
-
-        $this->assertFalse(class_exists($annotatedClass = 'AClassThatDoesNotExist_FWB_CacheWarmer_AnnotationsCacheWarmerTest', false));
-
-        file_put_contents($this->cacheDir.'/annotations.map', sprintf('<?php return %s;', var_export([$annotatedClass], true)));
-        $this->expectDeprecation('Since symfony/framework-bundle 6.4: The "Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer" class is deprecated without replacement.');
-        $warmer = new AnnotationsCacheWarmer(new AnnotationReader(), tempnam($this->cacheDir, __FUNCTION__));
-
-        spl_autoload_register($classLoader = function ($class) use ($annotatedClass) {
-            if ($class === $annotatedClass) {
-                eval('class '.$annotatedClass.'{}');
-                throw new \DomainException('This exception should not be caught by the warmer.');
-            }
-        }, true, true);
-
-        $warmer->warmUp($this->cacheDir);
-
-        spl_autoload_unregister($classLoader);
-    }
-
-    public function testWarmupRemoveCacheMisses()
-    {
-        $cacheFile = tempnam($this->cacheDir, __FUNCTION__);
-        $this->expectDeprecation('Since symfony/framework-bundle 6.4: The "Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer" class is deprecated without replacement.');
-        $warmer = $this->getMockBuilder(AnnotationsCacheWarmer::class)
-            ->setConstructorArgs([new AnnotationReader(), $cacheFile])
-            ->onlyMethods(['doWarmUp'])
-            ->getMock();
-
-        $warmer->method('doWarmUp')->willReturnCallback(function ($cacheDir, ArrayAdapter $arrayAdapter) {
-            $arrayAdapter->getItem('foo_miss');
-
-            $item = $arrayAdapter->getItem('bar_hit');
-            $item->set('data');
-            $arrayAdapter->save($item);
-
-            $item = $arrayAdapter->getItem('baz_hit_null');
-            $item->set(null);
-            $arrayAdapter->save($item);
-
-            return true;
-        });
-
-        $warmer->warmUp($this->cacheDir);
-        $data = include $cacheFile;
-
-        $this->assertCount(1, $data[0]);
-        $this->assertTrue(isset($data[0]['bar_hit']));
-    }
-
-    private function getReadOnlyReader(): MockObject&Reader
-    {
-        $readerMock = $this->createMock(Reader::class);
-        $readerMock->expects($this->exactly(0))->method('getClassAnnotations');
-        $readerMock->expects($this->exactly(0))->method('getClassAnnotation');
-        $readerMock->expects($this->exactly(0))->method('getMethodAnnotations');
-        $readerMock->expects($this->exactly(0))->method('getMethodAnnotation');
-        $readerMock->expects($this->exactly(0))->method('getPropertyAnnotations');
-        $readerMock->expects($this->exactly(0))->method('getPropertyAnnotation');
-
-        return $readerMock;
-    }
-}
diff --git a/Tests/CacheWarmer/ConfigBuilderCacheWarmerTest.php b/Tests/CacheWarmer/ConfigBuilderCacheWarmerTest.php
index 66cf6b8d7..994151807 100644
--- a/Tests/CacheWarmer/ConfigBuilderCacheWarmerTest.php
+++ b/Tests/CacheWarmer/ConfigBuilderCacheWarmerTest.php
@@ -37,8 +37,9 @@ class ConfigBuilderCacheWarmerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->varDir = sys_get_temp_dir().'/'.uniqid('', true);
         $fs = new Filesystem();
+        $this->varDir = tempnam(sys_get_temp_dir(), 'sf_var_');
+        $fs->remove($this->varDir);
         $fs->mkdir($this->varDir);
     }
 
@@ -188,7 +189,7 @@ public function testExtensionAddedInKernel()
         $kernel = new class($this->varDir) extends TestKernel {
             protected function build(ContainerBuilder $container): void
             {
-                $container->registerExtension(new class() extends Extension implements ConfigurationInterface {
+                $container->registerExtension(new class extends Extension implements ConfigurationInterface {
                     public function load(array $configs, ContainerBuilder $container): void
                     {
                     }
@@ -275,7 +276,7 @@ protected function build(ContainerBuilder $container): void
             {
                 /** @var TestSecurityExtension $extension */
                 $extension = $container->getExtension('test_security');
-                $extension->addAuthenticatorFactory(new class() implements TestAuthenticatorFactoryInterface {
+                $extension->addAuthenticatorFactory(new class implements TestAuthenticatorFactoryInterface {
                     public function getKey(): string
                     {
                         return 'token';
@@ -291,19 +292,19 @@ public function registerBundles(): iterable
             {
                 yield from parent::registerBundles();
 
-                yield new class() extends Bundle {
+                yield new class extends Bundle {
                     public function getContainerExtension(): ExtensionInterface
                     {
                         return new TestSecurityExtension();
                     }
                 };
 
-                yield new class() extends Bundle {
+                yield new class extends Bundle {
                     public function build(ContainerBuilder $container): void
                     {
                         /** @var TestSecurityExtension $extension */
                         $extension = $container->getExtension('test_security');
-                        $extension->addAuthenticatorFactory(new class() implements TestAuthenticatorFactoryInterface {
+                        $extension->addAuthenticatorFactory(new class implements TestAuthenticatorFactoryInterface {
                             public function getKey(): string
                             {
                                 return 'form-login';
diff --git a/Tests/CacheWarmer/RouterCacheWarmerTest.php b/Tests/CacheWarmer/RouterCacheWarmerTest.php
index 727b566e1..06f738f2b 100644
--- a/Tests/CacheWarmer/RouterCacheWarmerTest.php
+++ b/Tests/CacheWarmer/RouterCacheWarmerTest.php
@@ -12,43 +12,70 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer;
 
 use PHPUnit\Framework\TestCase;
-use Psr\Container\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\CacheWarmer\RouterCacheWarmer;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
 use Symfony\Component\Routing\RouterInterface;
 
 class RouterCacheWarmerTest extends TestCase
 {
-    public function testWarmUpWithWarmebleInterface()
+    public function testWarmUpWithWarmableInterfaceWithBuildDir()
     {
-        $containerMock = $this->getMockBuilder(ContainerInterface::class)->onlyMethods(['get', 'has'])->getMock();
+        $container = new Container();
 
-        $routerMock = $this->getMockBuilder(testRouterInterfaceWithWarmebleInterface::class)->onlyMethods(['match', 'generate', 'getContext', 'setContext', 'getRouteCollection', 'warmUp'])->getMock();
-        $containerMock->expects($this->any())->method('get')->with('router')->willReturn($routerMock);
-        $routerCacheWarmer = new RouterCacheWarmer($containerMock);
+        $routerMock = $this->getMockBuilder(testRouterInterfaceWithWarmableInterface::class)->onlyMethods(['match', 'generate', 'getContext', 'setContext', 'getRouteCollection', 'warmUp'])->getMock();
+        $routerMock->method('warmUp')->willReturn([]);
 
-        $routerCacheWarmer->warmUp('/tmp');
-        $routerMock->expects($this->any())->method('warmUp')->with('/tmp')->willReturn([]);
+        $container->set('router', $routerMock);
+        $routerCacheWarmer = new RouterCacheWarmer($container);
+
+        $routerCacheWarmer->warmUp('/tmp/cache', '/tmp/build');
+        $routerMock->expects($this->any())->method('warmUp')->with('/tmp/cache', '/tmp/build')->willReturn([]);
         $this->addToAssertionCount(1);
     }
 
-    public function testWarmUpWithoutWarmebleInterface()
+    public function testWarmUpWithoutWarmableInterfaceWithBuildDir()
     {
-        $containerMock = $this->getMockBuilder(ContainerInterface::class)->onlyMethods(['get', 'has'])->getMock();
+        $container = new Container();
 
-        $routerMock = $this->getMockBuilder(testRouterInterfaceWithoutWarmebleInterface::class)->onlyMethods(['match', 'generate', 'getContext', 'setContext', 'getRouteCollection'])->getMock();
-        $containerMock->expects($this->any())->method('get')->with('router')->willReturn($routerMock);
-        $routerCacheWarmer = new RouterCacheWarmer($containerMock);
+        $routerMock = $this->getMockBuilder(testRouterInterfaceWithoutWarmableInterface::class)->onlyMethods(['match', 'generate', 'getContext', 'setContext', 'getRouteCollection'])->getMock();
+        $container->set('router', $routerMock);
+        $routerCacheWarmer = new RouterCacheWarmer($container);
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('cannot be warmed up because it does not implement "Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface"');
-        $routerCacheWarmer->warmUp('/tmp');
+        $routerCacheWarmer->warmUp('/tmp/cache', '/tmp/build');
+    }
+
+    public function testWarmUpWithWarmableInterfaceWithoutBuildDir()
+    {
+        $container = new Container();
+
+        $routerMock = $this->getMockBuilder(testRouterInterfaceWithWarmableInterface::class)->onlyMethods(['match', 'generate', 'getContext', 'setContext', 'getRouteCollection', 'warmUp'])->getMock();
+        $container->set('router', $routerMock);
+        $routerCacheWarmer = new RouterCacheWarmer($container);
+
+        $preload = $routerCacheWarmer->warmUp('/tmp');
+        $routerMock->expects($this->never())->method('warmUp');
+        self::assertSame([], $preload);
+        $this->addToAssertionCount(1);
+    }
+
+    public function testWarmUpWithoutWarmableInterfaceWithoutBuildDir()
+    {
+        $container = new Container();
+
+        $routerMock = $this->getMockBuilder(testRouterInterfaceWithoutWarmableInterface::class)->onlyMethods(['match', 'generate', 'getContext', 'setContext', 'getRouteCollection'])->getMock();
+        $container->set('router', $routerMock);
+        $routerCacheWarmer = new RouterCacheWarmer($container);
+        $preload = $routerCacheWarmer->warmUp('/tmp');
+        self::assertSame([], $preload);
     }
 }
 
-interface testRouterInterfaceWithWarmebleInterface extends RouterInterface, WarmableInterface
+interface testRouterInterfaceWithWarmableInterface extends RouterInterface, WarmableInterface
 {
 }
 
-interface testRouterInterfaceWithoutWarmebleInterface extends RouterInterface
+interface testRouterInterfaceWithoutWarmableInterface extends RouterInterface
 {
 }
diff --git a/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
index 78b13905e..753c39cc8 100644
--- a/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
+++ b/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -62,7 +62,7 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
             $configCacheFactory->cache(
                 substr($file, 0, -5),
                 function () use ($file) {
-                    $this->fail(sprintf('Meta file "%s" is not fresh', (string) $file));
+                    $this->fail(\sprintf('Meta file "%s" is not fresh', (string) $file));
                 }
             );
         }
@@ -75,7 +75,7 @@ function () use ($file) {
         $kernelRef = new \ReflectionObject($this->kernel);
         $kernelFile = $kernelRef->getFileName();
         /** @var ResourceInterface[] $meta */
-        $meta = unserialize(file_get_contents($containerMetaFile));
+        $meta = unserialize($this->fs->readFile($containerMetaFile));
         $found = false;
         foreach ($meta as $resource) {
             if ((string) $resource === $kernelFile) {
@@ -92,8 +92,8 @@ function () use ($file) {
             $containerRef->getFileName()
         );
         $this->assertMatchesRegularExpression(
-            sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', $containerClass),
-            file_get_contents($containerFile),
+            \sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', $containerClass),
+            $this->fs->readFile($containerFile),
             'kernel.container_class is properly set on the dumped container'
         );
     }
diff --git a/Tests/Command/CachePoolClearCommandTest.php b/Tests/Command/CachePoolClearCommandTest.php
index fb7358831..3a927f217 100644
--- a/Tests/Command/CachePoolClearCommandTest.php
+++ b/Tests/Command/CachePoolClearCommandTest.php
@@ -17,7 +17,7 @@
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
 use Symfony\Component\HttpKernel\KernelInterface;
 
@@ -54,13 +54,11 @@ public static function provideCompletionSuggestions(): iterable
 
     private function getKernel(): MockObject&KernelInterface
     {
-        $container = $this->createMock(ContainerInterface::class);
-
         $kernel = $this->createMock(KernelInterface::class);
         $kernel
             ->expects($this->any())
             ->method('getContainer')
-            ->willReturn($container);
+            ->willReturn(new Container());
 
         $kernel
             ->expects($this->once())
diff --git a/Tests/Command/CachePoolDeleteCommandTest.php b/Tests/Command/CachePoolDeleteCommandTest.php
index caa7eb550..3db39e121 100644
--- a/Tests/Command/CachePoolDeleteCommandTest.php
+++ b/Tests/Command/CachePoolDeleteCommandTest.php
@@ -18,7 +18,7 @@
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Component\Console\Tester\CommandCompletionTester;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
 use Symfony\Component\HttpKernel\KernelInterface;
 
@@ -108,13 +108,11 @@ public static function provideCompletionSuggestions(): iterable
 
     private function getKernel(): MockObject&KernelInterface
     {
-        $container = $this->createMock(ContainerInterface::class);
-
         $kernel = $this->createMock(KernelInterface::class);
         $kernel
             ->expects($this->any())
             ->method('getContainer')
-            ->willReturn($container);
+            ->willReturn(new Container());
 
         $kernel
             ->expects($this->once())
diff --git a/Tests/Command/CachePruneCommandTest.php b/Tests/Command/CachePruneCommandTest.php
index 54467f1ef..a2d0ad7fe 100644
--- a/Tests/Command/CachePruneCommandTest.php
+++ b/Tests/Command/CachePruneCommandTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 class CachePruneCommandTest extends TestCase
@@ -50,13 +50,11 @@ private function getEmptyRewindableGenerator(): RewindableGenerator
 
     private function getKernel(): MockObject&KernelInterface
     {
-        $container = $this->createMock(ContainerInterface::class);
-
         $kernel = $this->createMock(KernelInterface::class);
         $kernel
             ->expects($this->any())
             ->method('getContainer')
-            ->willReturn($container);
+            ->willReturn(new Container());
 
         $kernel
             ->expects($this->once())
diff --git a/Tests/Command/RouterMatchCommandTest.php b/Tests/Command/RouterMatchCommandTest.php
index 7dab41991..b6b6771f9 100644
--- a/Tests/Command/RouterMatchCommandTest.php
+++ b/Tests/Command/RouterMatchCommandTest.php
@@ -16,7 +16,7 @@
 use Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Route;
@@ -72,24 +72,11 @@ private function getRouter()
 
     private function getKernel()
     {
-        $container = $this->createMock(ContainerInterface::class);
-        $container
-            ->expects($this->atLeastOnce())
-            ->method('has')
-            ->willReturnCallback(fn ($id) => 'console.command_loader' !== $id)
-        ;
-        $container
-            ->expects($this->any())
-            ->method('get')
-            ->with('router')
-            ->willReturn($this->getRouter())
-        ;
-
         $kernel = $this->createMock(KernelInterface::class);
         $kernel
             ->expects($this->any())
             ->method('getContainer')
-            ->willReturn($container)
+            ->willReturn(new Container())
         ;
         $kernel
             ->expects($this->once())
diff --git a/Tests/Command/SecretsRevealCommandTest.php b/Tests/Command/SecretsRevealCommandTest.php
new file mode 100644
index 000000000..94643db2c
--- /dev/null
+++ b/Tests/Command/SecretsRevealCommandTest.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Command\SecretsRevealCommand;
+use Symfony\Bundle\FrameworkBundle\Secrets\AbstractVault;
+use Symfony\Bundle\FrameworkBundle\Secrets\DotenvVault;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class SecretsRevealCommandTest extends TestCase
+{
+    public function testExecute()
+    {
+        $vault = $this->createMock(AbstractVault::class);
+        $vault->method('list')->willReturn(['secretKey' => 'secretValue']);
+
+        $command = new SecretsRevealCommand($vault);
+
+        $tester = new CommandTester($command);
+        $this->assertSame(Command::SUCCESS, $tester->execute(['name' => 'secretKey']));
+
+        $this->assertEquals('secretValue', trim($tester->getDisplay(true)));
+    }
+
+    public function testInvalidName()
+    {
+        $vault = $this->createMock(AbstractVault::class);
+        $vault->method('list')->willReturn(['secretKey' => 'secretValue']);
+
+        $command = new SecretsRevealCommand($vault);
+
+        $tester = new CommandTester($command);
+        $this->assertSame(Command::INVALID, $tester->execute(['name' => 'undefinedKey']));
+
+        $this->assertStringContainsString('The secret "undefinedKey" does not exist.', trim($tester->getDisplay(true)));
+    }
+
+    /**
+     * @backupGlobals enabled
+     */
+    public function testLocalVaultOverride()
+    {
+        $vault = $this->createMock(AbstractVault::class);
+        $vault->method('list')->willReturn(['secretKey' => 'secretValue']);
+
+        $_ENV = ['secretKey' => 'newSecretValue'];
+        $localVault = new DotenvVault('/not/a/path');
+
+        $command = new SecretsRevealCommand($vault, $localVault);
+
+        $tester = new CommandTester($command);
+        $this->assertSame(Command::SUCCESS, $tester->execute(['name' => 'secretKey']));
+
+        $this->assertEquals('newSecretValue', trim($tester->getDisplay(true)));
+    }
+
+    /**
+     * @backupGlobals enabled
+     */
+    public function testOnlyLocalVaultContainsName()
+    {
+        $vault = $this->createMock(AbstractVault::class);
+        $vault->method('list')->willReturn(['otherKey' => 'secretValue']);
+
+        $_ENV = ['secretKey' => 'secretValue'];
+        $localVault = new DotenvVault('/not/a/path');
+
+        $command = new SecretsRevealCommand($vault, $localVault);
+
+        $tester = new CommandTester($command);
+        $this->assertSame(Command::SUCCESS, $tester->execute(['name' => 'secretKey']));
+
+        $this->assertEquals('secretValue', trim($tester->getDisplay(true)));
+    }
+}
diff --git a/Tests/Command/TranslationDebugCommandTest.php b/Tests/Command/TranslationDebugCommandTest.php
index dcff845a3..c6c91a857 100644
--- a/Tests/Command/TranslationDebugCommandTest.php
+++ b/Tests/Command/TranslationDebugCommandTest.php
@@ -82,7 +82,8 @@ public function testDebugDefaultRootDirectory()
     {
         $this->fs->remove($this->translationDir);
         $this->fs = new Filesystem();
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
+        $this->translationDir = tempnam(sys_get_temp_dir(), 'sf_translation_');
+        $this->fs->remove($this->translationDir);
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
 
@@ -150,7 +151,8 @@ public function testNoErrorWithOnlyUnusedOptionAndNoResults()
     protected function setUp(): void
     {
         $this->fs = new Filesystem();
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
+        $this->translationDir = tempnam(sys_get_temp_dir(), 'sf_translation_');
+        $this->fs->remove($this->translationDir);
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
     }
diff --git a/Tests/Command/TranslationUpdateCommandCompletionTest.php b/Tests/Command/TranslationUpdateCommandCompletionTest.php
index 1b11a6111..4627508cb 100644
--- a/Tests/Command/TranslationUpdateCommandCompletionTest.php
+++ b/Tests/Command/TranslationUpdateCommandCompletionTest.php
@@ -57,7 +57,8 @@ public static function provideCompletionSuggestions(): iterable
     protected function setUp(): void
     {
         $this->fs = new Filesystem();
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
+        $this->translationDir = tempnam(sys_get_temp_dir(), 'sf_translation_');
+        $this->fs->remove($this->translationDir);
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
     }
diff --git a/Tests/Command/TranslationUpdateCommandTest.php b/Tests/Command/TranslationUpdateCommandTest.php
index 529a10ba5..f803c2908 100644
--- a/Tests/Command/TranslationUpdateCommandTest.php
+++ b/Tests/Command/TranslationUpdateCommandTest.php
@@ -20,6 +20,8 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Translation\Extractor\ExtractorInterface;
+use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Translation\MessageCatalogueInterface;
 use Symfony\Component\Translation\Reader\TranslationReader;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\Writer\TranslationWriter;
@@ -29,14 +31,6 @@ class TranslationUpdateCommandTest extends TestCase
     private Filesystem $fs;
     private string $translationDir;
 
-    public function testDumpMessagesAndCleanWithDeprecatedCommandName()
-    {
-        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
-        $tester->execute(['command' => 'translation:update', 'locale' => 'en', 'bundle' => 'foo', '--dump-messages' => true, '--clean' => true]);
-        $this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());
-        $this->assertMatchesRegularExpression('/1 message was successfully extracted/', $tester->getDisplay());
-    }
-
     public function testDumpMessagesAndClean()
     {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
@@ -86,11 +80,6 @@ public function testDumpWrongSortAndClean()
 
     public function testDumpMessagesAndCleanInRootDirectory()
     {
-        $this->fs->remove($this->translationDir);
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
-        $this->fs->mkdir($this->translationDir.'/translations');
-        $this->fs->mkdir($this->translationDir.'/templates');
-
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']], [], null, [$this->translationDir.'/trans'], [$this->translationDir.'/views']);
         $tester->execute(['command' => 'translation:extract', 'locale' => 'en', '--dump-messages' => true, '--clean' => true]);
         $this->assertMatchesRegularExpression('/foo/', $tester->getDisplay());
@@ -116,18 +105,27 @@ public function testDumpMessagesForSpecificDomain()
 
     public function testWriteMessages()
     {
-        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']], writerMessages: ['foo', 'test', 'bar']);
         $tester->execute(['command' => 'translation:extract', 'locale' => 'en', 'bundle' => 'foo', '--force' => true]);
         $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
     }
 
-    public function testWriteMessagesInRootDirectory()
+    public function testWriteSortMessages()
     {
-        $this->fs->remove($this->translationDir);
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
-        $this->fs->mkdir($this->translationDir.'/translations');
-        $this->fs->mkdir($this->translationDir.'/templates');
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']], writerMessages: ['bar', 'foo', 'test']);
+        $tester->execute(['command' => 'translation:extract', 'locale' => 'en', 'bundle' => 'foo', '--force' => true, '--sort' => 'asc']);
+        $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
+    }
 
+    public function testWriteReverseSortedMessages()
+    {
+        $tester = $this->createCommandTester(['messages' => ['foo' => 'foo', 'test' => 'test', 'bar' => 'bar']], writerMessages: ['test', 'foo', 'bar']);
+        $tester->execute(['command' => 'translation:extract', 'locale' => 'en', 'bundle' => 'foo', '--force' => true, '--sort' => 'desc']);
+        $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
+    }
+
+    public function testWriteMessagesInRootDirectory()
+    {
         $tester = $this->createCommandTester(['messages' => ['foo' => 'foo']]);
         $tester->execute(['command' => 'translation:extract', 'locale' => 'en', '--force' => true]);
         $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
@@ -179,10 +177,50 @@ public function testFilterDuplicateTransPaths()
         $this->assertEquals($expectedPaths, $filteredTransPaths);
     }
 
+    /**
+     * @dataProvider removeNoFillProvider
+     */
+    public function testRemoveNoFillTranslationsMethod($noFillCounter, $messages)
+    {
+        // Preparing mock
+        $operation = $this->createMock(MessageCatalogueInterface::class);
+        $operation
+            ->method('all')
+            ->with('messages')
+            ->willReturn($messages);
+        $operation
+            ->expects($this->exactly($noFillCounter))
+            ->method('set');
+
+        // Calling private method
+        $translationUpdate = $this->createMock(TranslationUpdateCommand::class);
+        $reflection = new \ReflectionObject($translationUpdate);
+        $method = $reflection->getMethod('removeNoFillTranslations');
+        $method->invokeArgs($translationUpdate, [$operation]);
+    }
+
+    public static function removeNoFillProvider(): array
+    {
+        return [
+            [0, []],
+            [0, ['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz']],
+            [0, ['foo' => "\0foo"]],
+            [0, ['foo' => "foo\0NoFill\0"]],
+            [0, ['foo' => "f\0NoFill\000"]],
+            [0, ['foo' => 'foo', 'bar' => 'bar']],
+            [1, ['foo' => "\0NoFill\0foo"]],
+            [1, ['foo' => "\0NoFill\0foo", 'bar' => 'bar']],
+            [1, ['foo' => 'foo', 'bar' => "\0NoFill\0bar"]],
+            [2, ['foo' => "\0NoFill\0foo", 'bar' => "\0NoFill\0bar"]],
+            [3, ['foo' => "\0NoFill\0foo", 'bar' => "\0NoFill\0bar", 'baz' => "\0NoFill\0baz"]],
+        ];
+    }
+
     protected function setUp(): void
     {
         $this->fs = new Filesystem();
-        $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
+        $this->translationDir = tempnam(sys_get_temp_dir(), 'sf_translation_');
+        $this->fs->remove($this->translationDir);
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
     }
@@ -192,7 +230,7 @@ protected function tearDown(): void
         $this->fs->remove($this->translationDir);
     }
 
-    private function createCommandTester($extractedMessages = [], $loadedMessages = [], ?KernelInterface $kernel = null, array $transPaths = [], array $codePaths = []): CommandTester
+    private function createCommandTester($extractedMessages = [], $loadedMessages = [], ?KernelInterface $kernel = null, array $transPaths = [], array $codePaths = [], ?array $writerMessages = null): CommandTester
     {
         $translator = $this->createMock(Translator::class);
         $translator
@@ -229,6 +267,16 @@ function ($path, $catalogue) use ($loadedMessages) {
             ->willReturn(
                 ['xlf', 'yml', 'yaml']
             );
+        if (null !== $writerMessages) {
+            $writer
+                ->expects($this->any())
+                ->method('write')
+                ->willReturnCallback(
+                    function (MessageCatalogue $catalogue) use ($writerMessages) {
+                        $this->assertSame($writerMessages, array_keys($catalogue->all()['messages']));
+                    }
+                );
+        }
 
         if (null === $kernel) {
             $returnValues = [
diff --git a/Tests/Command/XliffLintCommandTest.php b/Tests/Command/XliffLintCommandTest.php
index db32bc19c..d5495ada9 100644
--- a/Tests/Command/XliffLintCommandTest.php
+++ b/Tests/Command/XliffLintCommandTest.php
@@ -64,9 +64,7 @@ private function createCommandTester($application = null): CommandTester
 
         $command = $application->find('lint:xliff');
 
-        if ($application) {
-            $command->setApplication($application);
-        }
+        $command->setApplication($application);
 
         return new CommandTester($command);
     }
diff --git a/Tests/Command/YamlLintCommandTest.php b/Tests/Command/YamlLintCommandTest.php
index 08f4a7526..ec2093119 100644
--- a/Tests/Command/YamlLintCommandTest.php
+++ b/Tests/Command/YamlLintCommandTest.php
@@ -112,9 +112,7 @@ private function createCommandTester($application = null): CommandTester
 
         $command = $application->find('lint:yaml');
 
-        if ($application) {
-            $command->setApplication($application);
-        }
+        $command->setApplication($application);
 
         return new CommandTester($command);
     }
diff --git a/Tests/Console/ApplicationTest.php b/Tests/Console/ApplicationTest.php
index 4411d59ba..9afb5a2fd 100644
--- a/Tests/Console/ApplicationTest.php
+++ b/Tests/Console/ApplicationTest.php
@@ -22,11 +22,11 @@
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Tester\ApplicationTester;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
@@ -241,12 +241,10 @@ private function createEventForSuggestingPackages(string $command, array $altern
 
     private function getKernel(array $bundles, $useDispatcher = false)
     {
-        $container = $this->createMock(ContainerInterface::class);
-
-        $requestStack = $this->createMock(RequestStack::class);
-        $requestStack->expects($this->any())
-            ->method('push')
-        ;
+        $container = new Container(new ParameterBag([
+            'console.command.ids' => [],
+            'console.lazy_command.ids' => [],
+        ]));
 
         if ($useDispatcher) {
             $dispatcher = $this->createMock(EventDispatcherInterface::class);
@@ -255,45 +253,9 @@ private function getKernel(array $bundles, $useDispatcher = false)
                 ->method('dispatch')
             ;
 
-            $container->expects($this->atLeastOnce())
-                ->method('get')
-                ->willReturnMap([
-                    ['.virtual_request_stack', 2, $requestStack],
-                    ['event_dispatcher', 1, $dispatcher],
-                ])
-            ;
+            $container->set('event_dispatcher', $dispatcher);
         }
 
-        $container
-            ->expects($this->exactly(2))
-            ->method('hasParameter')
-            ->willReturnCallback(function (...$args) {
-                static $series = [
-                    ['console.command.ids'],
-                    ['console.lazy_command.ids'],
-                ];
-
-                $this->assertSame(array_shift($series), $args);
-
-                return true;
-            })
-        ;
-
-        $container
-            ->expects($this->exactly(2))
-            ->method('getParameter')
-            ->willReturnCallback(function (...$args) {
-                static $series = [
-                    ['console.lazy_command.ids'],
-                    ['console.command.ids'],
-                ];
-
-                $this->assertSame(array_shift($series), $args);
-
-                return [];
-            })
-        ;
-
         $kernel = $this->createMock(KernelInterface::class);
         $kernel->expects($this->once())->method('boot');
         $kernel
diff --git a/Tests/Console/Descriptor/AbstractDescriptorTestCase.php b/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
index cc6b08fd2..dde1f000b 100644
--- a/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
+++ b/Tests/Console/Descriptor/AbstractDescriptorTestCase.php
@@ -292,7 +292,7 @@ private static function getDescriptionTestData(iterable $objects): array
     {
         $data = [];
         foreach ($objects as $name => $object) {
-            $file = sprintf('%s.%s', trim($name, '.'), static::getFormat());
+            $file = \sprintf('%s.%s', trim($name, '.'), static::getFormat());
             $description = file_get_contents(__DIR__.'/../../Fixtures/Descriptor/'.$file);
             $data[] = [$object, $description, $file];
         }
@@ -313,7 +313,7 @@ private static function getContainerBuilderDescriptionTestData(array $objects):
         $data = [];
         foreach ($objects as $name => $object) {
             foreach ($variations as $suffix => $options) {
-                $file = sprintf('%s_%s.%s', trim($name, '.'), $suffix, static::getFormat());
+                $file = \sprintf('%s_%s.%s', trim($name, '.'), $suffix, static::getFormat());
                 $description = file_get_contents(__DIR__.'/../../Fixtures/Descriptor/'.$file);
                 $data[] = [$object, $description, $options, $file];
             }
@@ -332,7 +332,7 @@ private static function getEventDispatcherDescriptionTestData(array $objects): a
         $data = [];
         foreach ($objects as $name => $object) {
             foreach ($variations as $suffix => $options) {
-                $file = sprintf('%s_%s.%s', trim($name, '.'), $suffix, static::getFormat());
+                $file = \sprintf('%s_%s.%s', trim($name, '.'), $suffix, static::getFormat());
                 $description = file_get_contents(__DIR__.'/../../Fixtures/Descriptor/'.$file);
                 $data[] = [$object, $description, $options, $file];
             }
@@ -353,7 +353,7 @@ public static function getDescribeContainerBuilderWithPriorityTagsTestData(): ar
         $data = [];
         foreach (ObjectsProvider::getContainerBuildersWithPriorityTags() as $name => $object) {
             foreach ($variations as $suffix => $options) {
-                $file = sprintf('%s_%s.%s', trim($name, '.'), $suffix, static::getFormat());
+                $file = \sprintf('%s_%s.%s', trim($name, '.'), $suffix, static::getFormat());
                 $description = file_get_contents(__DIR__.'/../../Fixtures/Descriptor/'.$file);
                 $data[] = [$object, $description, $options];
             }
diff --git a/Tests/Console/Descriptor/TextDescriptorTest.php b/Tests/Console/Descriptor/TextDescriptorTest.php
index 2404706d0..34e16f5e4 100644
--- a/Tests/Console/Descriptor/TextDescriptorTest.php
+++ b/Tests/Console/Descriptor/TextDescriptorTest.php
@@ -35,7 +35,7 @@ public static function getDescribeRouteWithControllerLinkTestData()
 
         foreach ($getDescribeData as $key => &$data) {
             $routeStub = $data[0];
-            $routeStub->setDefault('_controller', sprintf('%s::%s', MyController::class, '__invoke'));
+            $routeStub->setDefault('_controller', \sprintf('%s::%s', MyController::class, '__invoke'));
             $file = $data[2];
             $file = preg_replace('#(\..*?)$#', '_link$1', $file);
             $data = file_get_contents(__DIR__.'/../../Fixtures/Descriptor/'.$file);
diff --git a/Tests/Controller/AbstractControllerTest.php b/Tests/Controller/AbstractControllerTest.php
index f806c540b..55a363984 100644
--- a/Tests/Controller/AbstractControllerTest.php
+++ b/Tests/Controller/AbstractControllerTest.php
@@ -431,7 +431,7 @@ public function testRenderViewWithForm()
     {
         $formView = new FormView();
 
-        $form = $this->getMockBuilder(FormInterface::class)->getMock();
+        $form = $this->createMock(FormInterface::class);
         $form->expects($this->once())->method('createView')->willReturn($formView);
 
         $twig = $this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock();
@@ -452,7 +452,7 @@ public function testRenderWithFormSubmittedAndInvalid()
     {
         $formView = new FormView();
 
-        $form = $this->getMockBuilder(FormInterface::class)->getMock();
+        $form = $this->createMock(FormInterface::class);
         $form->expects($this->once())->method('createView')->willReturn($formView);
         $form->expects($this->once())->method('isSubmitted')->willReturn(true);
         $form->expects($this->once())->method('isValid')->willReturn(false);
@@ -472,58 +472,6 @@ public function testRenderWithFormSubmittedAndInvalid()
         $this->assertSame('bar', $response->getContent());
     }
 
-    /**
-     * @group legacy
-     */
-    public function testRenderForm()
-    {
-        $formView = new FormView();
-
-        $form = $this->getMockBuilder(FormInterface::class)->getMock();
-        $form->expects($this->once())->method('createView')->willReturn($formView);
-
-        $twig = $this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock();
-        $twig->expects($this->once())->method('render')->with('foo', ['bar' => $formView])->willReturn('bar');
-
-        $container = new Container();
-        $container->set('twig', $twig);
-
-        $controller = $this->createController();
-        $controller->setContainer($container);
-
-        $response = $controller->renderForm('foo', ['bar' => $form]);
-
-        $this->assertTrue($response->isSuccessful());
-        $this->assertSame('bar', $response->getContent());
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testRenderFormSubmittedAndInvalid()
-    {
-        $formView = new FormView();
-
-        $form = $this->getMockBuilder(FormInterface::class)->getMock();
-        $form->expects($this->once())->method('createView')->willReturn($formView);
-        $form->expects($this->once())->method('isSubmitted')->willReturn(true);
-        $form->expects($this->once())->method('isValid')->willReturn(false);
-
-        $twig = $this->getMockBuilder(Environment::class)->disableOriginalConstructor()->getMock();
-        $twig->expects($this->once())->method('render')->with('foo', ['bar' => $formView])->willReturn('bar');
-
-        $container = new Container();
-        $container->set('twig', $twig);
-
-        $controller = $this->createController();
-        $controller->setContainer($container);
-
-        $response = $controller->renderForm('foo', ['bar' => $form]);
-
-        $this->assertSame(422, $response->getStatusCode());
-        $this->assertSame('bar', $response->getContent());
-    }
-
     public function testStreamTwig()
     {
         $twig = $this->createMock(Environment::class);
diff --git a/Tests/Controller/ControllerResolverTest.php b/Tests/Controller/ControllerResolverTest.php
index 39c62409f..7c7398fd3 100644
--- a/Tests/Controller/ControllerResolverTest.php
+++ b/Tests/Controller/ControllerResolverTest.php
@@ -13,74 +13,14 @@
 
 use Psr\Container\ContainerInterface as Psr11ContainerInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver;
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ContainerAwareController;
 use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Tests\Controller\ContainerControllerResolverTest;
 
 class ControllerResolverTest extends ContainerControllerResolverTest
 {
-    use ExpectDeprecationTrait;
-
-    /**
-     * @group legacy
-     */
-    public function testGetControllerOnContainerAware()
-    {
-        $resolver = $this->createControllerResolver();
-        $request = Request::create('/');
-        $request->attributes->set('_controller', sprintf('%s::testAction', ContainerAwareController::class));
-
-        $this->expectDeprecation(sprintf('Since symfony/dependency-injection 6.4: Relying on "Symfony\Component\DependencyInjection\ContainerAwareInterface" to get the container in "%s" is deprecated, register the controller as a service and use dependency injection instead.', ContainerAwareController::class));
-        $controller = $resolver->getController($request);
-
-        $this->assertInstanceOf(ContainerAwareController::class, $controller[0]);
-        $this->assertInstanceOf(ContainerInterface::class, $controller[0]->getContainer());
-        $this->assertSame('testAction', $controller[1]);
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testGetControllerOnContainerAwareInvokable()
-    {
-        $resolver = $this->createControllerResolver();
-        $request = Request::create('/');
-        $request->attributes->set('_controller', ContainerAwareController::class);
-
-        $this->expectDeprecation(sprintf('Since symfony/dependency-injection 6.4: Relying on "Symfony\Component\DependencyInjection\ContainerAwareInterface" to get the container in "%s" is deprecated, register the controller as a service and use dependency injection instead.', ContainerAwareController::class));
-        $controller = $resolver->getController($request);
-
-        $this->assertInstanceOf(ContainerAwareController::class, $controller);
-        $this->assertInstanceOf(ContainerInterface::class, $controller->getContainer());
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testContainerAwareControllerGetsContainerWhenNotSet()
-    {
-        class_exists(AbstractControllerTest::class);
-
-        $controller = new ContainerAwareController();
-
-        $container = new Container();
-        $container->set(TestAbstractController::class, $controller);
-
-        $resolver = $this->createControllerResolver(null, $container);
-
-        $request = Request::create('/');
-        $request->attributes->set('_controller', TestAbstractController::class.'::testAction');
-
-        $this->expectDeprecation(sprintf('Since symfony/dependency-injection 6.4: Relying on "Symfony\Component\DependencyInjection\ContainerAwareInterface" to get the container in "%s" is deprecated, register the controller as a service and use dependency injection instead.', ContainerAwareController::class));
-        $this->assertSame([$controller, 'testAction'], $resolver->getController($request));
-        $this->assertSame($container, $controller->getContainer());
-    }
-
     public function testAbstractControllerGetsContainerWhenNotSet()
     {
         $this->expectException(\LogicException::class);
@@ -166,7 +106,7 @@ class_exists(AbstractControllerTest::class);
     protected function createControllerResolver(?LoggerInterface $logger = null, ?Psr11ContainerInterface $container = null)
     {
         if (!$container) {
-            $container = $this->createMockContainer();
+            $container = new Container();
         }
 
         return new ControllerResolver($container, $logger);
@@ -176,11 +116,6 @@ protected function createMockParser()
     {
         return $this->createMock(ControllerNameParser::class);
     }
-
-    protected function createMockContainer()
-    {
-        return $this->createMock(ContainerInterface::class);
-    }
 }
 
 class DummyController extends AbstractController
diff --git a/Tests/Controller/TemplateControllerTest.php b/Tests/Controller/TemplateControllerTest.php
index c972151d2..1d98f4f8e 100644
--- a/Tests/Controller/TemplateControllerTest.php
+++ b/Tests/Controller/TemplateControllerTest.php
@@ -21,6 +21,19 @@
  */
 class TemplateControllerTest extends TestCase
 {
+    public function testMethodSignaturesMatch()
+    {
+        $ref = new \ReflectionClass(TemplateController::class);
+
+        $templateActionRef = $ref->getMethod('templateAction');
+        $invokeRef = $ref->getMethod('__invoke');
+
+        $this->assertSame(
+            array_map(strval(...), $templateActionRef->getParameters()),
+            array_map(strval(...), $invokeRef->getParameters()),
+        );
+    }
+
     public function testTwig()
     {
         $twig = $this->createMock(Environment::class);
@@ -82,6 +95,26 @@ public function testStatusCode()
         $controller = new TemplateController($twig);
 
         $this->assertSame(201, $controller->templateAction($templateName, null, null, null, [], $statusCode)->getStatusCode());
+        $this->assertSame(201, $controller($templateName, null, null, null, [], $statusCode)->getStatusCode());
+
         $this->assertSame(200, $controller->templateAction($templateName)->getStatusCode());
+        $this->assertSame(200, $controller($templateName)->getStatusCode());
+    }
+
+    public function testHeaders()
+    {
+        $templateName = 'image.svg.twig';
+
+        $loader = new ArrayLoader();
+        $loader->setTemplate($templateName, '<svg></svg>');
+
+        $twig = new Environment($loader);
+        $controller = new TemplateController($twig);
+
+        $this->assertSame('image/svg+xml', $controller->templateAction($templateName, headers: ['Content-Type' => 'image/svg+xml'])->headers->get('Content-Type'));
+        $this->assertSame('image/svg+xml', $controller($templateName, headers: ['Content-Type' => 'image/svg+xml'])->headers->get('Content-Type'));
+
+        $this->assertNull($controller->templateAction($templateName)->headers->get('Content-Type'));
+        $this->assertNull($controller($templateName)->headers->get('Content-Type'));
     }
 }
diff --git a/Tests/Controller/TestAbstractController.php b/Tests/Controller/TestAbstractController.php
index 18f3eabb7..7c13aedb5 100644
--- a/Tests/Controller/TestAbstractController.php
+++ b/Tests/Controller/TestAbstractController.php
@@ -41,11 +41,11 @@ public function setContainer(ContainerInterface $container): ?ContainerInterface
                 continue;
             }
             if (!isset($expected[$id])) {
-                throw new \UnexpectedValueException(sprintf('Service "%s" is not expected, as declared by "%s::getSubscribedServices()".', $id, AbstractController::class));
+                throw new \UnexpectedValueException(\sprintf('Service "%s" is not expected, as declared by "%s::getSubscribedServices()".', $id, AbstractController::class));
             }
             $type = substr($expected[$id], 1);
             if (!$container->get($id) instanceof $type) {
-                throw new \UnexpectedValueException(sprintf('Service "%s" is expected to be an instance of "%s", as declared by "%s::getSubscribedServices()".', $id, $type, AbstractController::class));
+                throw new \UnexpectedValueException(\sprintf('Service "%s" is expected to be an instance of "%s", as declared by "%s::getSubscribedServices()".', $id, $type, AbstractController::class));
             }
         }
 
diff --git a/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php b/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
deleted file mode 100644
index d159057c6..000000000
--- a/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddExpressionLanguageProvidersPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * @group legacy
- */
-class AddExpressionLanguageProvidersPassTest extends TestCase
-{
-    public function testProcessForRouter()
-    {
-        $container = new ContainerBuilder();
-        $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
-
-        $definition = new Definition(\stdClass::class);
-        $definition->addTag('routing.expression_language_provider');
-        $container->setDefinition('some_routing_provider', $definition->setPublic(true));
-
-        $container->register('router.default', \stdClass::class)->setPublic(true);
-        $container->compile();
-
-        $router = $container->getDefinition('router.default');
-        $calls = $router->getMethodCalls();
-        $this->assertCount(1, $calls);
-        $this->assertEquals('addExpressionLanguageProvider', $calls[0][0]);
-        $this->assertEquals(new Reference('some_routing_provider'), $calls[0][1][0]);
-    }
-
-    public function testProcessForRouterAlias()
-    {
-        $container = new ContainerBuilder();
-        $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
-
-        $definition = new Definition(\stdClass::class);
-        $definition->addTag('routing.expression_language_provider');
-        $container->setDefinition('some_routing_provider', $definition->setPublic(true));
-
-        $container->register('my_router', \stdClass::class)->setPublic(true);
-        $container->setAlias('router.default', 'my_router');
-        $container->compile();
-
-        $router = $container->getDefinition('my_router');
-        $calls = $router->getMethodCalls();
-        $this->assertCount(1, $calls);
-        $this->assertEquals('addExpressionLanguageProvider', $calls[0][0]);
-        $this->assertEquals(new Reference('some_routing_provider'), $calls[0][1][0]);
-    }
-}
diff --git a/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php b/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
deleted file mode 100644
index 9344eda1c..000000000
--- a/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\DataCollectorTranslatorPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\Translation\DataCollector\TranslationDataCollector;
-use Symfony\Component\Translation\DataCollectorTranslator;
-use Symfony\Component\Translation\Translator;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-/**
- * @group legacy
- */
-class DataCollectorTranslatorPassTest extends TestCase
-{
-    private ContainerBuilder $container;
-    private DataCollectorTranslatorPass $dataCollectorTranslatorPass;
-
-    protected function setUp(): void
-    {
-        $this->container = new ContainerBuilder();
-        $this->dataCollectorTranslatorPass = new DataCollectorTranslatorPass();
-
-        $this->container->setParameter('translator_implementing_bag', Translator::class);
-        $this->container->setParameter('translator_not_implementing_bag', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag');
-
-        $this->container->register('translator.data_collector', DataCollectorTranslator::class)
-            ->setDecoratedService('translator')
-            ->setArguments([new Reference('translator.data_collector.inner')])
-        ;
-
-        $this->container->register('data_collector.translation', TranslationDataCollector::class)
-            ->setArguments([new Reference('translator.data_collector')])
-        ;
-    }
-
-    /**
-     * @dataProvider getImplementingTranslatorBagInterfaceTranslatorClassNames
-     */
-    public function testProcessKeepsDataCollectorTranslatorIfItImplementsTranslatorBagInterface($class)
-    {
-        $this->container->register('translator', $class);
-
-        $this->dataCollectorTranslatorPass->process($this->container);
-
-        $this->assertTrue($this->container->hasDefinition('translator.data_collector'));
-    }
-
-    /**
-     * @dataProvider getImplementingTranslatorBagInterfaceTranslatorClassNames
-     */
-    public function testProcessKeepsDataCollectorIfTranslatorImplementsTranslatorBagInterface($class)
-    {
-        $this->container->register('translator', $class);
-
-        $this->dataCollectorTranslatorPass->process($this->container);
-
-        $this->assertTrue($this->container->hasDefinition('data_collector.translation'));
-    }
-
-    public static function getImplementingTranslatorBagInterfaceTranslatorClassNames()
-    {
-        return [
-            [Translator::class],
-            ['%translator_implementing_bag%'],
-        ];
-    }
-
-    /**
-     * @dataProvider getNotImplementingTranslatorBagInterfaceTranslatorClassNames
-     */
-    public function testProcessRemovesDataCollectorTranslatorIfItDoesNotImplementTranslatorBagInterface($class)
-    {
-        $this->container->register('translator', $class);
-
-        $this->dataCollectorTranslatorPass->process($this->container);
-
-        $this->assertFalse($this->container->hasDefinition('translator.data_collector'));
-    }
-
-    /**
-     * @dataProvider getNotImplementingTranslatorBagInterfaceTranslatorClassNames
-     */
-    public function testProcessRemovesDataCollectorIfTranslatorDoesNotImplementTranslatorBagInterface($class)
-    {
-        $this->container->register('translator', $class);
-
-        $this->dataCollectorTranslatorPass->process($this->container);
-
-        $this->assertFalse($this->container->hasDefinition('data_collector.translation'));
-    }
-
-    public static function getNotImplementingTranslatorBagInterfaceTranslatorClassNames()
-    {
-        return [
-            ['Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag'],
-            ['%translator_not_implementing_bag%'],
-        ];
-    }
-}
-
-class TranslatorWithTranslatorBag implements TranslatorInterface
-{
-    public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string
-    {
-    }
-
-    public function getLocale(): string
-    {
-        return 'en';
-    }
-}
diff --git a/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php b/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
deleted file mode 100644
index e15c62207..000000000
--- a/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\Translation\Translator;
-
-/**
- * @group legacy
- */
-class LoggingTranslatorPassTest extends TestCase
-{
-    public function testProcess()
-    {
-        $container = new ContainerBuilder();
-        $container->setParameter('translator.logging', true);
-        $container->setParameter('translator.class', Translator::class);
-        $container->register('monolog.logger');
-        $container->setAlias('logger', 'monolog.logger');
-        $container->register('translator.default', '%translator.class%');
-        $container->register('translator.logging', '%translator.class%');
-        $container->setAlias('translator', 'translator.default');
-        $translationWarmerDefinition = $container->register('translation.warmer')
-            ->addArgument(new Reference('translator'))
-            ->addTag('container.service_subscriber', ['id' => 'translator'])
-            ->addTag('container.service_subscriber', ['id' => 'foo']);
-
-        $pass = new LoggingTranslatorPass();
-        $pass->process($container);
-
-        $this->assertEquals(
-            ['container.service_subscriber' => [
-                ['id' => 'foo'],
-                ['key' => 'translator', 'id' => 'translator.logging.inner'],
-            ]],
-            $translationWarmerDefinition->getTags()
-        );
-    }
-
-    public function testThatCompilerPassIsIgnoredIfThereIsNotLoggerDefinition()
-    {
-        $container = new ContainerBuilder();
-        $container->register('identity_translator');
-        $container->setAlias('translator', 'identity_translator');
-
-        $definitionsBefore = \count($container->getDefinitions());
-        $aliasesBefore = \count($container->getAliases());
-
-        $pass = new LoggingTranslatorPass();
-        $pass->process($container);
-
-        // the container is untouched (i.e. no new definitions or aliases)
-        $this->assertCount($definitionsBefore, $container->getDefinitions());
-        $this->assertCount($aliasesBefore, $container->getAliases());
-    }
-
-    public function testThatCompilerPassIsIgnoredIfThereIsNotTranslatorDefinition()
-    {
-        $container = new ContainerBuilder();
-        $container->register('monolog.logger');
-        $container->setAlias('logger', 'monolog.logger');
-
-        $definitionsBefore = \count($container->getDefinitions());
-        $aliasesBefore = \count($container->getAliases());
-
-        $pass = new LoggingTranslatorPass();
-        $pass->process($container);
-
-        // the container is untouched (i.e. no new definitions or aliases)
-        $this->assertCount($definitionsBefore, $container->getDefinitions());
-        $this->assertCount($aliasesBefore, $container->getAliases());
-    }
-}
diff --git a/Tests/DependencyInjection/Compiler/ProfilerPassTest.php b/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
index 1b699d4d1..5a2215009 100644
--- a/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
+++ b/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
@@ -66,7 +66,7 @@ public function testValidCollector()
 
     public static function provideValidCollectorWithTemplateUsingAutoconfigure(): \Generator
     {
-        yield [new class() implements TemplateAwareDataCollectorInterface {
+        yield [new class implements TemplateAwareDataCollectorInterface {
             public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
             {
             }
@@ -86,7 +86,7 @@ public static function getTemplate(): string
             }
         }];
 
-        yield [new class() extends AbstractDataCollector {
+        yield [new class extends AbstractDataCollector {
             public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
             {
             }
diff --git a/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php b/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
index d9785f1dc..b6021fbdd 100644
--- a/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
+++ b/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
@@ -29,7 +29,7 @@ public function testProcess()
 
         $pass->process($container);
 
-        $this->assertSame([sprintf('%s: Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?', UnusedTagsPass::class)], $container->getCompiler()->getLog());
+        $this->assertSame([\sprintf('%s: Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?', UnusedTagsPass::class)], $container->getCompiler()->getLog());
     }
 
     public function testMissingKnownTags()
diff --git a/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php b/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php
deleted file mode 100644
index 15016df36..000000000
--- a/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\WorkflowGuardListenerPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\LogicException;
-use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Security\Core\Role\RoleHierarchy;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-
-/**
- * @group legacy
- */
-class WorkflowGuardListenerPassTest extends TestCase
-{
-    private ContainerBuilder $container;
-    private WorkflowGuardListenerPass $compilerPass;
-
-    protected function setUp(): void
-    {
-        $this->container = new ContainerBuilder();
-        $this->compilerPass = new WorkflowGuardListenerPass();
-    }
-
-    public function testNoExeptionIfParameterIsNotSet()
-    {
-        $this->compilerPass->process($this->container);
-
-        $this->assertFalse($this->container->hasParameter('workflow.has_guard_listeners'));
-    }
-
-    public function testNoExeptionIfAllDependenciesArePresent()
-    {
-        $this->container->setParameter('workflow.has_guard_listeners', true);
-        $this->container->register('security.token_storage', TokenStorageInterface::class);
-        $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
-        $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
-        $this->container->register('security.role_hierarchy', RoleHierarchy::class);
-        $this->container->register('validator', ValidatorInterface::class);
-
-        $this->compilerPass->process($this->container);
-
-        $this->assertFalse($this->container->hasParameter('workflow.has_guard_listeners'));
-    }
-
-    public function testExceptionIfTheTokenStorageServiceIsNotPresent()
-    {
-        $this->container->setParameter('workflow.has_guard_listeners', true);
-        $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
-        $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
-        $this->container->register('security.role_hierarchy', RoleHierarchy::class);
-
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The "security.token_storage" service is needed to be able to use the workflow guard listener.');
-
-        $this->compilerPass->process($this->container);
-    }
-
-    public function testExceptionIfTheAuthorizationCheckerServiceIsNotPresent()
-    {
-        $this->container->setParameter('workflow.has_guard_listeners', true);
-        $this->container->register('security.token_storage', TokenStorageInterface::class);
-        $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
-        $this->container->register('security.role_hierarchy', RoleHierarchy::class);
-
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The "security.authorization_checker" service is needed to be able to use the workflow guard listener.');
-
-        $this->compilerPass->process($this->container);
-    }
-
-    public function testExceptionIfTheAuthenticationTrustResolverServiceIsNotPresent()
-    {
-        $this->container->setParameter('workflow.has_guard_listeners', true);
-        $this->container->register('security.token_storage', TokenStorageInterface::class);
-        $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
-        $this->container->register('security.role_hierarchy', RoleHierarchy::class);
-
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The "security.authentication.trust_resolver" service is needed to be able to use the workflow guard listener.');
-
-        $this->compilerPass->process($this->container);
-    }
-
-    public function testExceptionIfTheRoleHierarchyServiceIsNotPresent()
-    {
-        $this->container->setParameter('workflow.has_guard_listeners', true);
-        $this->container->register('security.token_storage', TokenStorageInterface::class);
-        $this->container->register('security.authorization_checker', AuthorizationCheckerInterface::class);
-        $this->container->register('security.authentication.trust_resolver', AuthenticationTrustResolverInterface::class);
-
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('The "security.role_hierarchy" service is needed to be able to use the workflow guard listener.');
-
-        $this->compilerPass->process($this->container);
-    }
-}
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
index 76d135122..6f3363f39 100644
--- a/Tests/DependencyInjection/ConfigurationTest.php
+++ b/Tests/DependencyInjection/ConfigurationTest.php
@@ -26,9 +26,12 @@
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Notifier\Notifier;
 use Symfony\Component\RateLimiter\Policy\TokenBucketLimiter;
+use Symfony\Component\RemoteEvent\RemoteEvent;
 use Symfony\Component\Scheduler\Messenger\SchedulerTransportFactory;
 use Symfony\Component\Serializer\Encoder\JsonDecode;
+use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\Uid\Factory\UuidFactory;
+use Symfony\Component\Webhook\Controller\WebhookController;
 
 class ConfigurationTest extends TestCase
 {
@@ -223,13 +226,13 @@ public function testInvalidAssetsConfiguration(array $assetConfig, $expectedMess
         $this->expectExceptionMessage($expectedMessage);
 
         $processor->processConfiguration($configuration, [
-                [
-                    'http_method_override' => false,
-                    'handle_all_throwables' => true,
-                    'php_errors' => ['log' => true],
-                    'assets' => $assetConfig,
-                ],
-            ]);
+            [
+                'http_method_override' => false,
+                'handle_all_throwables' => true,
+                'php_errors' => ['log' => true],
+                'assets' => $assetConfig,
+            ],
+        ]);
     }
 
     public static function provideInvalidAssetConfigurationTests(): iterable
@@ -632,32 +635,114 @@ public function testSerializerJsonDetailedErrorMessagesInDefaultContextCanBeDisa
         $this->assertSame(['foo' => 'bar', JsonDecode::DETAILED_ERROR_MESSAGES => false, 'foobar' => 'baz'], $config['serializer']['default_context'] ?? []);
     }
 
+    public function testScopedHttpClientsInheritRateLimiterAndRetryFailedConfiguration()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+
+        $config = $processor->processConfiguration($configuration, [[
+            'http_client' => [
+                'default_options' => ['rate_limiter' => 'default_limiter', 'retry_failed' => ['max_retries' => 77]],
+                'scoped_clients' => [
+                    'foo' => ['base_uri' => 'http://example.com'],
+                    'bar' => ['base_uri' => 'http://example.com', 'rate_limiter' => true, 'retry_failed' => true],
+                    'baz' => ['base_uri' => 'http://example.com', 'rate_limiter' => false, 'retry_failed' => false],
+                    'qux' => ['base_uri' => 'http://example.com', 'rate_limiter' => 'foo_limiter', 'retry_failed' => ['max_retries' => 88, 'delay' => 999]],
+                ],
+            ],
+        ]]);
+
+        $scopedClients = $config['http_client']['scoped_clients'];
+
+        $this->assertSame('default_limiter', $scopedClients['foo']['rate_limiter']);
+        $this->assertTrue($scopedClients['foo']['retry_failed']['enabled']);
+        $this->assertSame(77, $scopedClients['foo']['retry_failed']['max_retries']);
+        $this->assertSame(1000, $scopedClients['foo']['retry_failed']['delay']);
+
+        $this->assertSame('default_limiter', $scopedClients['bar']['rate_limiter']);
+        $this->assertTrue($scopedClients['bar']['retry_failed']['enabled']);
+        $this->assertSame(77, $scopedClients['bar']['retry_failed']['max_retries']);
+        $this->assertSame(1000, $scopedClients['bar']['retry_failed']['delay']);
+
+        $this->assertNull($scopedClients['baz']['rate_limiter']);
+        $this->assertFalse($scopedClients['baz']['retry_failed']['enabled']);
+        $this->assertSame(3, $scopedClients['baz']['retry_failed']['max_retries']);
+        $this->assertSame(1000, $scopedClients['baz']['retry_failed']['delay']);
+
+        $this->assertSame('foo_limiter', $scopedClients['qux']['rate_limiter']);
+        $this->assertTrue($scopedClients['qux']['retry_failed']['enabled']);
+        $this->assertSame(88, $scopedClients['qux']['retry_failed']['max_retries']);
+        $this->assertSame(999, $scopedClients['qux']['retry_failed']['delay']);
+    }
+
+    public function testSerializerJsonDetailedErrorMessagesEnabledByDefaultWithDebugEnabled()
+    {
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(true), [
+            [
+                'serializer' => null,
+            ],
+        ]);
+
+        $this->assertSame([JsonDecode::DETAILED_ERROR_MESSAGES => true], $config['serializer']['default_context'] ?? []);
+    }
+
+    public function testSerializerJsonDetailedErrorMessagesNotSetByDefaultWithDebugDisabled()
+    {
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(false), [
+            [
+                'serializer' => null,
+            ],
+        ]);
+
+        $this->assertSame([], $config['serializer']['default_context'] ?? []);
+    }
+
+    public function testFormCsrfProtectionFieldAttrDoNotNormalizeKeys()
+    {
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(false), [
+            [
+                'form' => [
+                    'csrf_protection' => [
+                        'field_attr' => ['data-example-attr' => 'value'],
+                    ],
+                ],
+            ],
+        ]);
+
+        $this->assertSame(['data-example-attr' => 'value'], $config['form']['csrf_protection']['field_attr'] ?? []);
+    }
+
     protected static function getBundleDefaultConfig()
     {
         return [
             'http_method_override' => false,
             'handle_all_throwables' => true,
-            'trust_x_sendfile_type_header' => false,
+            'trust_x_sendfile_type_header' => '%env(bool:default::SYMFONY_TRUST_X_SENDFILE_TYPE_HEADER)%',
             'ide' => '%env(default::SYMFONY_IDE)%',
             'default_locale' => 'en',
             'enabled_locales' => [],
             'set_locale_from_accept_language' => false,
             'set_content_language_from_locale' => false,
             'secret' => 's3cr3t',
-            'trusted_hosts' => [],
-            'trusted_headers' => [
-                'x-forwarded-for',
-                'x-forwarded-port',
-                'x-forwarded-proto',
-            ],
+            'trusted_hosts' => ['%env(default::SYMFONY_TRUSTED_HOSTS)%'],
+            'trusted_proxies' => ['%env(default::SYMFONY_TRUSTED_PROXIES)%'],
+            'trusted_headers' => ['%env(default::SYMFONY_TRUSTED_HEADERS)%'],
             'csrf_protection' => [
-                'enabled' => false,
+                'enabled' => null,
+                'cookie_name' => 'csrf-token',
+                'check_header' => false,
+                'stateless_token_ids' => [],
             ],
             'form' => [
                 'enabled' => !class_exists(FullStack::class),
                 'csrf_protection' => [
                     'enabled' => null, // defaults to csrf_protection.enabled
                     'field_name' => '_token',
+                    'field_attr' => ['data-controller' => 'csrf-protection'],
+                    'token_id' => null,
                 ],
             ],
             'esi' => ['enabled' => false],
@@ -707,18 +792,17 @@ protected static function getBundleDefaultConfig()
                     'enabled' => true,
                     'endpoint' => null,
                 ],
+                'email_validation_mode' => 'html5',
             ],
             'annotations' => [
-                'cache' => 'php_array',
-                'file_cache_dir' => '%kernel.cache_dir%/annotations',
-                'debug' => true,
-                'enabled' => true,
+                'enabled' => false,
             ],
             'serializer' => [
                 'default_context' => ['foo' => 'bar', JsonDecode::DETAILED_ERROR_MESSAGES => true],
                 'enabled' => true,
                 'enable_attributes' => !class_exists(FullStack::class),
                 'mapping' => ['paths' => []],
+                'named_serializers' => [],
             ],
             'property_access' => [
                 'enabled' => true,
@@ -728,6 +812,9 @@ protected static function getBundleDefaultConfig()
                 'throw_exception_on_invalid_index' => false,
                 'throw_exception_on_invalid_property_path' => true,
             ],
+            'type_info' => [
+                'enabled' => !class_exists(FullStack::class) && class_exists(Type::class),
+            ],
             'property_info' => [
                 'enabled' => !class_exists(FullStack::class),
             ],
@@ -738,16 +825,14 @@ protected static function getBundleDefaultConfig()
                 'https_port' => 443,
                 'strict_requirements' => true,
                 'utf8' => true,
-                'cache_dir' => '%kernel.cache_dir%',
+                'cache_dir' => '%kernel.build_dir%',
             ],
             'session' => [
                 'enabled' => false,
                 'storage_factory_id' => 'session.storage.factory.native',
-                'handler_id' => 'session.handler.native_file',
                 'cookie_httponly' => true,
-                'cookie_samesite' => null,
-                'gc_probability' => 1,
-                'save_path' => '%kernel.cache_dir%/sessions',
+                'cookie_samesite' => 'lax',
+                'cookie_secure' => 'auto',
                 'metadata_update_threshold' => 0,
             ],
             'request' => [
@@ -828,7 +913,6 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
                 ],
                 'default_bus' => null,
                 'buses' => ['messenger.bus.default' => ['default_middleware' => ['enabled' => true, 'allow_no_handlers' => false, 'allow_no_senders' => true], 'middleware' => []]],
-                'reset_on_message' => true,
                 'stop_worker_on_signals' => [],
             ],
             'disallow_search_engine_index' => true,
@@ -871,9 +955,9 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
             ],
             'uid' => [
                 'enabled' => !class_exists(FullStack::class) && class_exists(UuidFactory::class),
-                'default_uuid_version' => 6,
+                'default_uuid_version' => 7,
                 'name_based_uuid_version' => 5,
-                'time_based_uuid_version' => 6,
+                'time_based_uuid_version' => 7,
             ],
             'html_sanitizer' => [
                 'enabled' => !class_exists(FullStack::class) && class_exists(HtmlSanitizer::class),
@@ -884,13 +968,30 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
             ],
             'exceptions' => [],
             'webhook' => [
-                'enabled' => false,
+                'enabled' => !class_exists(FullStack::class) && class_exists(WebhookController::class),
                 'routing' => [],
                 'message_bus' => 'messenger.default_bus',
             ],
             'remote-event' => [
-                'enabled' => false,
+                'enabled' => !class_exists(FullStack::class) && class_exists(RemoteEvent::class),
             ],
         ];
     }
+
+    public function testNamedSerializersReservedName()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Invalid configuration for path "framework.serializer.named_serializers": "default" is a reserved name.');
+
+        $processor->processConfiguration($configuration, [[
+            'serializer' => [
+                'named_serializers' => [
+                    'default' => ['include_built_in_normalizers' => false],
+                ],
+            ],
+        ]]);
+    }
 }
diff --git a/Tests/DependencyInjection/Fixtures/php/full.php b/Tests/DependencyInjection/Fixtures/php/full.php
index b5d8061e4..0a32ce8b3 100644
--- a/Tests/DependencyInjection/Fixtures/php/full.php
+++ b/Tests/DependencyInjection/Fixtures/php/full.php
@@ -43,8 +43,6 @@
         'gc_maxlifetime' => 90000,
         'gc_divisor' => 108,
         'gc_probability' => 1,
-        'sid_length' => 22,
-        'sid_bits_per_character' => 4,
         'save_path' => '/path/to/sessions',
     ],
     'assets' => [
@@ -68,8 +66,16 @@
         'circular_reference_handler' => 'my.circular.reference.handler',
         'max_depth_handler' => 'my.max.depth.handler',
         'default_context' => ['enable_max_depth' => true],
+        'named_serializers' => [
+            'api' => [
+                'include_built_in_normalizers' => true,
+                'include_built_in_encoders' => true,
+                'default_context' => ['enable_max_depth' => false],
+            ],
+        ],
     ],
     'property_info' => true,
+    'type_info' => true,
     'ide' => 'file%%link%%format',
     'request' => [
         'formats' => [
diff --git a/Tests/DependencyInjection/Fixtures/php/http_client_rate_limiter.php b/Tests/DependencyInjection/Fixtures/php/http_client_rate_limiter.php
new file mode 100644
index 000000000..c8256d913
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/php/http_client_rate_limiter.php
@@ -0,0 +1,27 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'annotations' => false,
+    'http_method_override' => false,
+    'handle_all_throwables' => true,
+    'php_errors' => ['log' => true],
+    'rate_limiter' => [
+        'foo_limiter' => [
+            'lock_factory' => null,
+            'policy' => 'token_bucket',
+            'limit' => 10,
+            'rate' => ['interval' => '5 seconds', 'amount' => 10],
+        ],
+    ],
+    'http_client' => [
+        'default_options' => [
+            'rate_limiter' => 'default_limiter',
+        ],
+        'scoped_clients' => [
+            'foo' => [
+                'base_uri' => 'http://example.com',
+                'rate_limiter' => 'foo_limiter',
+            ],
+        ],
+    ],
+]);
diff --git a/Tests/DependencyInjection/Fixtures/php/lock_named.php b/Tests/DependencyInjection/Fixtures/php/lock_named.php
index de8a8f495..c03a7fa71 100644
--- a/Tests/DependencyInjection/Fixtures/php/lock_named.php
+++ b/Tests/DependencyInjection/Fixtures/php/lock_named.php
@@ -12,5 +12,8 @@
         'bar' => 'flock',
         'baz' => ['semaphore', 'flock'],
         'qux' => '%env(REDIS_DSN)%',
+        'corge' => 'in-memory',
+        'grault' => 'mysql:host=localhost;dbname=test',
+        'garply' => 'null',
     ],
 ]);
diff --git a/Tests/DependencyInjection/Fixtures/php/lock_service.php b/Tests/DependencyInjection/Fixtures/php/lock_service.php
new file mode 100644
index 000000000..4bdbd29b8
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/php/lock_service.php
@@ -0,0 +1,11 @@
+<?php
+
+$container->register('my_service', \Redis::class);
+
+$container->loadFromExtension('framework', [
+    'annotations' => false,
+    'http_method_override' => false,
+    'handle_all_throwables' => true,
+    'php_errors' => ['log' => true],
+    'lock' => 'my_service',
+]);
diff --git a/Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php b/Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php
index 683872982..3357bf354 100644
--- a/Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php
+++ b/Tests/DependencyInjection/Fixtures/php/mailer_with_dsn.php
@@ -13,6 +13,7 @@
             'envelope' => [
                 'sender' => 'sender@example.org',
                 'recipients' => ['redirected@example.org'],
+                'allowed_recipients' => ['foobar@example\.org'],
             ],
             'headers' => [
                 'from' => 'from@example.org',
diff --git a/Tests/DependencyInjection/Fixtures/php/mailer_with_transports.php b/Tests/DependencyInjection/Fixtures/php/mailer_with_transports.php
index 361fe731c..e51fd056b 100644
--- a/Tests/DependencyInjection/Fixtures/php/mailer_with_transports.php
+++ b/Tests/DependencyInjection/Fixtures/php/mailer_with_transports.php
@@ -16,6 +16,7 @@
             'envelope' => [
                 'sender' => 'sender@example.org',
                 'recipients' => ['redirected@example.org', 'redirected1@example.org'],
+                'allowed_recipients' => ['foobar@example\.org', '.*@example\.com'],
             ],
             'headers' => [
                 'from' => 'from@example.org',
diff --git a/Tests/DependencyInjection/Fixtures/php/messenger_multiple_failure_transports.php b/Tests/DependencyInjection/Fixtures/php/messenger_multiple_failure_transports.php
index 88a4a8073..1fa698076 100644
--- a/Tests/DependencyInjection/Fixtures/php/messenger_multiple_failure_transports.php
+++ b/Tests/DependencyInjection/Fixtures/php/messenger_multiple_failure_transports.php
@@ -9,15 +9,15 @@
         'transports' => [
             'transport_1' => [
                 'dsn' => 'null://',
-                'failure_transport' => 'failure_transport_1'
+                'failure_transport' => 'failure_transport_1',
             ],
             'transport_2' => 'null://',
             'transport_3' => [
                 'dsn' => 'null://',
-                'failure_transport' => 'failure_transport_3'
+                'failure_transport' => 'failure_transport_3',
             ],
             'failure_transport_1' => 'null://',
-            'failure_transport_3' => 'null://'
+            'failure_transport_3' => 'null://',
         ],
     ],
 ]);
diff --git a/Tests/DependencyInjection/Fixtures/php/messenger_multiple_failure_transports_global.php b/Tests/DependencyInjection/Fixtures/php/messenger_multiple_failure_transports_global.php
index 9f794556b..763db88a8 100644
--- a/Tests/DependencyInjection/Fixtures/php/messenger_multiple_failure_transports_global.php
+++ b/Tests/DependencyInjection/Fixtures/php/messenger_multiple_failure_transports_global.php
@@ -10,12 +10,12 @@
         'transports' => [
             'transport_1' => [
                 'dsn' => 'null://',
-                'failure_transport' => 'failure_transport_1'
+                'failure_transport' => 'failure_transport_1',
             ],
             'transport_2' => 'null://',
             'transport_3' => [
                 'dsn' => 'null://',
-                'failure_transport' => 'failure_transport_3'
+                'failure_transport' => 'failure_transport_3',
             ],
             'failure_transport_global' => 'null://',
             'failure_transport_1' => 'null://',
diff --git a/Tests/DependencyInjection/Fixtures/php/messenger_transports.php b/Tests/DependencyInjection/Fixtures/php/messenger_transports.php
index bba32ce0b..a010da534 100644
--- a/Tests/DependencyInjection/Fixtures/php/messenger_transports.php
+++ b/Tests/DependencyInjection/Fixtures/php/messenger_transports.php
@@ -23,7 +23,7 @@
                     'multiplier' => 3,
                     'max_delay' => 100,
                 ],
-                'rate_limiter' => 'customised_worker'
+                'rate_limiter' => 'customised_worker',
             ],
             'failed' => 'in-memory:///',
             'redis' => 'redis://127.0.0.1:6379/messages',
diff --git a/Tests/DependencyInjection/Fixtures/php/messenger_with_disabled_reset_on_message.php b/Tests/DependencyInjection/Fixtures/php/messenger_with_disabled_reset_on_message.php
deleted file mode 100644
index 562977efe..000000000
--- a/Tests/DependencyInjection/Fixtures/php/messenger_with_disabled_reset_on_message.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;
-
-$container->loadFromExtension('framework', [
-    'annotations' => false,
-    'http_method_override' => false,
-    'handle_all_throwables' => true,
-    'php_errors' => ['log' => true],
-    'messenger' => [
-        'reset_on_message' =>  false,
-        'routing' => [
-            FooMessage::class => ['sender.bar', 'sender.biz'],
-            BarMessage::class => 'sender.foo',
-        ],
-        'transports' => [
-            'sender.biz' => 'null://',
-            'sender.bar' => 'null://',
-            'sender.foo' => 'null://',
-        ],
-    ],
-]);
diff --git a/Tests/DependencyInjection/Fixtures/php/messenger_with_explict_reset_on_message_legacy.php b/Tests/DependencyInjection/Fixtures/php/messenger_with_explict_reset_on_message_legacy.php
deleted file mode 100644
index b5c64e1cf..000000000
--- a/Tests/DependencyInjection/Fixtures/php/messenger_with_explict_reset_on_message_legacy.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;
-
-$container->loadFromExtension('framework', [
-    'annotations' => false,
-    'http_method_override' => false,
-    'handle_all_throwables' => true,
-    'php_errors' => ['log' => true],
-    'messenger' => [
-        'reset_on_message' =>  true,
-        'routing' => [
-            FooMessage::class => ['sender.bar', 'sender.biz'],
-            BarMessage::class => 'sender.foo',
-        ],
-        'transports' => [
-            'sender.biz' => 'null://',
-            'sender.bar' => 'null://',
-            'sender.foo' => 'null://',
-        ],
-    ],
-]);
diff --git a/Tests/DependencyInjection/Fixtures/php/notifier.php b/Tests/DependencyInjection/Fixtures/php/notifier.php
index 0def62cac..058ec7175 100644
--- a/Tests/DependencyInjection/Fixtures/php/notifier.php
+++ b/Tests/DependencyInjection/Fixtures/php/notifier.php
@@ -1,15 +1,12 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;
-
 $container->loadFromExtension('framework', [
     'annotations' => false,
     'http_method_override' => false,
     'handle_all_throwables' => true,
     'php_errors' => ['log' => true],
     'messenger' => [
-        'enabled' => true
+        'enabled' => true,
     ],
     'mailer' => [
         'dsn' => 'smtp://example.com',
@@ -18,10 +15,10 @@
         'enabled' => true,
         'notification_on_failed_messages' => true,
         'chatter_transports' => [
-            'slack' => 'null'
+            'slack' => 'null',
         ],
         'texter_transports' => [
-            'twilio' => 'null'
+            'twilio' => 'null',
         ],
         'channel_policy' => [
             'low' => ['slack'],
@@ -29,6 +26,6 @@
         ],
         'admin_recipients' => [
             ['email' => 'test@test.de', 'phone' => '+490815',],
-        ]
+        ],
     ],
 ]);
diff --git a/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php b/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php
index 6b9b4ff07..8c6b2f002 100644
--- a/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php
+++ b/Tests/DependencyInjection/Fixtures/php/notifier_with_disabled_message_bus.php
@@ -14,10 +14,10 @@
     'notifier' => [
         'message_bus' => false,
         'chatter_transports' => [
-            'test' => 'null'
+            'test' => 'null',
         ],
         'texter_transports' => [
-            'test' => 'null'
+            'test' => 'null',
         ],
     ],
 ]);
diff --git a/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php b/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php
index f8b4ad66d..4c38323bd 100644
--- a/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php
+++ b/Tests/DependencyInjection/Fixtures/php/notifier_with_specific_message_bus.php
@@ -14,10 +14,10 @@
     'notifier' => [
         'message_bus' => 'app.another_bus',
         'chatter_transports' => [
-            'test' => 'null'
+            'test' => 'null',
         ],
         'texter_transports' => [
-            'test' => 'null'
+            'test' => 'null',
         ],
     ],
 ]);
diff --git a/Tests/DependencyInjection/Fixtures/php/notifier_without_mailer.php b/Tests/DependencyInjection/Fixtures/php/notifier_without_mailer.php
index 5967dcb9e..107803ef9 100644
--- a/Tests/DependencyInjection/Fixtures/php/notifier_without_mailer.php
+++ b/Tests/DependencyInjection/Fixtures/php/notifier_without_mailer.php
@@ -1,8 +1,5 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;
-
 $container->loadFromExtension('framework', [
     'annotations' => false,
     'http_method_override' => false,
@@ -18,10 +15,10 @@
         'enabled' => true,
         'notification_on_failed_messages' => true,
         'chatter_transports' => [
-            'slack' => 'null'
+            'slack' => 'null',
         ],
         'texter_transports' => [
-            'twilio' => 'null'
+            'twilio' => 'null',
         ],
         'channel_policy' => [
             'low' => ['slack'],
@@ -29,6 +26,6 @@
         ],
         'admin_recipients' => [
             ['email' => 'test@test.de', 'phone' => '+490815',],
-        ]
+        ],
     ],
 ]);
diff --git a/Tests/DependencyInjection/Fixtures/php/notifier_without_messenger.php b/Tests/DependencyInjection/Fixtures/php/notifier_without_messenger.php
index 4a477e008..0c43db7cd 100644
--- a/Tests/DependencyInjection/Fixtures/php/notifier_without_messenger.php
+++ b/Tests/DependencyInjection/Fixtures/php/notifier_without_messenger.php
@@ -1,8 +1,5 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;
-
 $container->loadFromExtension('framework', [
     'annotations' => false,
     'http_method_override' => false,
@@ -18,10 +15,10 @@
         'enabled' => true,
         'notification_on_failed_messages' => true,
         'chatter_transports' => [
-            'slack' => 'null'
+            'slack' => 'null',
         ],
         'texter_transports' => [
-            'twilio' => 'null'
+            'twilio' => 'null',
         ],
         'channel_policy' => [
             'low' => ['slack'],
@@ -29,7 +26,7 @@
         ],
         'admin_recipients' => [
             ['email' => 'test@test.de', 'phone' => '+490815',],
-        ]
+        ],
     ],
     'scheduler' => false,
 ]);
diff --git a/Tests/DependencyInjection/Fixtures/php/notifier_without_transports.php b/Tests/DependencyInjection/Fixtures/php/notifier_without_transports.php
index 5861634e1..6392f0b33 100644
--- a/Tests/DependencyInjection/Fixtures/php/notifier_without_transports.php
+++ b/Tests/DependencyInjection/Fixtures/php/notifier_without_transports.php
@@ -1,8 +1,5 @@
 <?php
 
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
-use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;
-
 $container->loadFromExtension('framework', [
     'annotations' => false,
     'http_method_override' => false,
diff --git a/Tests/DependencyInjection/Fixtures/php/profiler.php b/Tests/DependencyInjection/Fixtures/php/profiler.php
index 43a7a002c..faf76bbc7 100644
--- a/Tests/DependencyInjection/Fixtures/php/profiler.php
+++ b/Tests/DependencyInjection/Fixtures/php/profiler.php
@@ -9,6 +9,6 @@
         'enabled' => true,
     ],
     'serializer' => [
-        'enabled' => true
+        'enabled' => true,
     ],
 ]);
diff --git a/Tests/DependencyInjection/Fixtures/php/profiler_collect_serializer_data.php b/Tests/DependencyInjection/Fixtures/php/profiler_collect_serializer_data.php
index 1fb869a80..99e2a52cf 100644
--- a/Tests/DependencyInjection/Fixtures/php/profiler_collect_serializer_data.php
+++ b/Tests/DependencyInjection/Fixtures/php/profiler_collect_serializer_data.php
@@ -11,5 +11,5 @@
     ],
     'serializer' => [
         'enabled' => true,
-    ]
+    ],
 ]);
diff --git a/Tests/DependencyInjection/Fixtures/php/semaphore_service.php b/Tests/DependencyInjection/Fixtures/php/semaphore_service.php
new file mode 100644
index 000000000..279f1c158
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/php/semaphore_service.php
@@ -0,0 +1,11 @@
+<?php
+
+$container->register('my_service', \Redis::class);
+
+$container->loadFromExtension('framework', [
+    'annotations' => false,
+    'http_method_override' => false,
+    'handle_all_throwables' => true,
+    'php_errors' => ['log' => true],
+    'semaphore' => 'my_service',
+]);
diff --git a/Tests/DependencyInjection/Fixtures/php/trusted_proxies_private_ranges.php b/Tests/DependencyInjection/Fixtures/php/trusted_proxies_private_ranges.php
new file mode 100644
index 000000000..e3a5dc4a5
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/php/trusted_proxies_private_ranges.php
@@ -0,0 +1,5 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'trusted_proxies' => 'private_ranges',
+]);
diff --git a/Tests/DependencyInjection/Fixtures/php/legacy_annotations.php b/Tests/DependencyInjection/Fixtures/php/type_info.php
similarity index 55%
rename from Tests/DependencyInjection/Fixtures/php/legacy_annotations.php
rename to Tests/DependencyInjection/Fixtures/php/type_info.php
index 4dbdfcefe..0e7dcbae0 100644
--- a/Tests/DependencyInjection/Fixtures/php/legacy_annotations.php
+++ b/Tests/DependencyInjection/Fixtures/php/type_info.php
@@ -1,12 +1,11 @@
 <?php
 
 $container->loadFromExtension('framework', [
-    'annotations' => [
-        'cache' => 'file',
-        'debug' => true,
-        'file_cache_dir' => '%kernel.cache_dir%/annotations',
-    ],
+    'annotations' => false,
     'http_method_override' => false,
     'handle_all_throwables' => true,
     'php_errors' => ['log' => true],
+    'type_info' => [
+        'enabled' => true,
+    ],
 ]);
diff --git a/Tests/DependencyInjection/Fixtures/php/validation_legacy_annotations.php b/Tests/DependencyInjection/Fixtures/php/validation_legacy_annotations.php
deleted file mode 100644
index 526180972..000000000
--- a/Tests/DependencyInjection/Fixtures/php/validation_legacy_annotations.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$container->loadFromExtension('framework', [
-    'annotations' => [
-        'enabled' => true,
-    ],
-    'http_method_override' => false,
-    'handle_all_throwables' => true,
-    'php_errors' => ['log' => true],
-    'secret' => 's3cr3t',
-    'validation' => [
-        'enabled' => true,
-        'enable_attributes' => true,
-        'email_validation_mode' => 'html5',
-    ],
-]);
-
-$container->setAlias('validator.alias', 'validator')->setPublic(true);
diff --git a/Tests/DependencyInjection/Fixtures/xml/form_csrf_disabled.xml b/Tests/DependencyInjection/Fixtures/xml/form_csrf_disabled.xml
index ec97dcdd9..fdd02be87 100644
--- a/Tests/DependencyInjection/Fixtures/xml/form_csrf_disabled.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/form_csrf_disabled.xml
@@ -12,7 +12,7 @@
         <framework:annotations enabled="false"/>
         <framework:php-errors log="true" />
         <framework:csrf-protection enabled="false"/>
-        <framework:form enabled="true">
+        <framework:form>
             <framework:csrf-protection enabled="true"/>
         </framework:form>
     </framework:config>
diff --git a/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml b/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml
index da8ed8b98..de1418108 100644
--- a/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/form_no_csrf.xml
@@ -9,7 +9,7 @@
     <framework:config http-method-override="false" handle-all-throwables="true">
         <framework:annotations enabled="false" />
         <framework:php-errors log="true" />
-        <framework:form enabled="true">
+        <framework:form>
             <framework:csrf-protection enabled="false" />
         </framework:form>
     </framework:config>
diff --git a/Tests/DependencyInjection/Fixtures/xml/full.xml b/Tests/DependencyInjection/Fixtures/xml/full.xml
index 92e4405a0..c01e85783 100644
--- a/Tests/DependencyInjection/Fixtures/xml/full.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/full.xml
@@ -17,7 +17,7 @@
         <framework:ssi enabled="true" />
         <framework:profiler only-exceptions="true" enabled="false" />
         <framework:router resource="%kernel.project_dir%/config/routing.xml" type="xml" utf8="true" />
-        <framework:session gc-maxlifetime="90000" gc-probability="1" gc-divisor="108" storage-factory-id="session.storage.factory.native" handler-id="session.handler.native_file" name="_SYMFONY" cookie-lifetime="86400" cookie-path="/" cookie-domain="example.com" cookie-secure="true" cookie-samesite="lax" cookie-httponly="false" use-cookies="true" save-path="/path/to/sessions" sid-length="22" sid-bits-per-character="4" />
+        <framework:session gc-maxlifetime="90000" gc-probability="1" gc-divisor="108" storage-factory-id="session.storage.factory.native" handler-id="session.handler.native_file" name="_SYMFONY" cookie-lifetime="86400" cookie-path="/" cookie-domain="example.com" cookie-secure="true" cookie-samesite="lax" cookie-httponly="false" use-cookies="true" save-path="/path/to/sessions" />
         <framework:request>
             <framework:format name="csv">
                 <framework:mime-type>text/csv</framework:mime-type>
@@ -38,7 +38,13 @@
             <framework:default-context>
                 <framework:enable_max_depth>true</framework:enable_max_depth>
             </framework:default-context>
+            <framework:named-serializer name="api" include-built-in-normalizers="true" include-built-in-encoders="true">
+                <framework:default-context>
+                    <framework:enable_max_depth>false</framework:enable_max_depth>
+                </framework:default-context>
+            </framework:named-serializer>
         </framework:serializer>
         <framework:property-info />
+        <framework:type-info />
     </framework:config>
 </container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/http_client_rate_limiter.xml b/Tests/DependencyInjection/Fixtures/xml/http_client_rate_limiter.xml
new file mode 100644
index 000000000..8c9dbcdad
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/xml/http_client_rate_limiter.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:framework="http://symfony.com/schema/dic/symfony"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config http-method-override="false" handle-all-throwables="true">
+        <framework:annotations enabled="false" />
+        <framework:php-errors log="true" />
+        <framework:rate-limiter>
+            <framework:limiter name="foo_limiter" lock-factory="null" policy="token_bucket" limit="10">
+                <framework:rate interval="5 seconds" amount="10" />
+            </framework:limiter>
+        </framework:rate-limiter>
+        <framework:http-client>
+            <framework:default-options rate-limiter="default_limiter" />
+            <framework:scoped-client name="foo" base-uri="http://example.com" rate-limiter="foo_limiter" />
+        </framework:http-client>
+    </framework:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/lock_named.xml b/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
index 02659713e..b8d4b4a3f 100644
--- a/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/lock_named.xml
@@ -18,6 +18,9 @@
             <framework:resource name="baz">semaphore</framework:resource>
             <framework:resource name="baz">flock</framework:resource>
             <framework:resource name="qux">%env(REDIS_DSN)%</framework:resource>
+            <framework:resource name="corge">in-memory</framework:resource>
+            <framework:resource name="grault">mysql:host=localhost;dbname=test</framework:resource>
+            <framework:resource name="garply">null</framework:resource>
         </framework:lock>
     </framework:config>
 </container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/exceptions_legacy.xml b/Tests/DependencyInjection/Fixtures/xml/lock_service.xml
similarity index 50%
rename from Tests/DependencyInjection/Fixtures/xml/exceptions_legacy.xml
rename to Tests/DependencyInjection/Fixtures/xml/lock_service.xml
index e500144d2..a175526a9 100644
--- a/Tests/DependencyInjection/Fixtures/xml/exceptions_legacy.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/lock_service.xml
@@ -5,14 +5,15 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
         http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
+    <services>
+        <service id="my_service" class="\Redis" />
+    </services>
+
     <framework:config http-method-override="false" handle-all-throwables="true">
         <framework:annotations enabled="false" />
         <framework:php-errors log="true" />
-        <framework:exceptions>
-            <framework:exception name="Symfony\Component\HttpKernel\Exception\BadRequestHttpException" log-level="info" status-code="422" />
-            <framework:exception name="Symfony\Component\HttpKernel\Exception\NotFoundHttpException" log-level="info" status-code="0" />
-            <framework:exception name="Symfony\Component\HttpKernel\Exception\ConflictHttpException" log-level="info" status-code="0" />
-            <framework:exception name="Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException" log-level="null" status-code="500" />
-        </framework:exceptions>
+        <framework:lock>
+            <framework:resource>my_service</framework:resource>
+        </framework:lock>
     </framework:config>
 </container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/mailer_with_dsn.xml b/Tests/DependencyInjection/Fixtures/xml/mailer_with_dsn.xml
index 3436cf417..d48b7423a 100644
--- a/Tests/DependencyInjection/Fixtures/xml/mailer_with_dsn.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/mailer_with_dsn.xml
@@ -13,6 +13,7 @@
             <framework:envelope>
                 <framework:sender>sender@example.org</framework:sender>
                 <framework:recipient>redirected@example.org</framework:recipient>
+                <framework:allowed-recipient>foobar@example\.org</framework:allowed-recipient>
             </framework:envelope>
             <framework:header name="from">from@example.org</framework:header>
             <framework:header name="bcc">bcc1@example.org</framework:header>
diff --git a/Tests/DependencyInjection/Fixtures/xml/mailer_with_transports.xml b/Tests/DependencyInjection/Fixtures/xml/mailer_with_transports.xml
index 1cd8523b6..9bfd18d91 100644
--- a/Tests/DependencyInjection/Fixtures/xml/mailer_with_transports.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/mailer_with_transports.xml
@@ -16,6 +16,8 @@
                 <framework:sender>sender@example.org</framework:sender>
                 <framework:recipient>redirected@example.org</framework:recipient>
                 <framework:recipient>redirected1@example.org</framework:recipient>
+                <framework:allowed-recipient>foobar@example\.org</framework:allowed-recipient>
+                <framework:allowed-recipient>.*@example\.com</framework:allowed-recipient>
             </framework:envelope>
             <framework:header name="from">from@example.org</framework:header>
             <framework:header name="bcc">bcc1@example.org</framework:header>
diff --git a/Tests/DependencyInjection/Fixtures/xml/messenger_with_disabled_reset_on_message.xml b/Tests/DependencyInjection/Fixtures/xml/messenger_with_disabled_reset_on_message.xml
deleted file mode 100644
index 2b907aea6..000000000
--- a/Tests/DependencyInjection/Fixtures/xml/messenger_with_disabled_reset_on_message.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:framework="http://symfony.com/schema/dic/symfony"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
-        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
-
-    <framework:config http-method-override="false" handle-all-throwables="true">
-        <framework:annotations enabled="false" />
-        <framework:php-errors log="true" />
-        <framework:messenger reset-on-message="false">
-            <framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage">
-                <framework:sender service="sender.bar" />
-                <framework:sender service="sender.biz" />
-            </framework:routing>
-            <framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage">
-                <framework:sender service="sender.foo" />
-            </framework:routing>
-            <framework:transport name="sender.bar" dsn="null://" />
-            <framework:transport name="sender.biz" dsn="null://" />
-            <framework:transport name="sender.foo" dsn="null://" />
-        </framework:messenger>
-    </framework:config>
-</container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/messenger_with_explict_reset_on_message_legacy.xml b/Tests/DependencyInjection/Fixtures/xml/messenger_with_explict_reset_on_message_legacy.xml
deleted file mode 100644
index 0dcd62936..000000000
--- a/Tests/DependencyInjection/Fixtures/xml/messenger_with_explict_reset_on_message_legacy.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:framework="http://symfony.com/schema/dic/symfony"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
-        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
-
-    <framework:config http-method-override="false" handle-all-throwables="true">
-        <framework:annotations enabled="false" />
-        <framework:php-errors log="true" />
-        <framework:messenger reset-on-message="true">
-            <framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage">
-                <framework:sender service="sender.bar" />
-                <framework:sender service="sender.biz" />
-            </framework:routing>
-            <framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage">
-                <framework:sender service="sender.foo" />
-            </framework:routing>
-            <framework:transport name="sender.bar" dsn="null://" />
-            <framework:transport name="sender.biz" dsn="null://" />
-            <framework:transport name="sender.foo" dsn="null://" />
-        </framework:messenger>
-    </framework:config>
-</container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/semaphore_service.xml b/Tests/DependencyInjection/Fixtures/xml/semaphore_service.xml
new file mode 100644
index 000000000..814823802
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/xml/semaphore_service.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <services>
+        <service id="my_service" class="\Redis" />
+    </services>
+
+    <framework:config http-method-override="false" handle-all-throwables="true">
+        <framework:annotations enabled="false" />
+        <framework:php-errors log="true" />
+        <framework:semaphore>
+            <framework:resource>my_service</framework:resource>
+        </framework:semaphore>
+    </framework:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/trusted_proxies_private_ranges.xml b/Tests/DependencyInjection/Fixtures/xml/trusted_proxies_private_ranges.xml
new file mode 100644
index 000000000..700f84959
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/xml/trusted_proxies_private_ranges.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config trusted-proxies="private_ranges" />
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/legacy_annotations.xml b/Tests/DependencyInjection/Fixtures/xml/type_info.xml
similarity index 54%
rename from Tests/DependencyInjection/Fixtures/xml/legacy_annotations.xml
rename to Tests/DependencyInjection/Fixtures/xml/type_info.xml
index c16c18918..0fe4d525d 100644
--- a/Tests/DependencyInjection/Fixtures/xml/legacy_annotations.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/type_info.xml
@@ -1,16 +1,13 @@
-<?xml version="1.0" ?>
-
+<?xml version="1.0" encoding="utf-8" ?>
 <container xmlns="http://symfony.com/schema/dic/services"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xmlns:framework="http://symfony.com/schema/dic/symfony"
            xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
     <framework:config http-method-override="false" handle-all-throwables="true">
-        <framework:annotations enabled="true"
-                               cache="file"
-                               debug="true"
-                               file-cache-dir="%kernel.cache_dir%/annotations"
-        />
+        <framework:annotations enabled="false" />
+        <framework:php-errors log="true" />
+        <framework:type-info enabled="true" />
     </framework:config>
 </container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/validation_legacy_annotations.xml b/Tests/DependencyInjection/Fixtures/xml/validation_legacy_annotations.xml
deleted file mode 100644
index 71e3e7eb5..000000000
--- a/Tests/DependencyInjection/Fixtures/xml/validation_legacy_annotations.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:framework="http://symfony.com/schema/dic/symfony"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
-
-    <framework:config secret="s3cr3t" http-method-override="false" handle-all-throwables="true">
-        <framework:annotations enabled="true" />
-        <framework:php-errors log="true" />
-        <framework:validation enabled="true" enable-attributes="true" email-validation-mode="html5" />
-    </framework:config>
-
-    <services>
-        <service id="validator.alias" alias="validator" public="true" />
-    </services>
-</container>
diff --git a/Tests/DependencyInjection/Fixtures/yml/full.yml b/Tests/DependencyInjection/Fixtures/yml/full.yml
index 883e9d6c2..7550749eb 100644
--- a/Tests/DependencyInjection/Fixtures/yml/full.yml
+++ b/Tests/DependencyInjection/Fixtures/yml/full.yml
@@ -36,8 +36,6 @@ framework:
         gc_probability:  1
         gc_divisor:      108
         gc_maxlifetime:  90000
-        sid_length:      22
-        sid_bits_per_character: 4
         save_path:       /path/to/sessions
     assets:
         version: v1
@@ -59,6 +57,13 @@ framework:
          max_depth_handler:          my.max.depth.handler
          default_context:
              enable_max_depth: true
+         named_serializers:
+             api:
+                 include_built_in_normalizers: true
+                 include_built_in_encoders: true
+                 default_context:
+                     enable_max_depth: false
+    type_info: ~
     property_info: ~
     ide: file%%link%%format
     request:
diff --git a/Tests/DependencyInjection/Fixtures/yml/http_client_rate_limiter.yml b/Tests/DependencyInjection/Fixtures/yml/http_client_rate_limiter.yml
new file mode 100644
index 000000000..6376192b7
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/yml/http_client_rate_limiter.yml
@@ -0,0 +1,19 @@
+framework:
+    annotations: false
+    http_method_override: false
+    handle_all_throwables: true
+    php_errors:
+        log: true
+    rate_limiter:
+        foo_limiter:
+            lock_factory: null
+            policy: token_bucket
+            limit: 10
+            rate: { interval: '5 seconds', amount: 10 }
+    http_client:
+        default_options:
+            rate_limiter: default_limiter
+        scoped_clients:
+            foo:
+                base_uri: http://example.com
+                rate_limiter: foo_limiter
diff --git a/Tests/DependencyInjection/Fixtures/yml/legacy_annotations.yml b/Tests/DependencyInjection/Fixtures/yml/legacy_annotations.yml
deleted file mode 100644
index 795ac5231..000000000
--- a/Tests/DependencyInjection/Fixtures/yml/legacy_annotations.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-framework:
-    annotations:
-        enabled: true
-        cache: file
-        debug: true
-        file_cache_dir: '%kernel.cache_dir%/annotations'
-    http_method_override: true
-    handle_all_throwables: true
-    php_errors:
-        log: true
diff --git a/Tests/DependencyInjection/Fixtures/yml/lock_named.yml b/Tests/DependencyInjection/Fixtures/yml/lock_named.yml
index 01f3af47a..631574030 100644
--- a/Tests/DependencyInjection/Fixtures/yml/lock_named.yml
+++ b/Tests/DependencyInjection/Fixtures/yml/lock_named.yml
@@ -12,3 +12,6 @@ framework:
         bar: flock
         baz: [semaphore, flock]
         qux: "%env(REDIS_DSN)%"
+        corge: in-memory
+        grault: mysql:host=localhost;dbname=test
+        garply: 'null'
diff --git a/Tests/DependencyInjection/Fixtures/yml/lock_service.yml b/Tests/DependencyInjection/Fixtures/yml/lock_service.yml
new file mode 100644
index 000000000..1b5dfea17
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/yml/lock_service.yml
@@ -0,0 +1,11 @@
+services:
+    my_service:
+        class: \Redis
+
+framework:
+    annotations: false
+    http_method_override: false
+    handle_all_throwables: true
+    php_errors:
+        log: true
+    lock: my_service
diff --git a/Tests/DependencyInjection/Fixtures/yml/mailer_with_dsn.yml b/Tests/DependencyInjection/Fixtures/yml/mailer_with_dsn.yml
index e826d6bdc..ea703bdad 100644
--- a/Tests/DependencyInjection/Fixtures/yml/mailer_with_dsn.yml
+++ b/Tests/DependencyInjection/Fixtures/yml/mailer_with_dsn.yml
@@ -10,6 +10,8 @@ framework:
             sender: sender@example.org
             recipients:
                 - redirected@example.org
+            allowed_recipients:
+                - foobar@example\.org
         headers:
             from: from@example.org
             bcc: [bcc1@example.org, bcc2@example.org]
diff --git a/Tests/DependencyInjection/Fixtures/yml/mailer_with_transports.yml b/Tests/DependencyInjection/Fixtures/yml/mailer_with_transports.yml
index 59a5f14fd..ae10f6aee 100644
--- a/Tests/DependencyInjection/Fixtures/yml/mailer_with_transports.yml
+++ b/Tests/DependencyInjection/Fixtures/yml/mailer_with_transports.yml
@@ -13,6 +13,9 @@ framework:
             recipients:
                 - redirected@example.org
                 - redirected1@example.org
+            allowed_recipients:
+                - foobar@example\.org
+                - .*@example\.com
         headers:
             from: from@example.org
             bcc: [bcc1@example.org, bcc2@example.org]
diff --git a/Tests/DependencyInjection/Fixtures/yml/semaphore_service.yml b/Tests/DependencyInjection/Fixtures/yml/semaphore_service.yml
new file mode 100644
index 000000000..62765ac91
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/yml/semaphore_service.yml
@@ -0,0 +1,11 @@
+services:
+    my_service:
+        class: \Redis
+
+framework:
+    annotations: false
+    http_method_override: false
+    handle_all_throwables: true
+    php_errors:
+        log: true
+    semaphore: my_service
diff --git a/Tests/DependencyInjection/Fixtures/yml/trusted_proxies_private_ranges.yml b/Tests/DependencyInjection/Fixtures/yml/trusted_proxies_private_ranges.yml
new file mode 100644
index 000000000..b98bb2f78
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/yml/trusted_proxies_private_ranges.yml
@@ -0,0 +1,2 @@
+framework:
+  trusted_proxies: private_ranges
diff --git a/Tests/DependencyInjection/Fixtures/yml/type_info.yml b/Tests/DependencyInjection/Fixtures/yml/type_info.yml
new file mode 100644
index 000000000..4d6b405b2
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/yml/type_info.yml
@@ -0,0 +1,8 @@
+framework:
+    annotations: false
+    http_method_override: false
+    handle_all_throwables: true
+    php_errors:
+        log: true
+    type_info:
+        enabled: true
diff --git a/Tests/DependencyInjection/Fixtures/yml/validation_legacy_annotations.yml b/Tests/DependencyInjection/Fixtures/yml/validation_legacy_annotations.yml
deleted file mode 100644
index 8da9b008f..000000000
--- a/Tests/DependencyInjection/Fixtures/yml/validation_legacy_annotations.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-framework:
-    annotations:
-        enabled: true
-    http_method_override: false
-    handle_all_throwables: true
-    php_errors:
-        log: true
-    secret: s3cr3t
-    validation:
-        enabled:     true
-        enable_attributes: true
-        email_validation_mode: html5
-
-services:
-    validator.alias:
-        alias: validator
-        public: true
diff --git a/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/Tests/DependencyInjection/FrameworkExtensionTestCase.php
index 7f94b83ce..7bf66512d 100644
--- a/Tests/DependencyInjection/FrameworkExtensionTestCase.php
+++ b/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -13,8 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerAwareInterface;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
-use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage;
@@ -35,7 +33,8 @@
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ChildDefinition;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveInstanceofConditionalsPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveTaggedIteratorArgumentPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -55,6 +54,8 @@
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\RetryableHttpClient;
 use Symfony\Component\HttpClient\ScopingHttpClient;
+use Symfony\Component\HttpClient\ThrottlingHttpClient;
+use Symfony\Component\HttpFoundation\IpUtils;
 use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
 use Symfony\Component\HttpKernel\Fragment\FragmentUriGeneratorInterface;
 use Symfony\Component\Lock\Store\SemaphoreStore;
@@ -67,6 +68,7 @@
 use Symfony\Component\Notifier\TexterInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\Security\Core\AuthenticationEvents;
+use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
 use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
@@ -85,10 +87,8 @@
 use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass;
 use Symfony\Component\Validator\Validation;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Validator\ValidatorBuilder;
 use Symfony\Component\Webhook\Client\RequestParser;
 use Symfony\Component\Webhook\Controller\WebhookController;
-use Symfony\Component\Workflow;
 use Symfony\Component\Workflow\Exception\InvalidDefinitionException;
 use Symfony\Component\Workflow\Metadata\InMemoryMetadataStore;
 use Symfony\Component\Workflow\WorkflowEvents;
@@ -97,8 +97,6 @@
 
 abstract class FrameworkExtensionTestCase extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     private static array $containerCache = [];
 
     abstract protected function loadFromFile(ContainerBuilder $container, $file);
@@ -308,7 +306,15 @@ public function testWorkflows()
         $this->assertArrayHasKey('index_4', $args);
         $this->assertNull($args['index_4'], 'Workflows has eventsToDispatch=null');
 
-        $this->assertSame(['workflow' => [['name' => 'article']], 'workflow.workflow' => [['name' => 'article']]], $container->getDefinition('workflow.article')->getTags());
+        $tags = $container->getDefinition('workflow.article')->getTags();
+        $this->assertArrayHasKey('workflow', $tags);
+        $this->assertArrayHasKey('workflow.workflow', $tags);
+        $this->assertSame([['name' => 'article']], $tags['workflow.workflow']);
+        $this->assertSame('article', $tags['workflow'][0]['name'] ?? null);
+        $this->assertSame([
+            'title' => 'article workflow',
+            'description' => 'workflow for articles',
+        ], $tags['workflow'][0]['metadata'] ?? null);
 
         $this->assertTrue($container->hasDefinition('workflow.article.definition'), 'Workflow definition is registered as a service');
 
@@ -339,7 +345,14 @@ public function testWorkflows()
         $this->assertSame('state_machine.abstract', $container->getDefinition('state_machine.pull_request')->getParent());
         $this->assertTrue($container->hasDefinition('state_machine.pull_request.definition'), 'State machine definition is registered as a service');
 
-        $this->assertSame(['workflow' => [['name' => 'pull_request']], 'workflow.state_machine' => [['name' => 'pull_request']]], $container->getDefinition('state_machine.pull_request')->getTags());
+        $tags = $container->getDefinition('state_machine.pull_request')->getTags();
+        $this->assertArrayHasKey('workflow', $tags);
+        $this->assertArrayHasKey('workflow.state_machine', $tags);
+        $this->assertSame([['name' => 'pull_request']], $tags['workflow.state_machine']);
+        $this->assertSame('pull_request', $tags['workflow'][0]['name'] ?? null);
+        $this->assertSame([
+            'title' => 'workflow title',
+        ], $tags['workflow'][0]['metadata'] ?? null);
 
         $stateMachineDefinition = $container->getDefinition('state_machine.pull_request.definition');
 
@@ -511,7 +524,7 @@ public function testWorkflowServicesCanBeEnabled()
     {
         $container = $this->createContainerFromFile('workflows_enabled');
 
-        $this->assertTrue($container->has(Workflow\Registry::class));
+        $this->assertTrue($container->hasDefinition('workflow.registry'));
         $this->assertTrue($container->hasDefinition('console.command.workflow_dump'));
     }
 
@@ -664,8 +677,6 @@ public function testSession()
         $this->assertEquals(108, $options['gc_divisor']);
         $this->assertEquals(1, $options['gc_probability']);
         $this->assertEquals(90000, $options['gc_maxlifetime']);
-        $this->assertEquals(22, $options['sid_length']);
-        $this->assertEquals(4, $options['sid_bits_per_character']);
 
         $this->assertEquals('/path/to/sessions', $container->getParameter('session.save_path'));
     }
@@ -797,26 +808,6 @@ public function testMessengerServicesRemovedWhenDisabled()
         $this->assertFalse($container->hasDefinition('cache.messenger.restart_workers_signal'));
     }
 
-    /**
-     * @group legacy
-     */
-    public function testMessengerWithExplictResetOnMessageLegacy()
-    {
-        $this->expectDeprecation('Since symfony/framework-bundle 6.1: Option "reset_on_message" at "framework.messenger" is deprecated. It does nothing and will be removed in version 7.0.');
-
-        $container = $this->createContainerFromFile('messenger_with_explict_reset_on_message_legacy');
-
-        $this->assertTrue($container->hasDefinition('console.command.messenger_consume_messages'));
-        $this->assertTrue($container->hasAlias('messenger.default_bus'));
-        $this->assertTrue($container->getAlias('messenger.default_bus')->isPublic());
-        $this->assertTrue($container->hasDefinition('messenger.transport.amqp.factory'));
-        $this->assertTrue($container->hasDefinition('messenger.transport.redis.factory'));
-        $this->assertTrue($container->hasDefinition('messenger.transport_factory'));
-        $this->assertSame(TransportFactory::class, $container->getDefinition('messenger.transport_factory')->getClass());
-        $this->assertTrue($container->hasDefinition('messenger.listener.reset_services'));
-        $this->assertSame('messenger.listener.reset_services', (string) $container->getDefinition('console.command.messenger_consume_messages')->getArgument(5));
-    }
-
     public function testMessenger()
     {
         $container = $this->createContainerFromFile('messenger', [], true, false);
@@ -1123,17 +1114,6 @@ public function testMessengerInvalidWildcardRouting()
         $this->createContainerFromFile('messenger_routing_invalid_transport');
     }
 
-    /**
-     * @group legacy
-     */
-    public function testMessengerWithDisabledResetOnMessage()
-    {
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('The "framework.messenger.reset_on_message" configuration option can be set to "true" only. To prevent services resetting after each message you can set the "--no-reset" option in "messenger:consume" command.');
-
-        $this->createContainerFromFile('messenger_with_disabled_reset_on_message');
-    }
-
     public function testTranslator()
     {
         $container = $this->createContainerFromFile('full');
@@ -1263,19 +1243,16 @@ public function testValidationService()
         $this->assertInstanceOf(ValidatorInterface::class, $container->get('validator.alias'));
     }
 
-    /**
-     * @group legacy
-     */
     public function testAnnotations()
     {
-        $this->expectDeprecation('Since symfony/framework-bundle 6.4: Enabling the integration of Doctrine annotations is deprecated. Set the "framework.annotations.enabled" config option to false.');
-
-        $container = $this->createContainerFromFile('legacy_annotations', [], true, false);
-        $container->addCompilerPass(new TestAnnotationsPass());
-        $container->compile();
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Invalid configuration for path "framework.annotations": Enabling the doctrine/annotations integration is not supported anymore.');
 
-        $this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache_adapter')->getArgument(2));
-        $this->assertSame('annotations.filesystem_cache_adapter', (string) $container->getDefinition('annotation_reader')->getArgument(1));
+        $this->createContainerFromClosure(function (ContainerBuilder $container) {
+            $container->loadFromExtension('framework', [
+                'annotations' => true,
+            ]);
+        });
     }
 
     public function testFileLinkFormat()
@@ -1304,33 +1281,6 @@ public function testValidationAttributes()
         // no cache this time
     }
 
-    /**
-     * @group legacy
-     */
-    public function testValidationLegacyAnnotations()
-    {
-        $this->expectDeprecation('Since symfony/framework-bundle 6.4: Enabling the integration of Doctrine annotations is deprecated. Set the "framework.annotations.enabled" config option to false.');
-
-        $container = $this->createContainerFromFile('validation_legacy_annotations');
-
-        $calls = $container->getDefinition('validator.builder')->getMethodCalls();
-
-        $this->assertCount(9, $calls);
-        $this->assertSame('enableAttributeMapping', $calls[5][0]);
-        if (method_exists(ValidatorBuilder::class, 'setDoctrineAnnotationReader')) {
-            $this->assertSame('setDoctrineAnnotationReader', $calls[6][0]);
-            $this->assertEquals([new Reference('annotation_reader')], $calls[6][1]);
-            $i = 7;
-        } else {
-            $i = 6;
-        }
-        $this->assertSame('addMethodMapping', $calls[$i][0]);
-        $this->assertSame(['loadValidatorMetadata'], $calls[$i][1]);
-        $this->assertSame('setMappingCache', $calls[++$i][0]);
-        $this->assertEquals([new Reference('validator.mapping.cache.adapter')], $calls[$i][1]);
-        // no cache this time
-    }
-
     public function testValidationPaths()
     {
         require_once __DIR__.'/Fixtures/TestBundle/TestBundle.php';
@@ -1499,9 +1449,6 @@ public function testSerializerEnabled()
         $this->assertEquals(AttributeLoader::class, $argument[0]->getClass());
         $this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.name_converter.metadata_aware')->getArgument(1));
         $this->assertEquals(new Reference('property_info', ContainerBuilder::IGNORE_ON_INVALID_REFERENCE), $container->getDefinition('serializer.normalizer.object')->getArgument(3));
-        $this->assertArrayHasKey('circular_reference_handler', $container->getDefinition('serializer.normalizer.object')->getArgument(6));
-        $this->assertArrayHasKey('max_depth_handler', $container->getDefinition('serializer.normalizer.object')->getArgument(6));
-        $this->assertEquals($container->getDefinition('serializer.normalizer.object')->getArgument(6)['max_depth_handler'], new Reference('my.max.depth.handler'));
     }
 
     public function testSerializerWithoutTranslator()
@@ -1510,6 +1457,26 @@ public function testSerializerWithoutTranslator()
         $this->assertFalse($container->hasDefinition('serializer.normalizer.translatable'));
     }
 
+    public function testSerializerDefaultParameters()
+    {
+        $container = $this->createContainerFromFile('serializer_enabled');
+        $this->assertFalse($container->hasParameter('.serializer.name_converter'));
+        $this->assertFalse($container->hasParameter('serializer.default_context'));
+        $this->assertTrue($container->hasParameter('.serializer.named_serializers'));
+        $this->assertSame([], $container->getParameter('.serializer.named_serializers'));
+    }
+
+    public function testSerializerParametersAreSet()
+    {
+        $container = $this->createContainerFromFile('full');
+        $this->assertTrue($container->hasParameter('.serializer.name_converter'));
+        $this->assertSame('serializer.name_converter.camel_case_to_snake_case', $container->getParameter('.serializer.name_converter'));
+        $this->assertTrue($container->hasParameter('serializer.default_context'));
+        $this->assertSame(['enable_max_depth' => true], $container->getParameter('serializer.default_context'));
+        $this->assertTrue($container->hasParameter('.serializer.named_serializers'));
+        $this->assertSame(['api' => ['include_built_in_normalizers' => true, 'include_built_in_encoders' => true, 'default_context' => ['enable_max_depth' => false]]], $container->getParameter('.serializer.named_serializers'));
+    }
+
     public function testRegisterSerializerExtractor()
     {
         $container = $this->createContainerFromFile('full');
@@ -1579,13 +1546,22 @@ public function testJsonSerializableNormalizerRegistered()
 
     public function testObjectNormalizerRegistered()
     {
-        $container = $this->createContainerFromFile('full');
+        $container = $this->createContainerFromFile('full', compile: false);
+        $container->addCompilerPass(new SerializerPass());
+        $container->addCompilerPass(new ResolveBindingsPass());
+        $container->compile();
 
         $definition = $container->getDefinition('serializer.normalizer.object');
         $tag = $definition->getTag('serializer.normalizer');
 
         $this->assertEquals(ObjectNormalizer::class, $definition->getClass());
         $this->assertEquals(-1000, $tag[0]['priority']);
+
+        $this->assertEquals([
+            'enable_max_depth' => true,
+            'circular_reference_handler' => new Reference('my.circular.reference.handler'),
+            'max_depth_handler' => new Reference('my.max.depth.handler'),
+        ], $definition->getArgument(6));
     }
 
     public function testConstraintViolationListNormalizerRegistered()
@@ -1698,6 +1674,12 @@ public function testSerializerServiceIsNotRegisteredWhenDisabled()
         $this->assertFalse($container->hasDefinition('serializer'));
     }
 
+    public function testTypeInfoEnabled()
+    {
+        $container = $this->createContainerFromFile('type_info');
+        $this->assertTrue($container->has('type_info.resolver'));
+    }
+
     public function testPropertyInfoEnabled()
     {
         $container = $this->createContainerFromFile('property_info');
@@ -1812,24 +1794,24 @@ public function testRedisTagAwareAdapter()
             'cacheRedisTagAwareBaz2',
         ];
         foreach ($argNames as $argumentName) {
-            $aliasesForArguments[] = sprintf('%s $%s', TagAwareCacheInterface::class, $argumentName);
-            $aliasesForArguments[] = sprintf('%s $%s', CacheInterface::class, $argumentName);
-            $aliasesForArguments[] = sprintf('%s $%s', CacheItemPoolInterface::class, $argumentName);
+            $aliasesForArguments[] = \sprintf('%s $%s', TagAwareCacheInterface::class, $argumentName);
+            $aliasesForArguments[] = \sprintf('%s $%s', CacheInterface::class, $argumentName);
+            $aliasesForArguments[] = \sprintf('%s $%s', CacheItemPoolInterface::class, $argumentName);
         }
 
         foreach ($aliasesForArguments as $aliasForArgumentStr) {
             $aliasForArgument = $container->getAlias($aliasForArgumentStr);
-            $this->assertNotNull($aliasForArgument, sprintf("No alias found for '%s'", $aliasForArgumentStr));
+            $this->assertNotNull($aliasForArgument, \sprintf("No alias found for '%s'", $aliasForArgumentStr));
 
             $def = $container->getDefinition((string) $aliasForArgument);
-            $this->assertInstanceOf(ChildDefinition::class, $def, sprintf("No definition found for '%s'", $aliasForArgumentStr));
+            $this->assertInstanceOf(ChildDefinition::class, $def, \sprintf("No definition found for '%s'", $aliasForArgumentStr));
 
             $defParent = $container->getDefinition($def->getParent());
             if ($defParent instanceof ChildDefinition) {
                 $defParent = $container->getDefinition($defParent->getParent());
             }
 
-            $this->assertSame(RedisTagAwareAdapter::class, $defParent->getClass(), sprintf("'%s' is not %s", $aliasForArgumentStr, RedisTagAwareAdapter::class));
+            $this->assertSame(RedisTagAwareAdapter::class, $defParent->getClass(), \sprintf("'%s' is not %s", $aliasForArgumentStr, RedisTagAwareAdapter::class));
         }
     }
 
@@ -2016,9 +1998,6 @@ public function testHttpClientOverrideDefaultOptions()
 
     public function testHttpClientRetry()
     {
-        if (!class_exists(RetryableHttpClient::class)) {
-            $this->expectException(LogicException::class);
-        }
         $container = $this->createContainerFromFile('http_client_retry');
 
         $this->assertSame([429, 500 => ['GET', 'HEAD']], $container->getDefinition('http_client.retry_strategy')->getArgument(0));
@@ -2076,12 +2055,42 @@ public function testHttpClientFullDefaultOptions()
         $this->assertSame(['foo' => ['bar' => 'baz']], $defaultOptions['extra']);
     }
 
+    public function testHttpClientRateLimiter()
+    {
+        if (!class_exists(ThrottlingHttpClient::class)) {
+            $this->expectException(LogicException::class);
+        }
+
+        $container = $this->createContainerFromFile('http_client_rate_limiter');
+
+        $this->assertTrue($container->hasDefinition('http_client.throttling'));
+        $definition = $container->getDefinition('http_client.throttling');
+        $this->assertSame(ThrottlingHttpClient::class, $definition->getClass());
+        $this->assertSame('http_client', $definition->getDecoratedService()[0]);
+        $this->assertCount(2, $arguments = $definition->getArguments());
+        $this->assertInstanceOf(Reference::class, $arguments[0]);
+        $this->assertSame('http_client.throttling.inner', (string) $arguments[0]);
+        $this->assertInstanceOf(Reference::class, $arguments[1]);
+        $this->assertSame('http_client.throttling.limiter', (string) $arguments[1]);
+
+        $this->assertTrue($container->hasDefinition('foo.throttling'));
+        $definition = $container->getDefinition('foo.throttling');
+        $this->assertSame(ThrottlingHttpClient::class, $definition->getClass());
+        $this->assertSame('foo', $definition->getDecoratedService()[0]);
+        $this->assertCount(2, $arguments = $definition->getArguments());
+        $this->assertInstanceOf(Reference::class, $arguments[0]);
+        $this->assertSame('foo.throttling.inner', (string) $arguments[0]);
+        $this->assertInstanceOf(Reference::class, $arguments[1]);
+        $this->assertSame('foo.throttling.limiter', (string) $arguments[1]);
+    }
+
     public static function provideMailer(): iterable
     {
         yield [
             'mailer_with_dsn',
             ['main' => 'smtp://example.com'],
             ['redirected@example.org'],
+            ['foobar@example\.org'],
         ];
         yield [
             'mailer_with_transports',
@@ -2090,13 +2099,14 @@ public static function provideMailer(): iterable
                 'transport2' => 'smtp://example2.com',
             ],
             ['redirected@example.org', 'redirected1@example.org'],
+            ['foobar@example\.org', '.*@example\.com'],
         ];
     }
 
     /**
      * @dataProvider provideMailer
      */
-    public function testMailer(string $configFile, array $expectedTransports, array $expectedRecipients)
+    public function testMailer(string $configFile, array $expectedTransports, array $expectedRecipients, array $expectedAllowedRecipients)
     {
         $container = $this->createContainerFromFile($configFile);
 
@@ -2108,6 +2118,7 @@ public function testMailer(string $configFile, array $expectedTransports, array
         $l = $container->getDefinition('mailer.envelope_listener');
         $this->assertSame('sender@example.org', $l->getArgument(0));
         $this->assertSame($expectedRecipients, $l->getArgument(1));
+        $this->assertSame($expectedAllowedRecipients, $l->getArgument(2));
         $this->assertEquals(new Reference('messenger.default_bus', ContainerInterface::NULL_ON_INVALID_REFERENCE), $container->getDefinition('mailer.mailer')->getArgument(1));
 
         $this->assertTrue($container->hasDefinition('mailer.message_listener'));
@@ -2152,7 +2163,6 @@ public function testRegisterParameterCollectingBehaviorDescribingTags()
 
         $this->assertTrue($container->hasParameter('container.behavior_describing_tags'));
         $this->assertEquals([
-            'annotations.cached_reader',
             'container.do_not_inline',
             'container.service_locator',
             'container.service_subscriber',
@@ -2212,7 +2222,7 @@ public function testIfNotifierTransportsAreKnownByFrameworkExtension()
 
         foreach ((new Finder())->in(\dirname(__DIR__, 4).'/Component/Notifier/Bridge')->directories()->depth(0)->exclude('Mercure') as $bridgeDirectory) {
             $transportFactoryName = strtolower(preg_replace('/(.)([A-Z])/', '$1-$2', $bridgeDirectory->getFilename()));
-            $this->assertTrue($container->hasDefinition('notifier.transport_factory.'.$transportFactoryName), sprintf('Did you forget to add the "%s" TransportFactory to the $classToServices array in FrameworkExtension?', $bridgeDirectory->getFilename()));
+            $this->assertTrue($container->hasDefinition('notifier.transport_factory.'.$transportFactoryName), \sprintf('Did you forget to add the "%s" TransportFactory to the $classToServices array in FrameworkExtension?', $bridgeDirectory->getFilename()));
         }
     }
 
@@ -2358,6 +2368,13 @@ public function testNotifierWithSpecificMessageBus()
         $this->assertEquals(new Reference('app.another_bus'), $container->getDefinition('notifier.channel.sms')->getArgument(1));
     }
 
+    public function testTrustedProxiesWithPrivateRanges()
+    {
+        $container = $this->createContainerFromFile('trusted_proxies_private_ranges');
+
+        $this->assertSame(IpUtils::PRIVATE_SUBNETS, $container->getParameter('kernel.trusted_proxies'));
+    }
+
     public function testWebhook()
     {
         if (!class_exists(WebhookController::class)) {
@@ -2371,7 +2388,7 @@ public function testWebhook()
         $this->assertSame(RequestParser::class, $container->getDefinition('webhook.request_parser')->getClass());
 
         $this->assertFalse($container->getDefinition('webhook.transport')->hasErrors());
-        $this->assertFalse($container->getDefinition('webhook.body_configurator.json')->hasErrors());
+        $this->assertEquals('webhook.payload_serializer.serializer', $container->getDefinition('webhook.body_configurator.json')->getArgument(0));
     }
 
     public function testWebhookWithoutSerializer()
@@ -2383,11 +2400,7 @@ public function testWebhookWithoutSerializer()
         $container = $this->createContainerFromFile('webhook_without_serializer');
 
         $this->assertFalse($container->getDefinition('webhook.transport')->hasErrors());
-        $this->assertTrue($container->getDefinition('webhook.body_configurator.json')->hasErrors());
-        $this->assertSame(
-            ['You cannot use the "webhook transport" service since the Serializer component is not enabled. Try setting "framework.serializer.enabled" to true.'],
-            $container->getDefinition('webhook.body_configurator.json')->getErrors()
-        );
+        $this->assertEquals('webhook.payload_serializer.json', $container->getDefinition('webhook.body_configurator.json')->getArgument(0));
     }
 
     public function testAssetMapperWithoutAssets()
@@ -2408,9 +2421,9 @@ public function testDefaultLock()
         $storeDef = $container->getDefinition($container->getDefinition('lock.default.factory')->getArgument(0));
 
         if (class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported()) {
-            self::assertEquals(new Reference('semaphore'), $storeDef->getArgument(0));
+            self::assertSame('semaphore', $storeDef->getArgument(0));
         } else {
-            self::assertEquals(new Reference('flock'), $storeDef->getArgument(0));
+            self::assertSame('flock', $storeDef->getArgument(0));
         }
     }
 
@@ -2420,23 +2433,46 @@ public function testNamedLocks()
 
         self::assertTrue($container->hasDefinition('lock.foo.factory'));
         $storeDef = $container->getDefinition($container->getDefinition('lock.foo.factory')->getArgument(0));
-        self::assertEquals(new Reference('semaphore'), $storeDef->getArgument(0));
+        self::assertSame('semaphore', $storeDef->getArgument(0));
 
         self::assertTrue($container->hasDefinition('lock.bar.factory'));
         $storeDef = $container->getDefinition($container->getDefinition('lock.bar.factory')->getArgument(0));
-        self::assertEquals(new Reference('flock'), $storeDef->getArgument(0));
+        self::assertSame('flock', $storeDef->getArgument(0));
 
         self::assertTrue($container->hasDefinition('lock.baz.factory'));
         $storeDef = $container->getDefinition($container->getDefinition('lock.baz.factory')->getArgument(0));
         self::assertIsArray($storeDefArg = $storeDef->getArgument(0));
         $storeDef1 = $container->getDefinition($storeDefArg[0]);
         $storeDef2 = $container->getDefinition($storeDefArg[1]);
-        self::assertEquals(new Reference('semaphore'), $storeDef1->getArgument(0));
-        self::assertEquals(new Reference('flock'), $storeDef2->getArgument(0));
+        self::assertSame('semaphore', $storeDef1->getArgument(0));
+        self::assertSame('flock', $storeDef2->getArgument(0));
 
         self::assertTrue($container->hasDefinition('lock.qux.factory'));
         $storeDef = $container->getDefinition($container->getDefinition('lock.qux.factory')->getArgument(0));
         self::assertStringContainsString('REDIS_DSN', $storeDef->getArgument(0));
+
+        self::assertTrue($container->hasDefinition('lock.corge.factory'));
+        $storeDef = $container->getDefinition($container->getDefinition('lock.corge.factory')->getArgument(0));
+        self::assertSame('in-memory', $storeDef->getArgument(0));
+
+        self::assertTrue($container->hasDefinition('lock.grault.factory'));
+        $storeDef = $container->getDefinition($container->getDefinition('lock.grault.factory')->getArgument(0));
+        self::assertSame('mysql:host=localhost;dbname=test', $storeDef->getArgument(0));
+
+        self::assertTrue($container->hasDefinition('lock.garply.factory'));
+        $storeDef = $container->getDefinition($container->getDefinition('lock.garply.factory')->getArgument(0));
+        self::assertSame('null', $storeDef->getArgument(0));
+    }
+
+    public function testLockWithService()
+    {
+        $container = $this->createContainerFromFile('lock_service', [], true, false);
+        $container->getCompilerPassConfig()->setOptimizationPasses([new ResolveChildDefinitionsPass()]);
+        $container->compile();
+
+        self::assertTrue($container->hasDefinition('lock.default.factory'));
+        $storeDef = $container->getDefinition($container->getDefinition('lock.default.factory')->getArgument(0));
+        self::assertEquals(new Reference('my_service'), $storeDef->getArgument(0));
     }
 
     public function testDefaultSemaphore()
@@ -2461,6 +2497,17 @@ public function testNamedSemaphores()
         self::assertStringContainsString('REDIS_DSN', $storeDef->getArgument(0));
     }
 
+    public function testSemaphoreWithService()
+    {
+        $container = $this->createContainerFromFile('semaphore_service', [], true, false);
+        $container->getCompilerPassConfig()->setOptimizationPasses([new ResolveChildDefinitionsPass()]);
+        $container->compile();
+
+        self::assertTrue($container->hasDefinition('semaphore.default.factory'));
+        $storeDef = $container->getDefinition($container->getDefinition('semaphore.default.factory')->getArgument(0));
+        self::assertEquals(new Reference('my_service'), $storeDef->getArgument(0));
+    }
+
     protected function createContainer(array $data = [])
     {
         return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([
@@ -2480,7 +2527,7 @@ protected function createContainer(array $data = [])
         ], $data)));
     }
 
-    protected function createContainerFromFile(string $file, array $data = [], bool $resetCompilerPasses = true, bool $compile = true, ?FrameworkExtension $extension = null)
+    protected function createContainerFromFile(string $file, array $data = [], bool $resetCompilerPasses = true, bool $compile = true, ?FrameworkExtension $extension = null): ContainerBuilder
     {
         $cacheKey = md5(static::class.$file.serialize($data));
         if ($compile && isset(self::$containerCache[$cacheKey])) {
@@ -2497,7 +2544,6 @@ protected function createContainerFromFile(string $file, array $data = [], bool
         }
         $container->getCompilerPassConfig()->setBeforeOptimizationPasses([new LoggerPass()]);
         $container->getCompilerPassConfig()->setBeforeRemovingPasses([new AddConstraintValidatorsPass(), new TranslatorPass()]);
-        $container->getCompilerPassConfig()->setAfterRemovingPasses([new AddAnnotationsCachedReaderPass()]);
 
         if (!$compile) {
             return $container;
@@ -2507,7 +2553,7 @@ protected function createContainerFromFile(string $file, array $data = [], bool
         return self::$containerCache[$cacheKey] = $container;
     }
 
-    protected function createContainerFromClosure($closure, $data = [])
+    protected function createContainerFromClosure($closure, $data = []): ContainerBuilder
     {
         $container = $this->createContainer($data);
         $container->registerExtension(new FrameworkExtension());
@@ -2550,14 +2596,14 @@ private function assertVersionStrategy(ContainerBuilder $container, Reference $r
 
     private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $container, $id, $adapter, $defaultLifetime)
     {
-        $this->assertTrue($container->has($id), sprintf('Service definition "%s" for cache pool of type "%s" is registered', $id, $adapter));
+        $this->assertTrue($container->has($id), \sprintf('Service definition "%s" for cache pool of type "%s" is registered', $id, $adapter));
 
         $poolDefinition = $container->getDefinition($id);
 
-        $this->assertInstanceOf(ChildDefinition::class, $poolDefinition, sprintf('Cache pool "%s" is based on an abstract cache pool.', $id));
+        $this->assertInstanceOf(ChildDefinition::class, $poolDefinition, \sprintf('Cache pool "%s" is based on an abstract cache pool.', $id));
 
-        $this->assertTrue($poolDefinition->hasTag('cache.pool'), sprintf('Service definition "%s" is tagged with the "cache.pool" tag.', $id));
-        $this->assertFalse($poolDefinition->isAbstract(), sprintf('Service definition "%s" is not abstract.', $id));
+        $this->assertTrue($poolDefinition->hasTag('cache.pool'), \sprintf('Service definition "%s" is tagged with the "cache.pool" tag.', $id));
+        $this->assertFalse($poolDefinition->isAbstract(), \sprintf('Service definition "%s" is not abstract.', $id));
 
         $tag = $poolDefinition->getTag('cache.pool');
         $this->assertArrayHasKey('default_lifetime', $tag[0], 'The default lifetime is stored as an attribute of the "cache.pool" tag.');
@@ -2579,15 +2625,3 @@ private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $con
         };
     }
 }
-
-/**
- * Simulates ReplaceAliasByActualDefinitionPass.
- */
-class TestAnnotationsPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        $container->setDefinition('annotation_reader', $container->getDefinition('annotations.cached_reader'));
-        $container->removeDefinition('annotations.cached_reader');
-    }
-}
diff --git a/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
index 53268ffd2..ad979a01a 100644
--- a/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
+++ b/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,51 @@ public function testRateLimiterLockFactory()
 
         $container->getDefinition('limiter.without_lock')->getArgument(2);
     }
+
+    public function testRateLimiterIsTagged()
+    {
+        $container = $this->createContainerFromClosure(function (ContainerBuilder $container) {
+            $container->loadFromExtension('framework', [
+                'annotations' => false,
+                'http_method_override' => false,
+                'handle_all_throwables' => true,
+                'php_errors' => ['log' => true],
+                'lock' => true,
+                'rate_limiter' => [
+                    'first' => ['policy' => 'fixed_window', 'limit' => 10, 'interval' => '1 hour'],
+                    'second' => ['policy' => 'fixed_window', 'limit' => 10, 'interval' => '1 hour'],
+                ],
+            ]);
+        });
+
+        $this->assertSame('first', $container->getDefinition('limiter.first')->getTag('rate_limiter')[0]['name']);
+        $this->assertSame('second', $container->getDefinition('limiter.second')->getTag('rate_limiter')[0]['name']);
+    }
+
+    /**
+     * @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 static function emailValidationModeProvider()
+    {
+        foreach (Email::VALIDATION_MODES as $mode) {
+            yield [$mode];
+        }
+    }
 }
diff --git a/Tests/DependencyInjection/XmlFrameworkExtensionTest.php b/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
index 822409f70..1b2eb668a 100644
--- a/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
+++ b/Tests/DependencyInjection/XmlFrameworkExtensionTest.php
@@ -33,40 +33,6 @@ public function testMessengerMiddlewareFactoryErroneousFormat()
         $this->markTestSkipped('XML configuration will not allow erroneous format.');
     }
 
-    public function testLegacyExceptionsConfig()
-    {
-        $container = $this->createContainerFromFile('exceptions_legacy');
-
-        $configuration = $container->getDefinition('exception_listener')->getArgument(3);
-
-        $this->assertSame([
-            \Symfony\Component\HttpKernel\Exception\BadRequestHttpException::class,
-            \Symfony\Component\HttpKernel\Exception\NotFoundHttpException::class,
-            \Symfony\Component\HttpKernel\Exception\ConflictHttpException::class,
-            \Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException::class,
-        ], array_keys($configuration));
-
-        $this->assertEqualsCanonicalizing([
-            'log_level' => 'info',
-            'status_code' => 422,
-        ], $configuration[\Symfony\Component\HttpKernel\Exception\BadRequestHttpException::class]);
-
-        $this->assertEqualsCanonicalizing([
-            'log_level' => 'info',
-            'status_code' => null,
-        ], $configuration[\Symfony\Component\HttpKernel\Exception\NotFoundHttpException::class]);
-
-        $this->assertEqualsCanonicalizing([
-            'log_level' => 'info',
-            'status_code' => null,
-        ], $configuration[\Symfony\Component\HttpKernel\Exception\ConflictHttpException::class]);
-
-        $this->assertEqualsCanonicalizing([
-            'log_level' => null,
-            'status_code' => 500,
-        ], $configuration[\Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException::class]);
-    }
-
     public function testRateLimiter()
     {
         $container = $this->createContainerFromFile('rate_limiter');
diff --git a/Tests/Fixtures/ContainerAwareController.php b/Tests/Fixtures/ContainerAwareController.php
deleted file mode 100644
index fa1be2069..000000000
--- a/Tests/Fixtures/ContainerAwareController.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
-
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-class ContainerAwareController implements ContainerAwareInterface
-{
-    private ?ContainerInterface $container = null;
-
-    public function setContainer(?ContainerInterface $container): void
-    {
-        $this->container = $container;
-    }
-
-    public function getContainer(): ?ContainerInterface
-    {
-        return $this->container;
-    }
-
-    public function testAction()
-    {
-    }
-
-    public function __invoke()
-    {
-    }
-}
diff --git a/Tests/Functional/ApiAttributesTest.php b/Tests/Functional/ApiAttributesTest.php
index 96b6d0ee9..cf5c384ba 100644
--- a/Tests/Functional/ApiAttributesTest.php
+++ b/Tests/Functional/ApiAttributesTest.php
@@ -23,13 +23,14 @@ class ApiAttributesTest extends AbstractWebTestCase
     /**
      * @dataProvider mapQueryStringProvider
      */
-    public function testMapQueryString(array $query, string $expectedResponse, int $expectedStatusCode)
+    public function testMapQueryString(string $uri, array $query, string $expectedResponse, int $expectedStatusCode)
     {
         $client = self::createClient(['test_case' => 'ApiAttributesTest']);
 
-        $client->request('GET', '/map-query-string.json', $query);
+        $client->request('GET', $uri, $query);
 
         $response = $client->getResponse();
+
         if ($expectedResponse) {
             self::assertJsonStringEqualsJsonString($expectedResponse, $response->getContent());
         } else {
@@ -40,13 +41,70 @@ public function testMapQueryString(array $query, string $expectedResponse, int $
 
     public static function mapQueryStringProvider(): iterable
     {
-        yield 'empty' => [
+        yield 'empty query string mapping nullable attribute' => [
+            'uri' => '/map-query-string-to-nullable-attribute.json',
             'query' => [],
             'expectedResponse' => '',
             'expectedStatusCode' => 204,
         ];
 
-        yield 'valid' => [
+        yield 'valid query string mapping nullable attribute' => [
+            'uri' => '/map-query-string-to-nullable-attribute.json',
+            'query' => ['filter' => ['status' => 'approved', 'quantity' => '4']],
+            'expectedResponse' => <<<'JSON'
+                {
+                    "filter": {
+                        "status": "approved",
+                        "quantity": 4
+                    }
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'invalid query string mapping nullable attribute' => [
+            'uri' => '/map-query-string-to-nullable-attribute.json',
+            'query' => ['filter' => ['status' => 'approved', 'quantity' => '200']],
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 404,
+                    "detail": "filter.quantity: This value should be less than 10.",
+                    "violations": [
+                        {
+                            "propertyPath": "filter.quantity",
+                            "title": "This value should be less than 10.",
+                            "template": "This value should be less than {{ compared_value }}.",
+                            "parameters": {
+                                "{{ value }}": "200",
+                                "{{ compared_value }}": "10",
+                                "{{ compared_value_type }}": "int"
+                            },
+                            "type": "urn:uuid:079d7420-2d13-460c-8756-de810eeb37d2"
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 404,
+        ];
+
+        yield 'empty query string mapping attribute with default value' => [
+            'uri' => '/map-query-string-to-attribute-with-default-value.json',
+            'query' => [],
+            'expectedResponse' => <<<'JSON'
+                {
+                    "filter": {
+                        "status": "approved",
+                        "quantity": 5
+                    }
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'valid query string mapping attribute with default value' => [
+            'uri' => '/map-query-string-to-attribute-with-default-value.json',
             'query' => ['filter' => ['status' => 'approved', 'quantity' => '4']],
             'expectedResponse' => <<<'JSON'
                 {
@@ -59,7 +117,8 @@ public static function mapQueryStringProvider(): iterable
             'expectedStatusCode' => 200,
         ];
 
-        yield 'invalid' => [
+        yield 'invalid query string mapping attribute with default value' => [
+            'uri' => '/map-query-string-to-attribute-with-default-value.json',
             'query' => ['filter' => ['status' => 'approved', 'quantity' => '200']],
             'expectedResponse' => <<<'JSON'
                 {
@@ -84,12 +143,80 @@ public static function mapQueryStringProvider(): iterable
                 JSON,
             'expectedStatusCode' => 404,
         ];
+
+        $expectedResponse = <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 404,
+                    "detail": "filter: This value should be of type Symfony\\Bundle\\FrameworkBundle\\Tests\\Functional\\Filter.",
+                    "violations": [
+                        {
+                            "parameters": {
+                                "hint": "Failed to create object because the class misses the \"filter\" property.",
+                                "{{ type }}": "Symfony\\Bundle\\FrameworkBundle\\Tests\\Functional\\Filter"
+                            },
+                            "propertyPath": "filter",
+                            "template": "This value should be of type {{ type }}.",
+                            "title": "This value should be of type Symfony\\Bundle\\FrameworkBundle\\Tests\\Functional\\Filter."
+                        }
+                    ]
+                }
+                JSON;
+
+        yield 'empty query string mapping non-nullable attribute without default value' => [
+            'uri' => '/map-query-string-to-non-nullable-attribute-without-default-value.json',
+            'query' => [],
+            'expectedResponse' => $expectedResponse,
+            'expectedStatusCode' => 404,
+        ];
+
+        yield 'valid query string mapping non-nullable attribute without default value' => [
+            'uri' => '/map-query-string-to-non-nullable-attribute-without-default-value.json',
+            'query' => ['filter' => ['status' => 'approved', 'quantity' => '4']],
+            'expectedResponse' => <<<'JSON'
+                {
+                    "filter": {
+                        "status": "approved",
+                        "quantity": 4
+                    }
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'invalid query string mapping non-nullable attribute without default value' => [
+            'uri' => '/map-query-string-to-non-nullable-attribute-without-default-value.json',
+            'query' => ['filter' => ['status' => 'approved', 'quantity' => '11']],
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 404,
+                    "detail": "filter.quantity: This value should be less than 10.",
+                    "violations": [
+                        {
+                            "propertyPath": "filter.quantity",
+                            "title": "This value should be less than 10.",
+                            "template": "This value should be less than {{ compared_value }}.",
+                            "parameters": {
+                                "{{ value }}": "11",
+                                "{{ compared_value }}": "10",
+                                "{{ compared_value_type }}": "int"
+                            },
+                            "type": "urn:uuid:079d7420-2d13-460c-8756-de810eeb37d2"
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 404,
+        ];
     }
 
     /**
      * @dataProvider mapRequestPayloadProvider
      */
-    public function testMapRequestPayload(string $format, array $parameters, ?string $content, string $expectedResponse, int $expectedStatusCode)
+    public function testMapRequestPayload(string $uri, string $format, array $parameters, ?string $content, string $expectedResponse, int $expectedStatusCode)
     {
         $client = self::createClient(['test_case' => 'ApiAttributesTest']);
 
@@ -102,7 +229,7 @@ public function testMapRequestPayload(string $format, array $parameters, ?string
 
         $client->request(
             'POST',
-            '/map-request-body.'.$format,
+            $uri,
             $parameters,
             [],
             ['HTTP_ACCEPT' => $acceptHeader, 'CONTENT_TYPE' => $acceptHeader],
@@ -123,7 +250,8 @@ public function testMapRequestPayload(string $format, array $parameters, ?string
 
     public static function mapRequestPayloadProvider(): iterable
     {
-        yield 'empty' => [
+        yield 'empty request mapping nullable attribute' => [
+            'uri' => '/map-request-to-nullable-attribute.json',
             'format' => 'json',
             'parameters' => [],
             'content' => '',
@@ -131,7 +259,8 @@ public static function mapRequestPayloadProvider(): iterable
             'expectedStatusCode' => 204,
         ];
 
-        yield 'valid json' => [
+        yield 'valid request with json content mapping nullable attribute' => [
+            'uri' => '/map-request-to-nullable-attribute.json',
             'format' => 'json',
             'parameters' => [],
             'content' => <<<'JSON'
@@ -149,7 +278,41 @@ public static function mapRequestPayloadProvider(): iterable
             'expectedStatusCode' => 200,
         ];
 
-        yield 'malformed json' => [
+        yield 'valid request with xml content mapping nullable attribute' => [
+            'uri' => '/map-request-to-nullable-attribute.xml',
+            'format' => 'xml',
+            'parameters' => [],
+            'content' => <<<'XML'
+                <request>
+                    <comment>Hello everyone!</comment>
+                    <approved>true</approved>
+                </request>
+                XML,
+            'expectedResponse' => <<<'XML'
+                <response>
+                    <comment>Hello everyone!</comment>
+                    <approved>1</approved>
+                </response>
+                XML,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'valid request mapping nullable attribute' => [
+            'uri' => '/map-request-to-nullable-attribute.json',
+            'format' => 'json',
+            'parameters' => ['comment' => 'Hello everyone!', 'approved' => '0'],
+            'content' => null,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'malformed json request mapping nullable attribute' => [
+            'uri' => '/map-request-to-nullable-attribute.json',
             'format' => 'json',
             'parameters' => [],
             'content' => <<<'JSON'
@@ -169,7 +332,8 @@ public static function mapRequestPayloadProvider(): iterable
             'expectedStatusCode' => 400,
         ];
 
-        yield 'unsupported format' => [
+        yield 'request with unsupported format mapping nullable attribute' => [
+            'uri' => '/map-request-to-nullable-attribute.dummy',
             'format' => 'dummy',
             'parameters' => [],
             'content' => 'Hello',
@@ -177,25 +341,8 @@ public static function mapRequestPayloadProvider(): iterable
             'expectedStatusCode' => 415,
         ];
 
-        yield 'valid xml' => [
-            'format' => 'xml',
-            'parameters' => [],
-            'content' => <<<'XML'
-                <request>
-                    <comment>Hello everyone!</comment>
-                    <approved>true</approved>
-                </request>
-                XML,
-            'expectedResponse' => <<<'XML'
-                <response>
-                    <comment>Hello everyone!</comment>
-                    <approved>1</approved>
-                </response>
-                XML,
-            'expectedStatusCode' => 200,
-        ];
-
-        yield 'invalid type' => [
+        yield 'request with invalid type mapping nullable attribute' => [
+            'uri' => '/map-request-to-nullable-attribute.json',
             'format' => 'json',
             'parameters' => [],
             'content' => <<<'JSON'
@@ -225,7 +372,8 @@ public static function mapRequestPayloadProvider(): iterable
             'expectedStatusCode' => 422,
         ];
 
-        yield 'validation error json' => [
+        yield 'invalid request with json content mapping nullable attribute' => [
+            'uri' => '/map-request-to-nullable-attribute.json',
             'format' => 'json',
             'parameters' => [],
             'content' => <<<'JSON'
@@ -267,7 +415,8 @@ public static function mapRequestPayloadProvider(): iterable
             'expectedStatusCode' => 422,
         ];
 
-        yield 'validation error xml' => [
+        yield 'invalid request with xml content mapping nullable attribute' => [
+            'uri' => '/map-request-to-nullable-attribute.xml',
             'format' => 'xml',
             'parameters' => [],
             'content' => <<<'XML'
@@ -299,22 +448,10 @@ public static function mapRequestPayloadProvider(): iterable
             'expectedStatusCode' => 422,
         ];
 
-        yield 'valid input' => [
-            'format' => 'json',
-            'input' => ['comment' => 'Hello everyone!', 'approved' => '0'],
-            'content' => null,
-            'expectedResponse' => <<<'JSON'
-                {
-                    "comment": "Hello everyone!",
-                    "approved": false
-                }
-                JSON,
-            'expectedStatusCode' => 200,
-        ];
-
-        yield 'validation error input' => [
+        yield 'invalid request mapping nullable attribute' => [
+            'uri' => '/map-request-to-nullable-attribute.json',
             'format' => 'json',
-            'input' => ['comment' => '', 'approved' => '1'],
+            'parameters' => ['comment' => '', 'approved' => '1'],
             'content' => null,
             'expectedResponse' => <<<'JSON'
                 {
@@ -348,32 +485,577 @@ public static function mapRequestPayloadProvider(): iterable
                 JSON,
             'expectedStatusCode' => 422,
         ];
-    }
-}
 
-class WithMapQueryStringController
-{
-    public function __invoke(#[MapQueryString] ?QueryString $query): Response
-    {
-        if (!$query) {
-            return new Response('', Response::HTTP_NO_CONTENT);
-        }
+        yield 'empty request mapping attribute with default value' => [
+            'uri' => '/map-request-to-attribute-with-default-value.json',
+            'format' => 'json',
+            'parameters' => [],
+            'content' => '',
+            'expectedResponse' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
 
-        return new JsonResponse(
-            ['filter' => ['status' => $query->filter->status, 'quantity' => $query->filter->quantity]],
-        );
-    }
-}
+        yield 'valid request with json content mapping attribute with default value' => [
+            'uri' => '/map-request-to-attribute-with-default-value.json',
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
 
-class WithMapRequestPayloadController
-{
-    public function __invoke(#[MapRequestPayload] ?RequestBody $body, Request $request): Response
-    {
-        if ('json' === $request->getPreferredFormat('json')) {
-            if (!$body) {
-                return new Response('', Response::HTTP_NO_CONTENT);
-            }
+        yield 'valid request with xml content mapping attribute with default value' => [
+            'uri' => '/map-request-to-attribute-with-default-value.xml',
+            'format' => 'xml',
+            'parameters' => [],
+            'content' => <<<'XML'
+                <request>
+                    <comment>Hello everyone!</comment>
+                    <approved>true</approved>
+                </request>
+                XML,
+            'expectedResponse' => <<<'XML'
+                <response>
+                    <comment>Hello everyone!</comment>
+                    <approved>1</approved>
+                </response>
+                XML,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'valid request mapping attribute with default value' => [
+            'uri' => '/map-request-to-attribute-with-default-value.json',
+            'format' => 'json',
+            'parameters' => ['comment' => 'Hello everyone!', 'approved' => '0'],
+            'content' => null,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'malformed json request mapping attribute with default value' => [
+            'uri' => '/map-request-to-attribute-with-default-value.json',
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false,
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/tools.ietf.org\/html\/rfc2616#section-10",
+                    "title": "An error occurred",
+                    "status": 400,
+                    "detail": "Bad Request"
+                }
+                JSON,
+            'expectedStatusCode' => 400,
+        ];
 
+        yield 'request with unsupported format mapping attribute with default value' => [
+            'uri' => '/map-request-to-attribute-with-default-value.dummy',
+            'format' => 'dummy',
+            'parameters' => [],
+            'content' => 'Hello',
+            'expectedResponse' => '415 Unsupported Media Type',
+            'expectedStatusCode' => 415,
+        ];
+
+        yield 'request with invalid type mapping attribute with default value' => [
+            'uri' => '/map-request-to-attribute-with-default-value.json',
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": "string instead of bool"
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 422,
+                    "detail": "approved: This value should be of type bool.",
+                    "violations": [
+                        {
+                            "propertyPath": "approved",
+                            "title": "This value should be of type bool.",
+                            "template": "This value should be of type {{ type }}.",
+                            "parameters": {
+                                "{{ type }}": "bool"
+                            }
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 422,
+        ];
+
+        yield 'invalid request with json content mapping attribute with default value' => [
+            'uri' => '/map-request-to-attribute-with-default-value.json',
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "",
+                    "approved": true
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 422,
+                    "detail": "comment: This value should not be blank.\ncomment: This value is too short. It should have 10 characters or more.",
+                    "violations": [
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value should not be blank.",
+                            "template": "This value should not be blank.",
+                            "parameters": {
+                                "{{ value }}": "\"\""
+                            },
+                            "type": "urn:uuid:c1051bb4-d103-4f74-8988-acbcafc7fdc3"
+                        },
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value is too short. It should have 10 characters or more.",
+                            "template": "This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.",
+                            "parameters": {
+                                "{{ value }}": "\"\"",
+                                "{{ limit }}": "10",
+                                "{{ value_length }}": "0"
+                            },
+                            "type": "urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45"
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 422,
+        ];
+
+        yield 'invalid request with xml content mapping attribute with default value' => [
+            'uri' => '/map-request-to-attribute-with-default-value.xml',
+            'format' => 'xml',
+            'parameters' => [],
+            'content' => <<<'XML'
+                <request>
+                    <comment>H</comment>
+                    <approved>false</approved>
+                </request>
+                XML,
+            'expectedResponse' => <<<'XML'
+                <?xml version="1.0"?>
+                <response>
+                    <type>https://symfony.com/errors/validation</type>
+                    <title>Validation Failed</title>
+                    <status>422</status>
+                    <detail>comment: This value is too short. It should have 10 characters or more.</detail>
+                    <violations>
+                        <propertyPath>comment</propertyPath>
+                        <title>This value is too short. It should have 10 characters or more.</title>
+                        <template>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</template>
+                        <parameters>
+                            <item key="{{ value }}">"H"</item>
+                            <item key="{{ limit }}">10</item>
+                            <item key="{{ value_length }}">1</item>
+                        </parameters>
+                        <type>urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45</type>
+                    </violations>
+                </response>
+                XML,
+            'expectedStatusCode' => 422,
+        ];
+
+        yield 'invalid request mapping attribute with default value' => [
+            'uri' => '/map-request-to-attribute-with-default-value.json',
+            'format' => 'json',
+            'parameters' => ['comment' => '', 'approved' => '1'],
+            'content' => null,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 422,
+                    "detail": "comment: This value should not be blank.\ncomment: This value is too short. It should have 10 characters or more.",
+                    "violations": [
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value should not be blank.",
+                            "template": "This value should not be blank.",
+                            "parameters": {
+                                "{{ value }}": "\"\""
+                            },
+                            "type": "urn:uuid:c1051bb4-d103-4f74-8988-acbcafc7fdc3"
+                        },
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value is too short. It should have 10 characters or more.",
+                            "template": "This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.",
+                            "parameters": {
+                                "{{ value }}": "\"\"",
+                                "{{ limit }}": "10",
+                                "{{ value_length }}": "0"
+                            },
+                            "type": "urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45"
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 422,
+        ];
+
+        $expectedStatusCode = 400;
+        $expectedResponse = <<<'JSON'
+                {
+                  "type":"https:\/\/tools.ietf.org\/html\/rfc2616#section-10",
+                  "title":"An error occurred",
+                  "status":400,
+                  "detail":"Bad Request"
+                }
+                JSON;
+
+        yield 'empty request mapping non-nullable attribute without default value' => [
+            'uri' => '/map-request-to-non-nullable-attribute-without-default-value.json',
+            'format' => 'json',
+            'parameters' => [],
+            'content' => '',
+            'expectedResponse' => $expectedResponse,
+            'expectedStatusCode' => $expectedStatusCode,
+        ];
+
+        yield 'valid request with json content mapping non-nullable attribute without default value' => [
+            'uri' => '/map-request-to-non-nullable-attribute-without-default-value.json',
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'valid request with xml content mapping non-nullable attribute without default value' => [
+            'uri' => '/map-request-to-non-nullable-attribute-without-default-value.xml',
+            'format' => 'xml',
+            'parameters' => [],
+            'content' => <<<'XML'
+                <request>
+                    <comment>Hello everyone!</comment>
+                    <approved>true</approved>
+                </request>
+                XML,
+            'expectedResponse' => <<<'XML'
+                <response>
+                    <comment>Hello everyone!</comment>
+                    <approved>1</approved>
+                </response>
+                XML,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'valid request mapping non-nullable attribute without default value' => [
+            'uri' => '/map-request-to-non-nullable-attribute-without-default-value.json',
+            'format' => 'json',
+            'parameters' => ['comment' => 'Hello everyone!', 'approved' => '0'],
+            'content' => null,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false
+                }
+                JSON,
+            'expectedStatusCode' => 200,
+        ];
+
+        yield 'malformed json request mapping non-nullable attribute without default value' => [
+            'uri' => '/map-request-to-non-nullable-attribute-without-default-value.json',
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": false,
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/tools.ietf.org\/html\/rfc2616#section-10",
+                    "title": "An error occurred",
+                    "status": 400,
+                    "detail": "Bad Request"
+                }
+                JSON,
+            'expectedStatusCode' => 400,
+        ];
+
+        yield 'request with unsupported format mapping non-nullable attribute without default value' => [
+            'uri' => '/map-request-to-non-nullable-attribute-without-default-value.dummy',
+            'format' => 'dummy',
+            'parameters' => [],
+            'content' => 'Hello',
+            'expectedResponse' => '415 Unsupported Media Type',
+            'expectedStatusCode' => 415,
+        ];
+
+        yield 'request with invalid type mapping non-nullable attribute without default value' => [
+            'uri' => '/map-request-to-non-nullable-attribute-without-default-value.json',
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "Hello everyone!",
+                    "approved": "string instead of bool"
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 422,
+                    "detail": "approved: This value should be of type bool.",
+                    "violations": [
+                        {
+                            "propertyPath": "approved",
+                            "title": "This value should be of type bool.",
+                            "template": "This value should be of type {{ type }}.",
+                            "parameters": {
+                                "{{ type }}": "bool"
+                            }
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 422,
+        ];
+
+        yield 'invalid request with json content mapping non-nullable attribute without default value' => [
+            'uri' => '/map-request-to-non-nullable-attribute-without-default-value.json',
+            'format' => 'json',
+            'parameters' => [],
+            'content' => <<<'JSON'
+                {
+                    "comment": "",
+                    "approved": true
+                }
+                JSON,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 422,
+                    "detail": "comment: This value should not be blank.\ncomment: This value is too short. It should have 10 characters or more.",
+                    "violations": [
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value should not be blank.",
+                            "template": "This value should not be blank.",
+                            "parameters": {
+                                "{{ value }}": "\"\""
+                            },
+                            "type": "urn:uuid:c1051bb4-d103-4f74-8988-acbcafc7fdc3"
+                        },
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value is too short. It should have 10 characters or more.",
+                            "template": "This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.",
+                            "parameters": {
+                                "{{ value }}": "\"\"",
+                                "{{ limit }}": "10",
+                                "{{ value_length }}": "0"
+                            },
+                            "type": "urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45"
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 422,
+        ];
+
+        yield 'invalid request with xml content mapping non-nullable attribute without default value' => [
+            'uri' => '/map-request-to-non-nullable-attribute-without-default-value.xml',
+            'format' => 'xml',
+            'parameters' => [],
+            'content' => <<<'XML'
+                <request>
+                    <comment>H</comment>
+                    <approved>false</approved>
+                </request>
+                XML,
+            'expectedResponse' => <<<'XML'
+                <?xml version="1.0"?>
+                <response>
+                    <type>https://symfony.com/errors/validation</type>
+                    <title>Validation Failed</title>
+                    <status>422</status>
+                    <detail>comment: This value is too short. It should have 10 characters or more.</detail>
+                    <violations>
+                        <propertyPath>comment</propertyPath>
+                        <title>This value is too short. It should have 10 characters or more.</title>
+                        <template>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</template>
+                        <parameters>
+                            <item key="{{ value }}">"H"</item>
+                            <item key="{{ limit }}">10</item>
+                            <item key="{{ value_length }}">1</item>
+                        </parameters>
+                        <type>urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45</type>
+                    </violations>
+                </response>
+                XML,
+            'expectedStatusCode' => 422,
+        ];
+
+        yield 'invalid request mapping non-nullable attribute without default value' => [
+            'uri' => '/map-request-to-non-nullable-attribute-without-default-value.json',
+            'format' => 'json',
+            'parameters' => ['comment' => '', 'approved' => '1'],
+            'content' => null,
+            'expectedResponse' => <<<'JSON'
+                {
+                    "type": "https:\/\/symfony.com\/errors\/validation",
+                    "title": "Validation Failed",
+                    "status": 422,
+                    "detail": "comment: This value should not be blank.\ncomment: This value is too short. It should have 10 characters or more.",
+                    "violations": [
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value should not be blank.",
+                            "template": "This value should not be blank.",
+                            "parameters": {
+                                "{{ value }}": "\"\""
+                            },
+                            "type": "urn:uuid:c1051bb4-d103-4f74-8988-acbcafc7fdc3"
+                        },
+                        {
+                            "propertyPath": "comment",
+                            "title": "This value is too short. It should have 10 characters or more.",
+                            "template": "This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.",
+                            "parameters": {
+                                "{{ value }}": "\"\"",
+                                "{{ limit }}": "10",
+                                "{{ value_length }}": "0"
+                            },
+                            "type": "urn:uuid:9ff3fdc4-b214-49db-8718-39c315e33d45"
+                        }
+                    ]
+                }
+                JSON,
+            'expectedStatusCode' => 422,
+        ];
+    }
+}
+
+class WithMapQueryStringToNullableAttributeController
+{
+    public function __invoke(#[MapQueryString] ?QueryString $query): Response
+    {
+        if (!$query) {
+            return new Response('', Response::HTTP_NO_CONTENT);
+        }
+
+        return new JsonResponse(
+            ['filter' => ['status' => $query->filter->status, 'quantity' => $query->filter->quantity]],
+        );
+    }
+}
+
+class WithMapQueryStringToAttributeWithDefaultValueController
+{
+    public function __invoke(#[MapQueryString] QueryString $query = new QueryString(new Filter('approved', 5))): Response
+    {
+        return new JsonResponse(
+            ['filter' => ['status' => $query->filter->status, 'quantity' => $query->filter->quantity]],
+        );
+    }
+}
+
+class WithMapQueryStringToNonNullableAttributeWithoutDefaultValueController
+{
+    public function __invoke(#[MapQueryString] QueryString $query): Response
+    {
+        return new JsonResponse(
+            ['filter' => ['status' => $query->filter->status, 'quantity' => $query->filter->quantity]],
+        );
+    }
+}
+
+class WithMapRequestToNullableAttributeController
+{
+    public function __invoke(#[MapRequestPayload] ?RequestBody $body, Request $request): Response
+    {
+        if ('json' === $request->getPreferredFormat('json')) {
+            if (!$body) {
+                return new Response('', Response::HTTP_NO_CONTENT);
+            }
+
+            return new JsonResponse(['comment' => $body->comment, 'approved' => $body->approved]);
+        }
+
+        return new Response(
+            <<<XML
+            <response>
+                <comment>{$body->comment}</comment>
+                <approved>{$body->approved}</approved>
+            </response>
+            XML
+        );
+    }
+}
+
+class WithMapRequestToAttributeWithDefaultValueController
+{
+    public function __invoke(Request $request, #[MapRequestPayload] RequestBody $body = new RequestBody('Hello everyone!', false)): Response
+    {
+        if ('json' === $request->getPreferredFormat('json')) {
+            return new JsonResponse(['comment' => $body->comment, 'approved' => $body->approved]);
+        }
+
+        return new Response(
+            <<<XML
+            <response>
+                <comment>{$body->comment}</comment>
+                <approved>{$body->approved}</approved>
+            </response>
+            XML
+        );
+    }
+}
+
+class WithMapRequestToNonNullableAttributeWithoutDefaultValueController
+{
+    public function __invoke(Request $request, #[MapRequestPayload] RequestBody $body): Response
+    {
+        if ('json' === $request->getPreferredFormat('json')) {
             return new JsonResponse(['comment' => $body->comment, 'approved' => $body->approved]);
         }
 
diff --git a/Tests/Functional/AutowiringTypesTest.php b/Tests/Functional/AutowiringTypesTest.php
index 95f99ef2c..28ce69f93 100644
--- a/Tests/Functional/AutowiringTypesTest.php
+++ b/Tests/Functional/AutowiringTypesTest.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\PsrCachedReader;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher;
@@ -21,34 +18,6 @@
 
 class AutowiringTypesTest extends AbstractWebTestCase
 {
-    use ExpectDeprecationTrait;
-
-    /**
-     * @group legacy
-     */
-    public function testAnnotationReaderAutowiring()
-    {
-        $this->expectDeprecation('Since symfony/framework-bundle 6.4: Enabling the integration of Doctrine annotations is deprecated. Set the "framework.annotations.enabled" config option to false.');
-
-        static::bootKernel(['root_config' => 'no_annotations_cache.yml', 'environment' => 'no_annotations_cache']);
-
-        $annotationReader = self::getContainer()->get('test.autowiring_types.autowired_services')->getAnnotationReader();
-        $this->assertInstanceOf(AnnotationReader::class, $annotationReader);
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testCachedAnnotationReaderAutowiring()
-    {
-        $this->expectDeprecation('Since symfony/framework-bundle 6.4: Enabling the integration of Doctrine annotations is deprecated. Set the "framework.annotations.enabled" config option to false.');
-
-        static::bootKernel(['root_config' => 'with_annotations.yml', 'environment' => 'with_annotations']);
-
-        $annotationReader = self::getContainer()->get('test.autowiring_types.autowired_services')->getAnnotationReader();
-        $this->assertInstanceOf(PsrCachedReader::class, $annotationReader);
-    }
-
     public function testEventDispatcherAutowiring()
     {
         static::bootKernel(['debug' => false]);
diff --git a/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php b/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php
index 6818032b8..c5a5decce 100644
--- a/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php
+++ b/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php
@@ -11,26 +11,15 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\AutowiringTypes;
 
-use Doctrine\Common\Annotations\Reader;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 class AutowiredServices
 {
-    private ?Reader $annotationReader;
-    private EventDispatcherInterface $dispatcher;
-    private CacheItemPoolInterface $cachePool;
-
-    public function __construct(?Reader $annotationReader, EventDispatcherInterface $dispatcher, CacheItemPoolInterface $cachePool)
-    {
-        $this->annotationReader = $annotationReader;
-        $this->dispatcher = $dispatcher;
-        $this->cachePool = $cachePool;
-    }
-
-    public function getAnnotationReader()
-    {
-        return $this->annotationReader;
+    public function __construct(
+        private readonly EventDispatcherInterface $dispatcher,
+        private readonly CacheItemPoolInterface $cachePool,
+    ) {
     }
 
     public function getDispatcher()
diff --git a/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php b/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
index b0d303128..989684bee 100644
--- a/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
+++ b/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
@@ -35,13 +35,13 @@ public function welcomeAction(Request $request, $name = null)
             // remember name
             $session->set('name', $name);
 
-            return new Response(sprintf('<html><body>Hello %s, nice to meet you.</body></html>', $name));
+            return new Response(\sprintf('<html><body>Hello %s, nice to meet you.</body></html>', $name));
         }
 
         // existing session
         $name = $session->get('name');
 
-        return new Response(sprintf('<html><body>Welcome back %s, nice to meet you.</body></html>', $name));
+        return new Response(\sprintf('<html><body>Welcome back %s, nice to meet you.</body></html>', $name));
     }
 
     public function cacheableAction()
diff --git a/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php b/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php
deleted file mode 100644
index 9e61c5ae7..000000000
--- a/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-class AnnotationReaderPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container): void
-    {
-        // simulate using "annotation_reader" in a compiler pass
-        $container->get('test.annotation_reader');
-    }
-}
diff --git a/Tests/Functional/Bundle/TestBundle/TestBundle.php b/Tests/Functional/Bundle/TestBundle/TestBundle.php
index d0c6588b0..73cb63d1f 100644
--- a/Tests/Functional/Bundle/TestBundle/TestBundle.php
+++ b/Tests/Functional/Bundle/TestBundle/TestBundle.php
@@ -24,7 +24,7 @@ public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 
-        /** @var $extension DependencyInjection\TestExtension */
+        /** @var DependencyInjection\TestExtension $extension */
         $extension = $container->getExtension('test');
 
         if (!$container->getParameterBag() instanceof FrozenParameterBag) {
diff --git a/Tests/Functional/BundlePathsTest.php b/Tests/Functional/BundlePathsTest.php
index a079837c9..a06803434 100644
--- a/Tests/Functional/BundlePathsTest.php
+++ b/Tests/Functional/BundlePathsTest.php
@@ -23,9 +23,10 @@ class BundlePathsTest extends AbstractWebTestCase
     public function testBundlePublicDir()
     {
         $kernel = static::bootKernel(['test_case' => 'BundlePaths']);
-        $projectDir = sys_get_temp_dir().'/'.uniqid('sf_bundle_paths', true);
+        $projectDir = tempnam(sys_get_temp_dir(), 'sf_bundle_paths_');
 
         $fs = new Filesystem();
+        $fs->remove($projectDir);
         $fs->mkdir($projectDir.'/public');
         $command = (new Application($kernel))->add(new AssetsInstallCommand($fs, $projectDir));
         $exitCode = (new CommandTester($command))->execute(['target' => $projectDir.'/public']);
diff --git a/Tests/Functional/CacheAttributeListenerTest.php b/Tests/Functional/CacheAttributeListenerTest.php
index 72b2c1226..e6eb93eba 100644
--- a/Tests/Functional/CacheAttributeListenerTest.php
+++ b/Tests/Functional/CacheAttributeListenerTest.php
@@ -25,7 +25,7 @@ public function testAnonimousUserWithEtag()
     {
         $client = self::createClient(['test_case' => 'CacheAttributeListener']);
 
-        $client->request('GET', '/', server: ['HTTP_IF_NONE_MATCH' => sprintf('"%s"', hash('sha256', '12345'))]);
+        $client->request('GET', '/', server: ['HTTP_IF_NONE_MATCH' => \sprintf('"%s"', hash('sha256', '12345'))]);
 
         self::assertTrue($client->getResponse()->isRedirect('http://localhost/login'));
     }
@@ -44,7 +44,7 @@ public function testLoggedInUserWithEtag()
         $client = self::createClient(['test_case' => 'CacheAttributeListener']);
 
         $client->loginUser(new InMemoryUser('the-username', 'the-password', ['ROLE_USER']));
-        $client->request('GET', '/', server: ['HTTP_IF_NONE_MATCH' => sprintf('"%s"', hash('sha256', '12345'))]);
+        $client->request('GET', '/', server: ['HTTP_IF_NONE_MATCH' => \sprintf('"%s"', hash('sha256', '12345'))]);
 
         $response = $client->getResponse();
 
diff --git a/Tests/Functional/ConfigDebugCommandTest.php b/Tests/Functional/ConfigDebugCommandTest.php
index c9bfba234..bd1539636 100644
--- a/Tests/Functional/ConfigDebugCommandTest.php
+++ b/Tests/Functional/ConfigDebugCommandTest.php
@@ -155,7 +155,7 @@ public function testDefaultParameterValueIsResolvedIfConfigIsExisting(bool $debu
 
         $this->assertSame(0, $ret, 'Returns 0 in case of success');
         $kernelCacheDir = self::$kernel->getContainer()->getParameter('kernel.cache_dir');
-        $this->assertStringContainsString(sprintf("dsn: 'file:%s/profiler'", $kernelCacheDir), $tester->getDisplay());
+        $this->assertStringContainsString(\sprintf("dsn: 'file:%s/profiler'", $kernelCacheDir), $tester->getDisplay());
     }
 
     /**
diff --git a/Tests/Functional/ContainerDebugCommandTest.php b/Tests/Functional/ContainerDebugCommandTest.php
index 24c6faf33..5067a880d 100644
--- a/Tests/Functional/ContainerDebugCommandTest.php
+++ b/Tests/Functional/ContainerDebugCommandTest.php
@@ -209,7 +209,7 @@ public function testDescribeEnvVar()
     public function testGetDeprecation()
     {
         static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml', 'debug' => true]);
-        $path = sprintf('%s/%sDeprecations.log', static::$kernel->getContainer()->getParameter('kernel.build_dir'), static::$kernel->getContainer()->getParameter('kernel.container_class'));
+        $path = \sprintf('%s/%sDeprecations.log', static::$kernel->getContainer()->getParameter('kernel.build_dir'), static::$kernel->getContainer()->getParameter('kernel.container_class'));
         touch($path);
         file_put_contents($path, serialize([[
             'type' => 16384,
@@ -239,7 +239,7 @@ public function testGetDeprecation()
     public function testGetDeprecationNone()
     {
         static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml', 'debug' => true]);
-        $path = sprintf('%s/%sDeprecations.log', static::$kernel->getContainer()->getParameter('kernel.build_dir'), static::$kernel->getContainer()->getParameter('kernel.container_class'));
+        $path = \sprintf('%s/%sDeprecations.log', static::$kernel->getContainer()->getParameter('kernel.build_dir'), static::$kernel->getContainer()->getParameter('kernel.container_class'));
         touch($path);
         file_put_contents($path, serialize([]));
 
@@ -258,7 +258,7 @@ public function testGetDeprecationNone()
     public function testGetDeprecationNoFile()
     {
         static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml', 'debug' => true]);
-        $path = sprintf('%s/%sDeprecations.log', static::$kernel->getContainer()->getParameter('kernel.build_dir'), static::$kernel->getContainer()->getParameter('kernel.container_class'));
+        $path = \sprintf('%s/%sDeprecations.log', static::$kernel->getContainer()->getParameter('kernel.build_dir'), static::$kernel->getContainer()->getParameter('kernel.container_class'));
         @unlink($path);
 
         $application = new Application(static::$kernel);
diff --git a/Tests/Functional/PropertyInfoTest.php b/Tests/Functional/PropertyInfoTest.php
index c61955d37..18cd61b08 100644
--- a/Tests/Functional/PropertyInfoTest.php
+++ b/Tests/Functional/PropertyInfoTest.php
@@ -11,7 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-use Symfony\Component\PropertyInfo\Type;
+use Symfony\Component\PropertyInfo\Type as LegacyType;
+use Symfony\Component\TypeInfo\Type;
 
 class PropertyInfoTest extends AbstractWebTestCase
 {
@@ -19,7 +20,29 @@ public function testPhpDocPriority()
     {
         static::bootKernel(['test_case' => 'Serializer']);
 
-        $this->assertEquals([new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_INT))], static::getContainer()->get('property_info')->getTypes('Symfony\Bundle\FrameworkBundle\Tests\Functional\Dummy', 'codes'));
+        $propertyInfo = static::getContainer()->get('property_info');
+
+        if (!method_exists($propertyInfo, 'getType')) {
+            $this->markTestSkipped();
+        }
+
+        $this->assertEquals(Type::list(Type::int()), $propertyInfo->getType(Dummy::class, 'codes'));
+    }
+
+    /**
+     * @group legacy
+     */
+    public function testPhpDocPriorityLegacy()
+    {
+        static::bootKernel(['test_case' => 'Serializer']);
+
+        $propertyInfo = static::getContainer()->get('property_info');
+
+        if (!method_exists($propertyInfo, 'getTypes')) {
+            $this->markTestSkipped();
+        }
+
+        $this->assertEquals([new LegacyType('array', false, null, true, new LegacyType('int'), new LegacyType('int'))], $propertyInfo->getTypes(Dummy::class, 'codes'));
     }
 }
 
diff --git a/Tests/Functional/Psr4RoutingTest.php b/Tests/Functional/Psr4RoutingTest.php
index 811a99a11..6104a52ce 100644
--- a/Tests/Functional/Psr4RoutingTest.php
+++ b/Tests/Functional/Psr4RoutingTest.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
-/**
- * @requires function Symfony\Component\Routing\Loader\Psr4DirectoryLoader::__construct
- */
 final class Psr4RoutingTest extends AbstractAttributeRoutingTestCase
 {
     protected function getTestCaseApp(): string
diff --git a/Tests/Functional/TypeInfoTest.php b/Tests/Functional/TypeInfoTest.php
new file mode 100644
index 000000000..6acdb9c81
--- /dev/null
+++ b/Tests/Functional/TypeInfoTest.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
+
+use PHPStan\PhpDocParser\Parser\PhpDocParser;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\app\TypeInfo\Dummy;
+use Symfony\Component\TypeInfo\Type;
+
+class TypeInfoTest extends AbstractWebTestCase
+{
+    public function testComponent()
+    {
+        static::bootKernel(['test_case' => 'TypeInfo']);
+
+        $this->assertEquals(Type::string(), static::getContainer()->get('type_info.resolver')->resolve(new \ReflectionProperty(Dummy::class, 'name')));
+
+        if (!class_exists(PhpDocParser::class)) {
+            $this->markTestSkipped('"phpstan/phpdoc-parser" dependency is required.');
+        }
+
+        $this->assertEquals(Type::int(), static::getContainer()->get('type_info.resolver')->resolve('int'));
+    }
+}
diff --git a/Tests/Functional/UidTest.php b/Tests/Functional/UidTest.php
index da0b1e4fc..245cb11b6 100644
--- a/Tests/Functional/UidTest.php
+++ b/Tests/Functional/UidTest.php
@@ -20,8 +20,6 @@ class UidTest extends AbstractWebTestCase
 {
     protected function setUp(): void
     {
-        parent::setUp();
-
         self::deleteTmpDir();
     }
 
diff --git a/Tests/Functional/app/ApiAttributesTest/routing.yml b/Tests/Functional/app/ApiAttributesTest/routing.yml
index 9ec40e170..a2827eb3d 100644
--- a/Tests/Functional/app/ApiAttributesTest/routing.yml
+++ b/Tests/Functional/app/ApiAttributesTest/routing.yml
@@ -1,7 +1,23 @@
-map_query_string:
-    path: /map-query-string.{_format}
-    controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithMapQueryStringController
+map_query_string_to_nullable_attribute:
+    path: /map-query-string-to-nullable-attribute.{_format}
+    controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithMapQueryStringToNullableAttributeController
 
-map_request_body:
-    path: /map-request-body.{_format}
-    controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithMapRequestPayloadController
+map_query_string_to_attribute_with_default_value:
+    path: /map-query-string-to-attribute-with-default-value.{_format}
+    controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithMapQueryStringToAttributeWithDefaultValueController
+
+map_query_string_to_non_nullable_attribute_without_default_value:
+    path: /map-query-string-to-non-nullable-attribute-without-default-value.{_format}
+    controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithMapQueryStringToNonNullableAttributeWithoutDefaultValueController
+
+map_request_to_nullable_attribute:
+    path: /map-request-to-nullable-attribute.{_format}
+    controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithMapRequestToNullableAttributeController
+
+map_request_to_attribute_with_default_value:
+    path: /map-request-to-attribute-with-default-value.{_format}
+    controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithMapRequestToAttributeWithDefaultValueController
+
+map_request_to_non_nullable_attribute_without_default_value:
+    path: /map-request-to-non-nullable-attribute-without-default-value.{_format}
+    controller: Symfony\Bundle\FrameworkBundle\Tests\Functional\WithMapRequestToNonNullableAttributeWithoutDefaultValueController
diff --git a/Tests/Functional/app/AppKernel.php b/Tests/Functional/app/AppKernel.php
index 2fdbaea0f..59c28b2a6 100644
--- a/Tests/Functional/app/AppKernel.php
+++ b/Tests/Functional/app/AppKernel.php
@@ -35,14 +35,14 @@ class AppKernel extends Kernel implements ExtensionInterface, ConfigurationInter
     public function __construct($varDir, $testCase, $rootConfig, $environment, $debug)
     {
         if (!is_dir(__DIR__.'/'.$testCase)) {
-            throw new \InvalidArgumentException(sprintf('The test case "%s" does not exist.', $testCase));
+            throw new \InvalidArgumentException(\sprintf('The test case "%s" does not exist.', $testCase));
         }
         $this->varDir = $varDir;
         $this->testCase = $testCase;
 
         $fs = new Filesystem();
         if (!$fs->isAbsolutePath($rootConfig) && !file_exists($rootConfig = __DIR__.'/'.$testCase.'/'.$rootConfig)) {
-            throw new \InvalidArgumentException(sprintf('The root config "%s" does not exist.', $rootConfig));
+            throw new \InvalidArgumentException(\sprintf('The root config "%s" does not exist.', $rootConfig));
         }
         $this->rootConfig = $rootConfig;
 
@@ -57,7 +57,7 @@ protected function getContainerClass(): string
     public function registerBundles(): iterable
     {
         if (!file_exists($filename = $this->getProjectDir().'/'.$this->testCase.'/bundles.php')) {
-            throw new \RuntimeException(sprintf('The bundles file "%s" does not exist.', $filename));
+            throw new \RuntimeException(\sprintf('The bundles file "%s" does not exist.', $filename));
         }
 
         return include $filename;
diff --git a/Tests/Functional/app/AutowiringTypes/no_annotations_cache.yml b/Tests/Functional/app/AutowiringTypes/no_annotations_cache.yml
deleted file mode 100644
index fa78d7200..000000000
--- a/Tests/Functional/app/AutowiringTypes/no_annotations_cache.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-imports:
-    - { resource: config.yml }
-
-framework:
-    http_method_override: false
-    annotations:
-        enabled: true
-        cache: none
diff --git a/Tests/Functional/app/AutowiringTypes/with_annotations.yml b/Tests/Functional/app/AutowiringTypes/with_annotations.yml
deleted file mode 100644
index cb87d7f4e..000000000
--- a/Tests/Functional/app/AutowiringTypes/with_annotations.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-imports:
-    - { resource: config.yml }
-
-framework:
-    annotations:
-        enabled: true
diff --git a/Tests/Functional/app/TypeInfo/Dummy.php b/Tests/Functional/app/TypeInfo/Dummy.php
new file mode 100644
index 000000000..0f517df51
--- /dev/null
+++ b/Tests/Functional/app/TypeInfo/Dummy.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\app\TypeInfo;
+
+/**
+ * @author Mathias Arlaud <mathias.arlaud@gmail.com>
+ * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ */
+class Dummy
+{
+    public string $name;
+}
diff --git a/Tests/Functional/app/TypeInfo/bundles.php b/Tests/Functional/app/TypeInfo/bundles.php
new file mode 100644
index 000000000..15ff182c6
--- /dev/null
+++ b/Tests/Functional/app/TypeInfo/bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];
diff --git a/Tests/Functional/app/TypeInfo/config.yml b/Tests/Functional/app/TypeInfo/config.yml
new file mode 100644
index 000000000..35c7bb4c4
--- /dev/null
+++ b/Tests/Functional/app/TypeInfo/config.yml
@@ -0,0 +1,11 @@
+imports:
+    - { resource: ../config/default.yml }
+
+framework:
+    http_method_override: false
+    type_info: true
+
+services:
+    type_info.resolver.alias:
+        alias: type_info.resolver
+        public: true
diff --git a/Tests/Kernel/ConcreteMicroKernel.php b/Tests/Kernel/ConcreteMicroKernel.php
index fc5149699..a69618099 100644
--- a/Tests/Kernel/ConcreteMicroKernel.php
+++ b/Tests/Kernel/ConcreteMicroKernel.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Kernel;
 
 use Psr\Log\NullLogger;
-use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -46,13 +45,6 @@ public function dangerousAction()
         throw new Danger();
     }
 
-    public function registerBundles(): iterable
-    {
-        return [
-            new FrameworkBundle(),
-        ];
-    }
-
     public function getCacheDir(): string
     {
         return $this->cacheDir = sys_get_temp_dir().'/sf_micro_kernel';
diff --git a/Tests/Kernel/MicroKernelTraitTest.php b/Tests/Kernel/MicroKernelTraitTest.php
index 792acf5ef..a9d2ae720 100644
--- a/Tests/Kernel/MicroKernelTraitTest.php
+++ b/Tests/Kernel/MicroKernelTraitTest.php
@@ -13,7 +13,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
-use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
@@ -26,6 +25,7 @@
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
+require_once __DIR__.'/default/src/DefaultKernel.php';
 require_once __DIR__.'/flex-style/src/FlexStyleMicroKernel.php';
 
 class MicroKernelTraitTest extends TestCase
@@ -140,6 +140,30 @@ protected function configureRoutes(RoutingConfigurator $routes): void
 
         $this->assertSame('Hello World!', $response->getContent());
     }
+
+    public function testSimpleKernel()
+    {
+        $kernel = $this->kernel = new SimpleKernel('simple_kernel');
+        $kernel->boot();
+
+        $request = Request::create('/');
+        $response = $kernel->handle($request, HttpKernelInterface::MAIN_REQUEST, false);
+
+        $this->assertSame('Hello World!', $response->getContent());
+    }
+
+    public function testDefaultKernel()
+    {
+        $kernel = $this->kernel = new DefaultKernel('test', false);
+        $kernel->boot();
+
+        $this->assertTrue($kernel->getContainer()->has('foo_service'));
+
+        $request = Request::create('/');
+        $response = $kernel->handle($request, HttpKernelInterface::MAIN_REQUEST, false);
+
+        $this->assertSame('OK', $response->getContent());
+    }
 }
 
 abstract class MinimalKernel extends Kernel
@@ -155,11 +179,6 @@ public function __construct(string $cacheDir)
         $this->cacheDir = sys_get_temp_dir().'/'.$cacheDir;
     }
 
-    public function registerBundles(): iterable
-    {
-        yield new FrameworkBundle();
-    }
-
     public function getCacheDir(): string
     {
         return $this->cacheDir;
diff --git a/Tests/Kernel/SimpleKernel.php b/Tests/Kernel/SimpleKernel.php
new file mode 100644
index 000000000..f586e2dc5
--- /dev/null
+++ b/Tests/Kernel/SimpleKernel.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Kernel;
+
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+final class SimpleKernel extends MinimalKernel
+{
+    #[Route('/')]
+    public function __invoke(UrlGeneratorInterface $urlGenerator): Response
+    {
+        return new Response('Hello World!');
+    }
+}
diff --git a/Tests/Kernel/default/config/bundles.php b/Tests/Kernel/default/config/bundles.php
new file mode 100644
index 000000000..fbde1ef1c
--- /dev/null
+++ b/Tests/Kernel/default/config/bundles.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+
+return [
+    FrameworkBundle::class => ['all' => true],
+];
diff --git a/Tests/Kernel/default/config/routes.yaml b/Tests/Kernel/default/config/routes.yaml
new file mode 100644
index 000000000..5653fe0b9
--- /dev/null
+++ b/Tests/Kernel/default/config/routes.yaml
@@ -0,0 +1,3 @@
+welcome:
+    path: /
+    controller: 'kernel'
diff --git a/Tests/Kernel/default/config/services.yaml b/Tests/Kernel/default/config/services.yaml
new file mode 100644
index 000000000..fa0d7df8e
--- /dev/null
+++ b/Tests/Kernel/default/config/services.yaml
@@ -0,0 +1,4 @@
+services:
+    foo_service:
+        class: stdClass
+        public: true
diff --git a/Tests/Kernel/default/src/DefaultKernel.php b/Tests/Kernel/default/src/DefaultKernel.php
new file mode 100644
index 000000000..93d120793
--- /dev/null
+++ b/Tests/Kernel/default/src/DefaultKernel.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Kernel;
+
+use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Kernel;
+
+class DefaultKernel extends Kernel
+{
+    use MicroKernelTrait;
+
+    public function __invoke(): Response
+    {
+        return new Response('OK');
+    }
+
+    private string $cacheDir;
+
+    public function getCacheDir(): string
+    {
+        return $this->cacheDir ??= sys_get_temp_dir().'/sf_default_kernel';
+    }
+
+    public function getLogDir(): string
+    {
+        return $this->cacheDir;
+    }
+
+    public function getProjectDir(): string
+    {
+        return \dirname(__DIR__);
+    }
+}
diff --git a/Tests/KernelBrowserTest.php b/Tests/KernelBrowserTest.php
index 1e462f7d0..4e62b5ee7 100644
--- a/Tests/KernelBrowserTest.php
+++ b/Tests/KernelBrowserTest.php
@@ -14,6 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Tests\Functional\AbstractWebTestCase;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\KernelInterface;
 
 class KernelBrowserTest extends AbstractWebTestCase
 {
@@ -61,6 +62,13 @@ public function testRequestAfterKernelShutdownAndPerformedRequest()
         $client->request('GET', '/');
     }
 
+    public function testGetProfileWithoutRequest()
+    {
+        $browser = new KernelBrowser($this->createMock(KernelInterface::class));
+
+        $this->assertFalse($browser->getProfile());
+    }
+
     private function getKernelMock()
     {
         $mock = $this->getMockBuilder($this->getKernelClass())
diff --git a/Tests/Routing/RedirectableCompiledUrlMatcherTest.php b/Tests/Routing/RedirectableCompiledUrlMatcherTest.php
index 29126e130..9a96313d0 100644
--- a/Tests/Routing/RedirectableCompiledUrlMatcherTest.php
+++ b/Tests/Routing/RedirectableCompiledUrlMatcherTest.php
@@ -27,7 +27,8 @@ public function testRedirectWhenNoSlash()
 
         $matcher = $this->getMatcher($routes, $context = new RequestContext());
 
-        $this->assertEquals([
+        $this->assertEquals(
+            [
                 '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction',
                 'path' => '/foo/',
                 'permanent' => true,
@@ -47,7 +48,8 @@ public function testSchemeRedirect()
 
         $matcher = $this->getMatcher($routes, $context = new RequestContext());
 
-        $this->assertEquals([
+        $this->assertEquals(
+            [
                 '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction',
                 'path' => '/foo',
                 'permanent' => true,
diff --git a/Tests/Routing/RouterTest.php b/Tests/Routing/RouterTest.php
index 3e185b54c..d2c021563 100644
--- a/Tests/Routing/RouterTest.php
+++ b/Tests/Routing/RouterTest.php
@@ -23,6 +23,8 @@
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\ContainerBag;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\Routing\Loader\YamlFileLoader;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
@@ -406,7 +408,8 @@ public function testExceptionOnNonStringParameter()
         $routes->add('foo', new Route('/%object%'));
 
         $sc = $this->getPsr11ServiceContainer($routes);
-        $parameters = $this->getParameterBag(['object' => new \stdClass()]);
+        $parameters = new Container();
+        $parameters->set('object', new \stdClass());
 
         $router = new Router($sc, 'foo', [], null, $parameters);
 
@@ -424,19 +427,15 @@ public function testExceptionOnNonStringParameterWithSfContainer()
 
         $sc = $this->getServiceContainer($routes);
 
-        $pc = $this->createMock(ContainerInterface::class);
-        $pc
-            ->expects($this->once())
-            ->method('get')
-            ->willReturn(new \stdClass())
-        ;
+        $pc = new Container();
+        $pc->set('object', new \stdClass());
 
         $router = new Router($sc, 'foo', [], null, $pc);
 
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('The container parameter "object", used in the route configuration value "/%object%", must be a string or numeric, but it is of type "stdClass".');
 
-        $router->getRouteCollection()->get('foo');
+        $router->getRouteCollection();
     }
 
     /**
@@ -483,7 +482,9 @@ public function testGetRouteCollectionAddsContainerParametersResource()
 
         $router = new Router($sc, 'foo', [], null, $parameters);
 
-        $router->getRouteCollection();
+        $routeCollection = $router->getRouteCollection();
+
+        $this->assertEquals([new ContainerParametersResource(['locale' => 'en'])], $routeCollection->getResources());
     }
 
     public function testGetRouteCollectionAddsContainerParametersResourceWithSfContainer()
@@ -529,7 +530,9 @@ public static function getNonStringValues()
      */
     public function testCacheValidityWithContainerParameters($parameter)
     {
-        $cacheDir = sys_get_temp_dir().\DIRECTORY_SEPARATOR.uniqid('router_', true);
+        $cacheDir = tempnam(sys_get_temp_dir(), 'sf_router_');
+        unlink($cacheDir);
+        mkdir($cacheDir);
 
         try {
             $container = new Container();
@@ -617,13 +620,8 @@ private function getServiceContainer(RouteCollection $routes): Container
             ->willReturn($routes)
         ;
 
-        $sc = $this->getMockBuilder(Container::class)->onlyMethods(['get'])->getMock();
-
-        $sc
-            ->expects($this->once())
-            ->method('get')
-            ->willReturn($loader)
-        ;
+        $sc = new Container();
+        $sc->set('routing.loader', $loader);
 
         return $sc;
     }
@@ -638,26 +636,14 @@ private function getPsr11ServiceContainer(RouteCollection $routes): ContainerInt
             ->willReturn($routes)
         ;
 
-        $sc = $this->createMock(ContainerInterface::class);
-
-        $sc
-            ->expects($this->once())
-            ->method('get')
-            ->willReturn($loader)
-        ;
+        $container = new Container();
+        $container->set('routing.loader', $loader);
 
-        return $sc;
+        return $container;
     }
 
     private function getParameterBag(array $params = []): ContainerInterface
     {
-        $bag = $this->createMock(ContainerInterface::class);
-        $bag
-            ->expects($this->any())
-            ->method('get')
-            ->willReturnCallback(fn ($key) => $params[$key] ?? null)
-        ;
-
-        return $bag;
+        return new ContainerBag(new Container(new ParameterBag($params)));
     }
 }
diff --git a/Tests/Secrets/SodiumVaultTest.php b/Tests/Secrets/SodiumVaultTest.php
index 603d13504..f91f4bced 100644
--- a/Tests/Secrets/SodiumVaultTest.php
+++ b/Tests/Secrets/SodiumVaultTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault;
 use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Component\String\LazyString;
 
 /**
  * @requires extension sodium
@@ -21,16 +22,18 @@
 class SodiumVaultTest extends TestCase
 {
     private string $secretsDir;
+    private Filesystem $filesystem;
 
     protected function setUp(): void
     {
+        $this->filesystem = new Filesystem();
         $this->secretsDir = sys_get_temp_dir().'/sf_secrets/test/';
-        (new Filesystem())->remove($this->secretsDir);
+        $this->filesystem->remove($this->secretsDir);
     }
 
     protected function tearDown(): void
     {
-        (new Filesystem())->remove($this->secretsDir);
+        $this->filesystem->remove($this->secretsDir);
     }
 
     public function testGenerateKeys()
@@ -41,8 +44,8 @@ public function testGenerateKeys()
         $this->assertFileExists($this->secretsDir.'/test.encrypt.public.php');
         $this->assertFileExists($this->secretsDir.'/test.decrypt.private.php');
 
-        $encKey = file_get_contents($this->secretsDir.'/test.encrypt.public.php');
-        $decKey = file_get_contents($this->secretsDir.'/test.decrypt.private.php');
+        $encKey = $this->filesystem->readFile($this->secretsDir.'/test.encrypt.public.php');
+        $decKey = $this->filesystem->readFile($this->secretsDir.'/test.decrypt.private.php');
 
         $this->assertFalse($vault->generateKeys());
         $this->assertStringEqualsFile($this->secretsDir.'/test.encrypt.public.php', $encKey);
@@ -73,4 +76,26 @@ public function testEncryptAndDecrypt()
 
         $this->assertSame([], $vault->list());
     }
+
+    public function testDerivedSecretEnvVar()
+    {
+        $vault = new SodiumVault($this->secretsDir, null, 'MY_SECRET');
+        $vault->generateKeys();
+        $vault->seal('FOO', 'bar');
+
+        $this->assertSame(['FOO', 'MY_SECRET'], array_keys($vault->loadEnvVars()));
+    }
+
+    public function testEmptySecretEnvVar()
+    {
+        $vault = new SodiumVault($this->secretsDir, '', 'MY_SECRET');
+        $envVars = $vault->loadEnvVars();
+        $envVars['MY_SECRET'] = (string) $envVars['MY_SECRET'];
+        $this->assertSame(['MY_SECRET' => ''], $envVars);
+
+        $vault = new SodiumVault($this->secretsDir, LazyString::fromCallable(fn () => ''), 'MY_SECRET');
+        $envVars = $vault->loadEnvVars();
+        $envVars['MY_SECRET'] = (string) $envVars['MY_SECRET'];
+        $this->assertSame(['MY_SECRET' => ''], $envVars);
+    }
 }
diff --git a/Tests/Test/WebTestCaseTest.php b/Tests/Test/WebTestCaseTest.php
index 19a4b2b03..84f2ef0ef 100644
--- a/Tests/Test/WebTestCaseTest.php
+++ b/Tests/Test/WebTestCaseTest.php
@@ -23,7 +23,6 @@
 use Symfony\Component\HttpFoundation\Cookie as HttpFoundationCookie;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Test\Constraint\ResponseHeaderLocationSame;
 
 class WebTestCaseTest extends TestCase
 {
@@ -62,10 +61,6 @@ public function testAssertResponseRedirectsWithLocation()
 
     public function testAssertResponseRedirectsWithLocationWithoutHost()
     {
-        if (!class_exists(ResponseHeaderLocationSame::class)) {
-            $this->markTestSkipped('Requires symfony/http-foundation 6.3 or higher.');
-        }
-
         $this->getResponseTester(new Response('', 301, ['Location' => 'https://example.com/']))->assertResponseRedirects('/');
         $this->expectException(AssertionFailedError::class);
         $this->expectExceptionMessage('is redirected and has header "Location" matching "/".');
@@ -74,10 +69,6 @@ public function testAssertResponseRedirectsWithLocationWithoutHost()
 
     public function testAssertResponseRedirectsWithLocationWithoutScheme()
     {
-        if (!class_exists(ResponseHeaderLocationSame::class)) {
-            $this->markTestSkipped('Requires symfony/http-foundation 6.3 or higher.');
-        }
-
         $this->getResponseTester(new Response('', 301, ['Location' => 'https://example.com/']))->assertResponseRedirects('//example.com/');
         $this->expectException(AssertionFailedError::class);
         $this->expectExceptionMessage('is redirected and has header "Location" matching "//example.com/".');
diff --git a/Tests/Translation/TranslatorTest.php b/Tests/Translation/TranslatorTest.php
index c31119ad3..e481a965e 100644
--- a/Tests/Translation/TranslatorTest.php
+++ b/Tests/Translation/TranslatorTest.php
@@ -15,7 +15,7 @@
 use Symfony\Bundle\FrameworkBundle\Translation\Translator;
 use Symfony\Component\Config\Resource\DirectoryResource;
 use Symfony\Component\Config\Resource\FileExistenceResource;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Translation\Exception\InvalidArgumentException;
 use Symfony\Component\Translation\Formatter\MessageFormatter;
@@ -100,16 +100,6 @@ public function testTransWithCaching()
         $this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
     }
 
-    public function testTransWithCachingWithInvalidLocale()
-    {
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Invalid "invalid locale" locale.');
-        $loader = $this->createMock(LoaderInterface::class);
-        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir], 'loader', TranslatorWithInvalidLocale::class);
-
-        $translator->trans('foo');
-    }
-
     public function testLoadResourcesWithoutCaching()
     {
         $loader = new YamlFileLoader();
@@ -127,8 +117,7 @@ public function testLoadResourcesWithoutCaching()
 
     public function testGetDefaultLocale()
     {
-        $container = $this->createMock(\Psr\Container\ContainerInterface::class);
-        $translator = new Translator($container, new MessageFormatter(), 'en');
+        $translator = new Translator(new Container(), new MessageFormatter(), 'en');
 
         $this->assertSame('en', $translator->getLocale());
     }
@@ -137,9 +126,8 @@ public function testInvalidOptions()
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('The Translator does not support the following options: \'foo\'');
-        $container = $this->createMock(ContainerInterface::class);
 
-        new Translator($container, new MessageFormatter(), 'en', [], ['foo' => 'bar']);
+        new Translator(new Container(), new MessageFormatter(), 'en', [], ['foo' => 'bar']);
     }
 
     /** @dataProvider getDebugModeAndCacheDirCombinations */
@@ -304,12 +292,9 @@ protected function getLoader()
 
     protected function getContainer($loader)
     {
-        $container = $this->createMock(ContainerInterface::class);
-        $container
-            ->expects($this->any())
-            ->method('get')
-            ->willReturn($loader)
-        ;
+        $container = new Container();
+        $container->set('loader', $loader);
+        $container->set('yml', $loader);
 
         return $container;
     }
@@ -418,11 +403,3 @@ private function createTranslator($loader, $options, $translatorClass = Translat
         );
     }
 }
-
-class TranslatorWithInvalidLocale extends Translator
-{
-    public function getLocale(): string
-    {
-        return 'invalid locale';
-    }
-}
diff --git a/Translation/Translator.php b/Translation/Translator.php
index 9b0778a57..84aa0c7fd 100644
--- a/Translation/Translator.php
+++ b/Translation/Translator.php
@@ -21,13 +21,12 @@
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @final since Symfony 7.1
  */
 class Translator extends BaseTranslator implements WarmableInterface
 {
-    protected $container;
-    protected $loaderIds;
-
-    protected $options = [
+    protected array $options = [
         'cache_dir' => null,
         'debug' => false,
         'resource_files' => [],
@@ -58,11 +57,6 @@ class Translator extends BaseTranslator implements WarmableInterface
      */
     private array $scannedDirectories;
 
-    /**
-     * @var string[]
-     */
-    private array $enabledLocales;
-
     /**
      * Constructor.
      *
@@ -73,17 +67,21 @@ class Translator extends BaseTranslator implements WarmableInterface
      *   * resource_files: List of translation resources available grouped by locale.
      *   * cache_vary:     An array of data that is serialized to generate the cached catalogue name.
      *
+     * @param string[] $enabledLocales
+     *
      * @throws InvalidArgumentException
      */
-    public function __construct(ContainerInterface $container, MessageFormatterInterface $formatter, string $defaultLocale, array $loaderIds = [], array $options = [], array $enabledLocales = [])
-    {
-        $this->container = $container;
-        $this->loaderIds = $loaderIds;
-        $this->enabledLocales = $enabledLocales;
-
+    public function __construct(
+        protected ContainerInterface $container,
+        MessageFormatterInterface $formatter,
+        string $defaultLocale,
+        protected array $loaderIds = [],
+        array $options = [],
+        private array $enabledLocales = [],
+    ) {
         // check option names
         if ($diff = array_diff(array_keys($options), array_keys($this->options))) {
-            throw new InvalidArgumentException(sprintf('The Translator does not support the following options: \'%s\'.', implode('\', \'', $diff)));
+            throw new InvalidArgumentException(\sprintf('The Translator does not support the following options: \'%s\'.', implode('\', \'', $diff)));
         }
 
         $this->options = array_merge($this->options, $options);
@@ -94,10 +92,7 @@ public function __construct(ContainerInterface $container, MessageFormatterInter
         parent::__construct($defaultLocale, $formatter, $this->options['cache_dir'], $this->options['debug'], $this->options['cache_vary']);
     }
 
-    /**
-     * @param string|null $buildDir
-     */
-    public function warmUp(string $cacheDir /* , string $buildDir = null */): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         // skip warmUp when translator doesn't use cache
         if (null === $this->options['cache_dir']) {
@@ -145,10 +140,7 @@ protected function doLoadCatalogue(string $locale): void
         }
     }
 
-    /**
-     * @return void
-     */
-    protected function initialize()
+    protected function initialize(): void
     {
         if ($this->resourceFiles) {
             $this->addResourceFiles();
diff --git a/composer.json b/composer.json
index c3aab8455..6689b61b0 100644
--- a/composer.json
+++ b/composer.json
@@ -16,94 +16,95 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.2",
         "composer-runtime-api": ">=2.1",
         "ext-xml": "*",
-        "symfony/cache": "^5.4|^6.0|^7.0",
-        "symfony/config": "^6.1|^7.0",
-        "symfony/dependency-injection": "^6.4.12|^7.0",
+        "symfony/cache": "^6.4|^7.0",
+        "symfony/config": "^6.4|^7.0",
+        "symfony/dependency-injection": "^7.2",
         "symfony/deprecation-contracts": "^2.5|^3",
-        "symfony/error-handler": "^6.1|^7.0",
-        "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+        "symfony/error-handler": "^6.4|^7.0",
+        "symfony/event-dispatcher": "^6.4|^7.0",
         "symfony/http-foundation": "^6.4|^7.0",
-        "symfony/http-kernel": "^6.4",
+        "symfony/http-kernel": "^7.2",
         "symfony/polyfill-mbstring": "~1.0",
-        "symfony/filesystem": "^5.4|^6.0|^7.0",
-        "symfony/finder": "^5.4|^6.0|^7.0",
+        "symfony/filesystem": "^7.1",
+        "symfony/finder": "^6.4|^7.0",
         "symfony/routing": "^6.4|^7.0"
     },
     "require-dev": {
-        "doctrine/annotations": "^1.13.1|^2",
         "doctrine/persistence": "^1.3|^2|^3",
         "dragonmantank/cron-expression": "^3.1",
         "seld/jsonlint": "^1.10",
-        "symfony/asset": "^5.4|^6.0|^7.0",
+        "symfony/asset": "^6.4|^7.0",
         "symfony/asset-mapper": "^6.4|^7.0",
-        "symfony/browser-kit": "^5.4|^6.0|^7.0",
-        "symfony/console": "^5.4.9|^6.0.9|^7.0",
-        "symfony/clock": "^6.2|^7.0",
-        "symfony/css-selector": "^5.4|^6.0|^7.0",
+        "symfony/browser-kit": "^6.4|^7.0",
+        "symfony/console": "^6.4|^7.0",
+        "symfony/clock": "^6.4|^7.0",
+        "symfony/css-selector": "^6.4|^7.0",
         "symfony/dom-crawler": "^6.4|^7.0",
-        "symfony/dotenv": "^5.4|^6.0|^7.0",
+        "symfony/dotenv": "^6.4|^7.0",
         "symfony/polyfill-intl-icu": "~1.0",
-        "symfony/form": "^5.4|^6.0|^7.0",
-        "symfony/expression-language": "^5.4|^6.0|^7.0",
-        "symfony/html-sanitizer": "^6.1|^7.0",
-        "symfony/http-client": "^6.3|^7.0",
-        "symfony/lock": "^5.4|^6.0|^7.0",
-        "symfony/mailer": "^5.4|^6.0|^7.0",
-        "symfony/messenger": "^6.3|^7.0",
+        "symfony/form": "^6.4|^7.0",
+        "symfony/expression-language": "^6.4|^7.0",
+        "symfony/html-sanitizer": "^6.4|^7.0",
+        "symfony/http-client": "^6.4|^7.0",
+        "symfony/lock": "^6.4|^7.0",
+        "symfony/mailer": "^6.4|^7.0",
+        "symfony/messenger": "^6.4|^7.0",
         "symfony/mime": "^6.4|^7.0",
-        "symfony/notifier": "^5.4|^6.0|^7.0",
-        "symfony/process": "^5.4|^6.0|^7.0",
-        "symfony/rate-limiter": "^5.4|^6.0|^7.0",
+        "symfony/notifier": "^6.4|^7.0",
+        "symfony/process": "^6.4|^7.0",
+        "symfony/rate-limiter": "^6.4|^7.0",
         "symfony/scheduler": "^6.4.4|^7.0.4",
-        "symfony/security-bundle": "^5.4|^6.0|^7.0",
-        "symfony/semaphore": "^5.4|^6.0|^7.0",
-        "symfony/serializer": "^6.4|^7.0",
-        "symfony/stopwatch": "^5.4|^6.0|^7.0",
-        "symfony/string": "^5.4|^6.0|^7.0",
+        "symfony/security-bundle": "^6.4|^7.0",
+        "symfony/semaphore": "^6.4|^7.0",
+        "symfony/serializer": "^7.2.5",
+        "symfony/stopwatch": "^6.4|^7.0",
+        "symfony/string": "^6.4|^7.0",
         "symfony/translation": "^6.4|^7.0",
-        "symfony/twig-bundle": "^5.4|^6.0|^7.0",
+        "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/yaml": "^5.4|^6.0|^7.0",
-        "symfony/property-info": "^5.4|^6.0|^7.0",
-        "symfony/uid": "^5.4|^6.0|^7.0",
-        "symfony/web-link": "^5.4|^6.0|^7.0",
+        "symfony/yaml": "^6.4|^7.0",
+        "symfony/property-info": "^6.4|^7.0",
+        "symfony/uid": "^6.4|^7.0",
+        "symfony/web-link": "^6.4|^7.0",
+        "symfony/webhook": "^7.2",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-        "twig/twig": "^2.10|^3.0.4"
+        "twig/twig": "^3.12"
     },
     "conflict": {
-        "doctrine/annotations": "<1.13.1",
         "doctrine/persistence": "<1.3",
         "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<1.4.0",
-        "symfony/asset": "<5.4",
+        "symfony/asset": "<6.4",
         "symfony/asset-mapper": "<6.4",
-        "symfony/clock": "<6.3",
-        "symfony/console": "<5.4|>=7.0",
-        "symfony/dotenv": "<5.4",
+        "symfony/clock": "<6.4",
+        "symfony/console": "<6.4",
+        "symfony/dotenv": "<6.4",
         "symfony/dom-crawler": "<6.4",
-        "symfony/http-client": "<6.3",
-        "symfony/form": "<5.4",
-        "symfony/lock": "<5.4",
-        "symfony/mailer": "<5.4",
-        "symfony/messenger": "<6.3",
+        "symfony/http-client": "<6.4",
+        "symfony/form": "<6.4",
+        "symfony/lock": "<6.4",
+        "symfony/mailer": "<6.4",
+        "symfony/messenger": "<6.4",
         "symfony/mime": "<6.4",
-        "symfony/property-info": "<5.4",
-        "symfony/property-access": "<5.4",
-        "symfony/runtime": "<5.4.45|>=6.0,<6.4.13|>=7.0,<7.1.6",
+        "symfony/property-info": "<6.4",
+        "symfony/property-access": "<6.4",
+        "symfony/runtime": "<6.4.13|>=7.0,<7.1.6",
         "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4",
-        "symfony/serializer": "<6.4",
-        "symfony/security-csrf": "<5.4",
-        "symfony/security-core": "<5.4",
-        "symfony/stopwatch": "<5.4",
+        "symfony/security-csrf": "<7.2",
+        "symfony/security-core": "<6.4",
+        "symfony/serializer": "<7.2.5",
+        "symfony/stopwatch": "<6.4",
         "symfony/translation": "<6.4",
-        "symfony/twig-bridge": "<5.4",
-        "symfony/twig-bundle": "<5.4",
+        "symfony/twig-bridge": "<6.4",
+        "symfony/twig-bundle": "<6.4",
         "symfony/validator": "<6.4",
         "symfony/web-profiler-bundle": "<6.4",
+        "symfony/webhook": "<7.2",
         "symfony/workflow": "<6.4"
     },
     "autoload": {