Fix @aitboudad comments.

dunglas · dunglas · commit 22d5d959ba32 · 2015-10-05T15:37:18.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/PropertyInfoPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/PropertyInfoPass.php
@@ -16,7 +16,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Adds extractors to the property_info_extractor service.
+ * Adds extractors to the property_info service.
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
@@ -27,21 +27,21 @@ class PropertyInfoPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
-        if (!$container->hasDefinition('property_info_extractor')) {
+        if (!$container->hasDefinition('property_info')) {
             return;
         }
 
-        $listExtractors = $this->findAndSortTaggedServices('property_info', $container);
-        $container->getDefinition('property_info_extractor')->replaceArgument(0, $listExtractors);
+        $listExtractors = $this->findAndSortTaggedServices('property_info.list_extractor', $container);
+        $container->getDefinition('property_info')->replaceArgument(0, $listExtractors);
 
-        $typeExtractors = $this->findAndSortTaggedServices('property_info', $container);
-        $container->getDefinition('property_info.type_extractor')->replaceArgument(1, $typeExtractors);
+        $typeExtractors = $this->findAndSortTaggedServices('property_info.type_extractor', $container);
+        $container->getDefinition('property_info')->replaceArgument(1, $typeExtractors);
 
-        $descriptionExtractors = $this->findAndSortTaggedServices('property_info', $container);
-        $container->getDefinition('property_info.description_extractor')->replaceArgument(2, $descriptionExtractors);
+        $descriptionExtractors = $this->findAndSortTaggedServices('property_info.description_extractor', $container);
+        $container->getDefinition('property_info')->replaceArgument(2, $descriptionExtractors);
 
-        $accessExtractors = $this->findAndSortTaggedServices('property_info', $container);
-        $container->getDefinition('property_info.access_extractor')->replaceArgument(3, $accessExtractors);
+        $accessExtractors = $this->findAndSortTaggedServices('property_info.access_extractor', $container);
+        $container->getDefinition('property_info')->replaceArgument(3, $accessExtractors);
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -15,6 +15,7 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddValidatorInitializersPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConsoleCommandPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FormPass;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\PropertyInfoPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TemplatingPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RoutingResolverPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ProfilerPass;
@@ -89,6 +90,7 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new TranslationDumperPass());
         $container->addCompilerPass(new FragmentRendererPass(), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new SerializerPass());
+        $container->addCompilerPass(new PropertyInfoPass());
 
         if ($container->getParameter('kernel.debug')) {
             $container->addCompilerPass(new ContainerBuilderDebugDumpPass(), PassConfig::TYPE_AFTER_REMOVING);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/property_info.xml
@@ -13,7 +13,7 @@
         </service>
 
         <!-- Extractor -->
-        <service id="property_info.reflection_extractor" public="false">
+        <service id="property_info.reflection_extractor" class="Symfony\Component\PropertyInfo\ReflectionExtractor" public="false">
             <tag name="property_info.list_extractor" priority="-1000" />
             <tag name="property_info.type_extractor" priority="-1000" />
             <tag name="property_info.access_extractor" priority="-1000" />
