[FrameworkBundle] Support autowiring for RouterInterface

hason · hason · commit 6ae03becf8e4 · 2016-09-20T12:11:04.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RoutingPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/RoutingPass.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
+use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
+use Symfony\Component\Routing\RouterInterface;
+
+class RoutingPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if ($container->hasAlias('router')) {
+            $definition = $container->findDefinition('router');
+            $definition->addAutowiringType(UrlGeneratorInterface::class);
+            $definition->addAutowiringType(UrlMatcherInterface::class);
+            $definition->addAutowiringType(RequestMatcherInterface::class);
+            $definition->addAutowiringType(RouterInterface::class);
+        }
+    }
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -19,6 +19,7 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ControllerArgumentValueResolverPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\FormPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\PropertyInfoPass;
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RoutingPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TemplatingPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\RoutingResolverPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ProfilerPass;
@@ -71,6 +72,7 @@ public function build(ContainerBuilder $container)
         parent::build($container);
 
         $container->addCompilerPass(new RoutingResolverPass());
+        $container->addCompilerPass(new RoutingPass());
         $container->addCompilerPass(new ProfilerPass());
         // must be registered before removing private services as some might be listeners/subscribers
         // but as late as possible to get resolved parameters
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\Component\Routing\RouterInterface;
 use Symfony\Component\Templating\EngineInterface as ComponentEngineInterface;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as FrameworkBundleEngineInterface;
 
@@ -46,6 +47,15 @@ public function testTemplatingAutowiring()
         $this->assertInstanceOf(ComponentEngineInterface::class, $autowiredServices->getEngine());
     }
 
+    public function testRouterAutowiring()
+    {
+        static::bootKernel();
+        $container = static::$kernel->getContainer();
+
+        $autowiredServices = $container->get('test.autowiring_types.autowired_services');
+        $this->assertInstanceOf(RouterInterface::class, $autowiredServices->getRouter());
+    }
+
     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
@@ -13,19 +13,22 @@
 
 use Doctrine\Common\Annotations\Reader;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as FrameworkBundleEngineInterface;
+use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Templating\EngineInterface;
 
 class AutowiredServices
 {
     private $annotationReader;
     private $frameworkBundleEngine;
     private $engine;
+    private $router;
 
-    public function __construct(Reader $annotationReader = null, FrameworkBundleEngineInterface $frameworkBundleEngine, EngineInterface $engine)
+    public function __construct(Reader $annotationReader = null, FrameworkBundleEngineInterface $frameworkBundleEngine, EngineInterface $engine, RouterInterface $router)
     {
         $this->annotationReader = $annotationReader;
         $this->frameworkBundleEngine = $frameworkBundleEngine;
         $this->engine = $engine;
+        $this->router = $router;
     }
 
     public function getAnnotationReader()
@@ -42,4 +45,9 @@ public function getEngine()
     {
         return $this->engine;
     }
+
+    public function getRouter()
+    {
+        return $this->router;
+    }
 }
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,6 +5,12 @@ services:
     test.autowiring_types.autowired_services:
         class: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\AutowiringTypes\AutowiredServices
         autowire: true
+
+    another_router:
+        class: Symfony\Bundle\FrameworkBundle\Routing\Router
+        arguments:
+          - "@service_container"
+
 framework:
     templating:
         engines: ['php']

Original file line number	Diff line number	Diff line change
`@@ -13,19 +13,22 @@`
`13`	`13`
`14`	`14`	`use Doctrine\Common\Annotations\Reader;`
`15`	`15`	`use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface as FrameworkBundleEngineInterface;`
	`16`	`+use Symfony\Component\Routing\RouterInterface;`
`16`	`17`	`use Symfony\Component\Templating\EngineInterface;`
`17`	`18`
`18`	`19`	`class AutowiredServices`
`19`	`20`	`{`
`20`	`21`	`private $annotationReader;`
`21`	`22`	`private $frameworkBundleEngine;`
`22`	`23`	`private $engine;`
	`24`	`+ private $router;`
`23`	`25`
`24`		`- public function __construct(Reader $annotationReader = null, FrameworkBundleEngineInterface $frameworkBundleEngine, EngineInterface $engine)`
	`26`	`+ public function __construct(Reader $annotationReader = null, FrameworkBundleEngineInterface $frameworkBundleEngine, EngineInterface $engine, RouterInterface $router)`
`25`	`27`	`{`
`26`	`28`	`$this->annotationReader = $annotationReader;`
`27`	`29`	`$this->frameworkBundleEngine = $frameworkBundleEngine;`
`28`	`30`	`$this->engine = $engine;`
	`31`	`+ $this->router = $router;`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`public function getAnnotationReader()`
`@@ -42,4 +45,9 @@ public function getEngine()`
`42`	`45`	`{`
`43`	`46`	`return $this->engine;`
`44`	`47`	`}`
	`48`	`+`
	`49`	`+ public function getRouter()`
	`50`	`+ {`
	`51`	`+ return $this->router;`
	`52`	`+ }`
`45`	`53`	`}`