[FrameworkBundle] Fix Templating Engine autowiring

dunglas · fabpot · commit c4ccfac04776 · 2016-03-31T11:54:21.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php
@@ -11,8 +11,10 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as FrameworkBundleEngineInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\Templating\EngineInterface as ComponentEngineInterface;
 
 class TemplatingPass implements CompilerPassInterface
 {
@@ -22,6 +24,11 @@ public function process(ContainerBuilder $container)
             return;
         }
 
+        if ($container->hasAlias('templating')) {
+            $definition = $container->findDefinition('templating');
+            $definition->setAutowiringTypes(array(ComponentEngineInterface::class, FrameworkBundleEngineInterface::class));
+        }
+
         if ($container->hasDefinition('templating.engine.php')) {
             $helpers = array();
             foreach ($container->findTaggedServiceIds('templating.helper') as $id => $attributes) {
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">
