feature #18242 [FrameworkBundle][TwigBundle] Make EngineInterface autowirable (dunglas)

fabpot · fabpot · commit 3c75c4883800 · 2016-03-25T17:49:43.000+01:00
This PR was merged into the 3.1-dev branch. Discussion ---------- [FrameworkBundle][TwigBundle] Make EngineInterface autowirable | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 26ed582 [FrameworkBundle][TwigBundle] Make EngineInterface autowirable
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating.xml
@@ -8,6 +8,9 @@
         <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,6 +13,7 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
+use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine;
 
 class AutowiringTypesTest extends WebTestCase
 {
@@ -34,6 +35,16 @@ public function testCachedAnnotationReaderAutowiring()
         $this->assertInstanceOf(CachedReader::class, $annotationReader);
     }
 
+    public function testTemplatingAutowiring()
+    {
+        static::bootKernel();
+        $container = static::$kernel->getContainer();
+
+        $autowiredServices = $container->get('test.autowiring_types.autowired_services');
+        $this->assertInstanceOf(DelegatingEngine::class, $autowiredServices->getFrameworkBundleEngine());
+        $this->assertInstanceOf(DelegatingEngine::class, $autowiredServices->getEngine());
+    }
+
     protected static function createKernel(array $options = array())
     {
         return parent::createKernel(array('test_case' => 'AutowiringTypes') + $options);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php
@@ -12,18 +12,34 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\AutowiringTypes;
 
 use Doctrine\Common\Annotations\Reader;
+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as FrameworkBundleEngineInterface;
+use Symfony\Component\Templating\EngineInterface;
 
 class AutowiredServices
 {
     private $annotationReader;
+    private $frameworkBundleEngine;
+    private $engine;
 
-    public function __construct(Reader $annotationReader = null)
+    public function __construct(Reader $annotationReader = null, FrameworkBundleEngineInterface $frameworkBundleEngine, EngineInterface $engine)
     {
         $this->annotationReader = $annotationReader;
+        $this->frameworkBundleEngine = $frameworkBundleEngine;
+        $this->engine = $engine;
     }
 
     public function getAnnotationReader()
     {
         return $this->annotationReader;
     }
+
+    public function getFrameworkBundleEngine()
+    {
+        return $this->frameworkBundleEngine;
+    }
+
+    public function getEngine()
+    {
+        return $this->engine;
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AutowiringTypes/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AutowiringTypes/config.yml
@@ -5,3 +5,6 @@ services:
     test.autowiring_types.autowired_services:
         class: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\AutowiringTypes\AutowiredServices
         autowire: true
+framework:
+    templating:
+        engines: ['php']
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -59,6 +59,9 @@
             <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">

Original file line number	Diff line number	Diff line change
`@@ -12,18 +12,34 @@`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\AutowiringTypes;`
`13`	`13`
`14`	`14`	`use Doctrine\Common\Annotations\Reader;`
	`15`	`+use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as FrameworkBundleEngineInterface;`
	`16`	`+use Symfony\Component\Templating\EngineInterface;`
`15`	`17`
`16`	`18`	`class AutowiredServices`
`17`	`19`	`{`
`18`	`20`	`private $annotationReader;`
	`21`	`+ private $frameworkBundleEngine;`
	`22`	`+ private $engine;`
`19`	`23`
`20`		`- public function __construct(Reader $annotationReader = null)`
	`24`	`+ public function __construct(Reader $annotationReader = null, FrameworkBundleEngineInterface $frameworkBundleEngine, EngineInterface $engine)`
`21`	`25`	`{`
`22`	`26`	`$this->annotationReader = $annotationReader;`
	`27`	`+ $this->frameworkBundleEngine = $frameworkBundleEngine;`
	`28`	`+ $this->engine = $engine;`
`23`	`29`	`}`
`24`	`30`
`25`	`31`	`public function getAnnotationReader()`
`26`	`32`	`{`
`27`	`33`	`return $this->annotationReader;`
`28`	`34`	`}`
	`35`	`+`
	`36`	`+ public function getFrameworkBundleEngine()`
	`37`	`+ {`
	`38`	`+ return $this->frameworkBundleEngine;`
	`39`	`+ }`
	`40`	`+`
	`41`	`+ public function getEngine()`
	`42`	`+ {`
	`43`	`+ return $this->engine;`
	`44`	`+ }`
`29`	`45`	`}`