[FrameworkBundle] object mapper service definition without form

soyuka · soyuka · commit 02c20ba7678a · 2025-05-20T13:53:54.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -642,6 +642,14 @@ public function load(array $configs, ContainerBuilder $container): void
             $loader->load('mime_type.php');
         }
 
+        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');
+            $container->registerForAutoconfiguration(ConditionCallableInterface::class)
+                ->addTag('object_mapper.condition_callable');
+        }
+
         $container->registerForAutoconfiguration(PackageInterface::class)
             ->addTag('assets.package');
         $container->registerForAutoconfiguration(AssetCompilerInterface::class)
@@ -880,14 +888,6 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
         if (!ContainerBuilder::willBeAvailable('symfony/translation', Translator::class, ['symfony/framework-bundle', 'symfony/form'])) {
             $container->removeDefinition('form.type_extension.upload.validator');
         }
-
-        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');
-            $container->registerForAutoconfiguration(ConditionCallableInterface::class)
-                ->addTag('object_mapper.condition_callable');
-        }
     }
 
     private function registerHttpCacheConfiguration(array $config, ContainerBuilder $container, bool $httpMethodOverride): void
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/object_mapper.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/object_mapper.php
@@ -0,0 +1,4 @@
+<?php
+
+$container->loadFromExtension('framework', [
+]);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/object_mapper.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/object_mapper.xml
@@ -0,0 +1,10 @@
+<?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>
+    </framework:config>
+</container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/object_mapper.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/object_mapper.yml
@@ -0,0 +1 @@
+framework:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -2600,6 +2600,12 @@ public function testJsonStreamerEnabled()
         $this->assertTrue($container->has('json_streamer.stream_writer'));
     }
 
+    public function testObjectMapperEnabled()
+    {
+        $container = $this->createContainerFromFile('object_mapper');
+        $this->assertTrue($container->has('object_mapper'));
+    }
+
     protected function createContainer(array $data = [])
     {
         return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<?php
++
 +$container->loadFromExtension('framework', [
 +]);
Original file line number	Diff line number	Diff line change
`@@ -2600,6 +2600,12 @@ public function testJsonStreamerEnabled()`
`2600`	`2600`	`$this->assertTrue($container->has('json_streamer.stream_writer'));`
`2601`	`2601`	`}`
`2602`	`2602`
	`2603`	`+ public function testObjectMapperEnabled()`
	`2604`	`+ {`
	`2605`	`+ $container = $this->createContainerFromFile('object_mapper');`
	`2606`	`+ $this->assertTrue($container->has('object_mapper'));`
	`2607`	`+ }`
	`2608`	`+`
`2603`	`2609`	`protected function createContainer(array $data = [])`
`2604`	`2610`	`{`
`2605`	`2611`	`return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([`