Fix Templating Engine autowiring

dunglas · dunglas · commit 1c70edd5f1d0 · 2016-03-26T07:49:03.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -27,6 +27,8 @@
 use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
+use Symfony\Component\Templating\EngineInterface;
+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as FrameworkBundleEngineInterface;
 use Symfony\Component\Validator\Validation;
 
 /**
@@ -519,14 +521,17 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
 
         // Use a delegation unless only a single engine was registered
         if (1 === count($engines)) {
-            $container->setAlias('templating', (string) reset($engines));
+            $aliased = (string) reset($engines);
         } else {
             foreach ($engines as $engine) {
                 $container->getDefinition('templating.engine.delegating')->addMethodCall('addEngine', array($engine));
             }
-            $container->setAlias('templating', 'templating.engine.delegating');
+
+            $aliased = 'templating.engine.delegating';
         }
 
+        $container->setAlias('templating', $aliased);
+
         $container->getDefinition('fragment.renderer.hinclude')
             ->addTag('kernel.fragment_renderer', array('alias' => 'hinclude'))
             ->replaceArgument(0, new Reference('templating'))
@@ -557,6 +562,9 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
                 $container->removeDefinition('templating.helper.assets');
             }
         }
+
+        $definition = $container->getDefinition($aliased);
+        $definition->setAutowiringTypes(array(EngineInterface::class, FrameworkBundleEngineInterface::class));
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
@@ -8,9 +8,6 @@
         <service id="templating.engine.delegating" class="Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine" public="false">
             <argument type="service" id="service_container" />
             <argument type="collection" /> <!-- engines -->
-
-            <autowiring-type>Symfony\Component\Templating\EngineInterface</autowiring-type>
-            <autowiring-type>Symfony\Bundle\FrameworkBundle\Templating\EngineInterface</autowiring-type>
         </service>
 
         <service id="templating.name_parser" class="Symfony\Bundle\FrameworkBundle\Templating\TemplateNameParser">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AutowiringTypesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/AutowiringTypesTest.php
@@ -13,7 +13,8 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
-use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine;
+use Symfony\Component\Templating\EngineInterface;
+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as FrameworkBundleEngineInterface;
 
 class AutowiringTypesTest extends WebTestCase
 {
@@ -41,8 +42,8 @@ public function testTemplatingAutowiring()
         $container = static::$kernel->getContainer();
 
         $autowiredServices = $container->get('test.autowiring_types.autowired_services');
-        $this->assertInstanceOf(DelegatingEngine::class, $autowiredServices->getFrameworkBundleEngine());
-        $this->assertInstanceOf(DelegatingEngine::class, $autowiredServices->getEngine());
+        $this->assertInstanceOf(FrameworkBundleEngineInterface::class, $autowiredServices->getFrameworkBundleEngine());
+        $this->assertInstanceOf(EngineInterface::class, $autowiredServices->getEngine());
     }
 
     protected static function createKernel(array $options = array())
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -59,9 +59,6 @@
             <argument type="service" id="twig" />
             <argument type="service" id="templating.name_parser" />
             <argument type="service" id="templating.locator" />
-
-            <autowiring-type>Symfony\Component\Templating\EngineInterface</autowiring-type>
-            <autowiring-type>Symfony\Bundle\FrameworkBundle\Templating\EngineInterface</autowiring-type>
         </service>
 
         <service id="twig.extension.profiler" class="Symfony\Bridge\Twig\Extension\ProfilerExtension" public="false">
