@nicolas-grekas review

soyuka · soyuka · commit de8611cf9502 · 2025-01-30T18:57:16.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -103,6 +103,8 @@ class UnusedTagsPass implements CompilerPassInterface
         'validator.group_provider',
         'validator.initializer',
         'workflow',
+        'object_mapper.transform_callable',
+        'object_mapper.condition_callable',
     ];
 
     public function process(ContainerBuilder $container): void
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -782,12 +782,12 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
             $container->removeDefinition('form.type_extension.upload.validator');
         }
 
-        if (interface_exists(ObjectMapperInterface::class)) {
+        if (ContainerBuilder::willBeAvailable('symfony/object-mapper', ObjectMapperInterface::class, ['symfony/framework-bundle'])) {
             $loader->load('object_mapper.php');
             $container->registerForAutoconfiguration(TransformCallableInterface::class)
-                      ->addTag('object_mapper.transform_callable');
+                ->addTag('object_mapper.transform_callable');
             $container->registerForAutoconfiguration(ConditionCallableInterface::class)
-                      ->addTag('object_mapper.condition_callable');
+                ->addTag('object_mapper.condition_callable');
         }
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/object_mapper.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/object_mapper.php
@@ -19,17 +19,15 @@
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('object_mapper.metadata_factory', ReflectionObjectMapperMetadataFactory::class)
-        ->alias(ReflectionObjectMapperMetadataFactory::class, 'object_mapper.metadata_factory')
         ->alias(ObjectMapperMetadataFactoryInterface::class, 'object_mapper.metadata_factory')
 
         ->set('object_mapper', ObjectMapper::class)
             ->args([
-                service('object_mapper.metadata_factory')->ignoreOnInvalid(),
+                service('object_mapper.metadata_factory'),
                 service('property_accessor')->ignoreOnInvalid(),
                 tagged_locator('object_mapper.transform_callable'),
                 tagged_locator('object_mapper.condition_callable'),
             ])
-        ->alias(ObjectMapper::class, 'object_mapper')
         ->alias(ObjectMapperInterface::class, 'object_mapper')
     ;
 };

Original file line number	Diff line number	Diff line change
`@@ -782,12 +782,12 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont`
`782`	`782`	`$container->removeDefinition('form.type_extension.upload.validator');`
`783`	`783`	`}`
`784`	`784`
`785`		`- if (interface_exists(ObjectMapperInterface::class)) {`
	`785`	`+ if (ContainerBuilder::willBeAvailable('symfony/object-mapper', ObjectMapperInterface::class, ['symfony/framework-bundle'])) {`
`786`	`786`	`$loader->load('object_mapper.php');`
`787`	`787`	`$container->registerForAutoconfiguration(TransformCallableInterface::class)`
`788`		`- ->addTag('object_mapper.transform_callable');`
	`788`	`+ ->addTag('object_mapper.transform_callable');`
`789`	`789`	`$container->registerForAutoconfiguration(ConditionCallableInterface::class)`
`790`		`- ->addTag('object_mapper.condition_callable');`
	`790`	`+ ->addTag('object_mapper.condition_callable');`
`791`	`791`	`}`
`792`	`792`	`}`
`793`	`793`