Move the property_info.serializer_extractor definition to serializer.xml

dunglas · dunglas · commit ac529c7880e0 · 2016-01-26T18:57:54.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/PropertyInfoPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/PropertyInfoPass.php
@@ -31,13 +31,6 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        if ($container->hasDefinition('serializer.mapping.class_metadata_factory')) {
-            $definition = $container->register('property_info.serializer_extractor', 'Symfony\Component\PropertyInfo\Extractor\SerializerExtractor');
-            $definition->addArgument(new Reference('serializer.mapping.class_metadata_factory'));
-            $definition->setPublic(false);
-            $definition->addTag('property_info.list_extractor', array('priority' => -999));
-        }
-
         $definition = $container->getDefinition('property_info');
 
         $listExtractors = $this->findAndSortTaggedServices('property_info.list_extractor', $container);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.xml
@@ -55,5 +55,12 @@
 
         <!-- Name converter -->
         <service id="serializer.name_converter.camel_case_to_snake_case" class="Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter" public="false" />
+
+        <!-- PropertyInfo extractor -->
+        <service id="property_info.serializer_extractor" class="Symfony\Component\PropertyInfo\Extractor\SerializerExtractor" public="false">
+            <argument type="service" id="serializer.mapping.class_metadata_factory" />
+
+            <tag name="property_info.list_extractor" priority="-999" />
+        </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/PropertyInfoPassTest.php
@@ -73,44 +73,4 @@ public function testReturningEmptyArrayWhenNoService()
 
         $this->assertEquals(array(), $actual);
     }
-
-    public function testRegisterSerializerExtractor()
-    {
-        $container = $this->getMock(
-            'Symfony\Component\DependencyInjection\ContainerBuilder',
-            array('register', 'hasDefinition', 'getDefinition')
-        );
-
-        $container
-            ->expects($this->exactly(2))
-            ->method('hasDefinition')
-            ->will($this->returnValue(true))
-        ;
-
-        $serializerExtractorDefinition = new Definition('Symfony\Component\PropertyInfo\Extractor\SerializerExtractor');
-        $container
-            ->expects($this->exactly(1))
-            ->method('register')
-            ->will($this->returnValue($serializerExtractorDefinition))
-        ;
-
-        $propertyInfoDefinition = new Definition(
-            'Symfony\Component\PropertyInfo\PropertyInfoExtractor',
-            array(null, null, null, null)
-        );
-        $container
-            ->expects($this->exactly(1))
-            ->method('getDefinition')
-            ->will($this->returnValue($propertyInfoDefinition))
-        ;
-
-        $propertyInfoPass = new PropertyInfoPass();
-        $propertyInfoPass->process($container);
-
-        $this->assertEquals('serializer.mapping.class_metadata_factory', $serializerExtractorDefinition->getArgument(0)->__toString());
-        $this->assertFalse($serializerExtractorDefinition->isPublic());
-
-        $tag = $serializerExtractorDefinition->getTag('property_info.list_extractor');
-        $this->assertEquals(array('priority' => -999), $tag[0]);
-    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -441,6 +441,18 @@ public function testSerializerEnabled()
         $this->assertEquals(new Reference('serializer.name_converter.camel_case_to_snake_case'), $container->getDefinition('serializer.normalizer.object')->getArgument(1));
     }
 
+    public function testRegisterSerializerExtractor()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $serializerExtractorDefinition = $container->getDefinition('property_info.serializer_extractor');
+
+        $this->assertEquals('serializer.mapping.class_metadata_factory', $serializerExtractorDefinition->getArgument(0)->__toString());
+        $this->assertFalse($serializerExtractorDefinition->isPublic());
+        $tag = $serializerExtractorDefinition->getTag('property_info.list_extractor');
+        $this->assertEquals(array('priority' => -999), $tag[0]);
+    }
+
     public function testAssetHelperWhenAssetsAreEnabled()
     {
         $container = $this->createContainerFromFile('full');
