Remove ClassMetadataFactoryCompiler and other legacy cleanups

nicolas-grekas · nicolas-grekas · commit 7562d85c943b · 2025-09-04T16:13:40.000+02:00
diff --git a/UPGRADE-8.0.md b/UPGRADE-8.0.md
@@ -165,6 +165,7 @@ Form
  * Made `ResizeFormListener::postSetData()` method `final`
  * Remove the `VersionAwareTest` trait, use feature detection instead
  * Remove deprecated `ResizeFormListener::preSetData()` method, use `postSetData()` instead
+ * Remove `validation.xml` in `Resources/config`, replaced by attributes on the `Form` class
 
 FrameworkBundle
 ---------------
@@ -464,7 +465,7 @@ Serializer
    +public function denormalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string;
    ```
  * Remove `AdvancedNameConverterInterface`, use `NameConverterInterface` instead
- * Remove the `CompiledClassMetadataFactory` and `CompiledClassMetadataCacheWarmer` classes
+ * Remove `ClassMetadataFactoryCompiler`, `CompiledClassMetadataFactory` and `CompiledClassMetadataCacheWarmer`
  * Remove class aliases in the `Annotation` namespace, use attributes instead
  * Remove getters in attribute classes in favor of public properties
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -43,8 +43,6 @@
 use Symfony\Component\Cache\Adapter\ChainAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 use Symfony\Component\Cache\DependencyInjection\CachePoolPass;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
-use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\FileLocator;
@@ -55,8 +53,6 @@
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\DataCollector\CommandDataCollector;
-use Symfony\Component\Console\Debug\CliRequest;
 use Symfony\Component\Console\Messenger\RunCommandMessageHandler;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Argument\ArgumentTrait;
@@ -83,7 +79,6 @@
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\Glob;
-use Symfony\Component\Form\EnumFormTypeGuesser;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormTypeExtensionInterface;
 use Symfony\Component\Form\FormTypeGuesserInterface;
@@ -106,7 +101,6 @@
 use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\HttpKernel\Log\DebugLoggerConfigurator;
-use Symfony\Component\HttpKernel\Profiler\ProfilerStateChecker;
 use Symfony\Component\JsonStreamer\Attribute\JsonStreamable;
 use Symfony\Component\JsonStreamer\JsonStreamWriter;
 use Symfony\Component\JsonStreamer\StreamReaderInterface;
@@ -123,11 +117,9 @@
 use Symfony\Component\Messenger\Attribute\AsMessage;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 use Symfony\Component\Messenger\Bridge as MessengerBridge;
-use Symfony\Component\Messenger\EventListener\ResetMemoryUsageListener;
 use Symfony\Component\Messenger\Handler\BatchHandlerInterface;
 use Symfony\Component\Messenger\MessageBus;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Messenger\Middleware\DeduplicateMiddleware;
 use Symfony\Component\Messenger\Middleware\RouterContextMiddleware;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportFactoryInterface as MessengerTransportFactoryInterface;
@@ -164,12 +156,10 @@
 use Symfony\Component\RemoteEvent\Attribute\AsRemoteEventConsumer;
 use Symfony\Component\RemoteEvent\RemoteEvent;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Routing\Loader\AttributeServicesLoader;
 use Symfony\Component\Scheduler\Attribute\AsCronTask;
 use Symfony\Component\Scheduler\Attribute\AsPeriodicTask;
 use Symfony\Component\Scheduler\Attribute\AsSchedule;
 use Symfony\Component\Scheduler\Messenger\SchedulerTransportFactory;
-use Symfony\Component\Scheduler\Messenger\Serializer\Normalizer\SchedulerTriggerNormalizer;
 use Symfony\Component\Security\Core\AuthenticationEvents;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Csrf\CsrfToken;
@@ -179,7 +169,6 @@
 use Symfony\Component\Semaphore\SemaphoreFactory;
 use Symfony\Component\Semaphore\Store\StoreFactory as SemaphoreStoreFactory;
 use Symfony\Component\Serializer\Attribute as SerializerMapping;
-use Symfony\Component\Serializer\DependencyInjection\AttributeMetadataPass as SerializerAttributeMetadataPass;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
@@ -205,9 +194,7 @@
 use Symfony\Component\Uid\UuidV4;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\ExpressionLanguageProvider;
-use Symfony\Component\Validator\Constraints\Traverse;
 use Symfony\Component\Validator\ConstraintValidatorInterface;
-use Symfony\Component\Validator\DependencyInjection\AttributeMetadataPass as ValidatorAttributeMetadataPass;
 use Symfony\Component\Validator\GroupProviderInterface;
 use Symfony\Component\Validator\Mapping\Loader\PropertyInfoLoader;
 use Symfony\Component\Validator\ObjectInitializerInterface;
@@ -676,12 +663,6 @@ public function load(array $configs, ContainerBuilder $container): void
             ->addTag('kernel.locale_aware');
         $container->registerForAutoconfiguration(ResetInterface::class)
             ->addTag('kernel.reset', ['method' => 'reset']);
-
-        if (!interface_exists(MarshallerInterface::class)) {
-            $container->registerForAutoconfiguration(ResettableInterface::class)
-                ->addTag('kernel.reset', ['method' => 'reset']);
-        }
-
         $container->registerForAutoconfiguration(PropertyListExtractorInterface::class)
             ->addTag('property_info.list_extractor');
         $container->registerForAutoconfiguration(PropertyTypeExtractorInterface::class)
@@ -843,10 +824,6 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
     {
         $loader->load('form.php');
 
-        if (!class_exists(EnumFormTypeGuesser::class)) {
-            $container->removeDefinition('form.type_guesser.enum_type');
-        }
-
         if (null === $config['form']['csrf_protection']['enabled']) {
             $this->writeConfigEnabled('form.csrf_protection', $config['csrf_protection']['enabled'], $config['form']['csrf_protection']);
         }
@@ -945,11 +922,6 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
         $loader->load('collectors.php');
         $loader->load('cache_debug.php');
 
-        if (!class_exists(ProfilerStateChecker::class)) {
-            $container->removeDefinition('profiler.state_checker');
-            $container->removeDefinition('profiler.is_disabled_state_checker');
-        }
-
         if ($this->isInitializedConfigEnabled('form')) {
             $loader->load('form_debug.php');
         }
@@ -1006,13 +978,9 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
         $container->getDefinition('profiler_listener')
             ->addArgument($config['collect_parameter']);
 
-        if (!$container->getParameter('kernel.debug') || !class_exists(CliRequest::class) || !$container->has('debug.stopwatch')) {
+        if (!$container->getParameter('kernel.debug') || !$container->has('debug.stopwatch')) {
             $container->removeDefinition('console_profiler_listener');
         }
-
-        if (!class_exists(CommandDataCollector::class)) {
-            $container->removeDefinition('.data_collector.command');
-        }
     }
 
     private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
@@ -1270,10 +1238,6 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
 
         $loader->load('routing.php');
 
-        if (!class_exists(AttributeServicesLoader::class)) {
-            $container->removeDefinition('routing.loader.attribute.services');
-        }
-
         if ($config['utf8']) {
             $container->getDefinition('routing.loader')->replaceArgument(1, ['utf8' => true]);
         }
@@ -1766,7 +1730,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
 
         // When attributes are disabled, it means from runtime-discovery only; autoconfiguration should still happen.
         // And when runtime-discovery of attributes is enabled, we can skip compile-time autoconfiguration in debug mode.
-        if (class_exists(ValidatorAttributeMetadataPass::class) && (!($config['enable_attributes'] ?? false) || !$container->getParameter('kernel.debug')) && trait_exists(ArgumentTrait::class)) {
+        if (!($config['enable_attributes'] ?? false) || !$container->getParameter('kernel.debug')) {
             // The $reflector argument hints at where the attribute could be used
             $container->registerAttributeForAutoconfiguration(Constraint::class, function (ChildDefinition $definition, Constraint $attribute, \ReflectionClass|\ReflectionMethod|\ReflectionProperty $reflector) {
                 $definition->addTag('validator.attribute_metadata');
@@ -1818,9 +1782,6 @@ private function registerValidatorMapping(ContainerBuilder $container, array $co
 
         if (!ContainerBuilder::willBeAvailable('symfony/form', Form::class, ['symfony/framework-bundle', 'symfony/validator'])) {
             $container->removeDefinition('validator.form.attribute_metadata');
-        } elseif (!($r = new \ReflectionClass(Form::class))->getAttributes(Traverse::class) || !class_exists(ValidatorAttributeMetadataPass::class)) {
-            // BC with symfony/form & symfony/validator < 7.4
-            $fileRecorder('xml', \dirname($r->getFileName()).'/Resources/config/validation.xml');
         }
 
         foreach ($container->getParameter('kernel.bundles_metadata') as $bundle) {
@@ -2016,7 +1977,7 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
 
         // When attributes are disabled, it means from runtime-discovery only; autoconfiguration should still happen.
         // And when runtime-discovery of attributes is enabled, we can skip compile-time autoconfiguration in debug mode.
-        if (class_exists(SerializerAttributeMetadataPass::class) && (!($config['enable_attributes'] ?? false) || !$container->getParameter('kernel.debug'))) {
+        if (!($config['enable_attributes'] ?? false) || !$container->getParameter('kernel.debug')) {
             // The $reflector argument hints at where the attribute could be used
             $configurator = function (ChildDefinition $definition, object $attribute, \ReflectionClass|\ReflectionMethod|\ReflectionProperty $reflector) {
                 $definition->addTag('serializer.attribute_metadata');
@@ -2037,15 +1998,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
             });
         }
 
-        if (($config['enable_attributes'] ?? false) || class_exists(SerializerAttributeMetadataPass::class)) {
-            $serializerLoaders[] = new Reference('serializer.mapping.attribute_loader');
+        $serializerLoaders[] = new Reference('serializer.mapping.attribute_loader');
 
-            $container->getDefinition('serializer.mapping.attribute_loader')
-                ->replaceArgument(0, $config['enable_attributes'] ?? false);
-        } else {
-            // BC with symfony/serializer < 7.4
-            $container->removeDefinition('serializer.mapping.attribute_services_loader');
-        }
+        $container->getDefinition('serializer.mapping.attribute_loader')
+            ->replaceArgument(0, $config['enable_attributes'] ?? false);
 
         $fileRecorder = function ($extension, $path) use (&$serializerLoaders) {
             $definition = new Definition(\in_array($extension, ['yaml', 'yml'], true) ? YamlFileLoader::class : XmlFileLoader::class, [$path]);
@@ -2289,11 +2245,6 @@ private function registerSchedulerConfiguration(ContainerBuilder $container, Php
         if (!$this->hasConsole()) {
             $container->removeDefinition('console.command.scheduler_debug');
         }
-
-        // BC layer Scheduler < 7.3
-        if (!ContainerBuilder::willBeAvailable('symfony/serializer', DenormalizerInterface::class, ['symfony/framework-bundle', 'symfony/scheduler']) || !class_exists(SchedulerTriggerNormalizer::class)) {
-            $container->removeDefinition('serializer.normalizer.scheduler_trigger');
-        }
     }
 
     private function registerMessengerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader, bool $validationEnabled, bool $lockEnabled): void
@@ -2312,10 +2263,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $container->removeDefinition('serializer.normalizer.flatten_exception');
         }
 
-        if (!class_exists(ResetMemoryUsageListener::class)) {
-            $container->removeDefinition('messenger.listener.reset_memory_usage');
-        }
-
         if (ContainerBuilder::willBeAvailable('symfony/amqp-messenger', MessengerBridge\Amqp\Transport\AmqpTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
             $container->getDefinition('messenger.transport.amqp.factory')->addTag('messenger.transport_factory');
         }
@@ -2356,7 +2303,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             ],
         ];
 
-        if ($lockEnabled && class_exists(DeduplicateMiddleware::class) && class_exists(LockFactory::class)) {
+        if ($lockEnabled && class_exists(LockFactory::class)) {
             $defaultMiddleware['before'][] = ['id' => 'deduplicate_middleware'];
         } else {
             $container->removeDefinition('messenger.middleware.deduplicate_middleware');
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
  * Change default value of `default_protocol` option in `UrlType` from `'http'` to `null`
  * Remove the `VersionAwareTest` trait, use feature detection instead
  * Remove deprecated `ResizeFormListener::preSetData()` method, use `postSetData()` instead
+ * Remove `validation.xml` in `Resources/config`, replaced by attributes on the `Form` class
 
 7.4
 ---
diff --git a/src/Symfony/Component/Form/Resources/config/validation.xml b/src/Symfony/Component/Form/Resources/config/validation.xml
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -44,7 +44,8 @@
         "symfony/var-dumper": "^7.4|^8.0"
     },
     "conflict": {
-        "symfony/translation-contracts": "<2.5"
+        "symfony/translation-contracts": "<2.5",
+        "symfony/validator": "<7.4"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Form\\": "" },
diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\HttpKernel\EventListener;
 
-use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\Console\Event\ConsoleEvent;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
@@ -38,16 +37,10 @@ class DebugHandlersListener implements EventSubscriberInterface
     private bool $hasTerminatedWithException = false;
 
     /**
-     * @param bool          $webMode
      * @param callable|null $exceptionHandler A handler that must support \Throwable instances that will be called on Exception
      */
-    public function __construct(?callable $exceptionHandler = null, bool|LoggerInterface|null $webMode = null)
+    public function __construct(?callable $exceptionHandler = null, ?bool $webMode = null)
     {
-        if ($webMode instanceof LoggerInterface) {
-            // BC with Symfony 5
-            $webMode = null;
-        }
-
         $handler = set_exception_handler('var_dump');
         $this->earlyHandler = \is_array($handler) ? $handler[0] : null;
         restore_exception_handler();
diff --git a/src/Symfony/Component/Serializer/CHANGELOG.md b/src/Symfony/Component/Serializer/CHANGELOG.md
@@ -23,7 +23,7 @@ CHANGELOG
    public function denormalize(string $propertyName, ?string $class = null, ?string $format = null, array $context = []): string;
    ```
  * Remove `AdvancedNameConverterInterface`, use `NameConverterInterface` instead
- * Remove the `CompiledClassMetadataFactory` and `CompiledClassMetadataCacheWarmer` classes
+ * Remove `ClassMetadataFactoryCompiler`, `CompiledClassMetadataFactory` and `CompiledClassMetadataCacheWarmer`
  * Remove class aliases in the `Annotation` namespace, use attributes instead
  * Remove getters in attribute classes in favor of public properties
 
diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactoryCompiler.php b/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactoryCompiler.php
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/AttributeLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/AttributeLoader.php
@@ -44,14 +44,12 @@ class AttributeLoader implements LoaderInterface
     ];
 
     /**
-     * @param bool|null      $allowAnyClass Null is allowed for BC with Symfony <= 6
      * @param class-string[] $mappedClasses
      */
     public function __construct(
-        private ?bool $allowAnyClass = true,
+        private bool $allowAnyClass = true,
         private array $mappedClasses = [],
     ) {
-        $this->allowAnyClass ??= true;
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryCompilerTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryCompilerTest.php
