bug #13336 Make that AddExpressionLanguageProviderPass works with aliases (maarekj, jakzal)

fabpot · fabpot · commit 2cdeae5d503b · 2015-01-08T22:28:04.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- Make that AddExpressionLanguageProviderPass works with aliases | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12847 | License | MIT | Doc PR | Replaces #12982 by @maarekj (includes his commit). Commits ------- 16a22cd [FrameworkBundle] Add a test case for service aliases used with AddExpressionLanguageProviderPass. fd97cef [FrameworkBundle] fixed #12847 AddExpressionLanguageProviderPass
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
@@ -28,15 +28,15 @@ class AddExpressionLanguageProvidersPass implements CompilerPassInterface
     public function process(ContainerBuilder $container)
     {
         // routing
-        if ($container->hasDefinition('router')) {
+        if ($container->has('router')) {
             $definition = $container->findDefinition('router');
             foreach ($container->findTaggedServiceIds('routing.expression_language_provider') as $id => $attributes) {
                 $definition->addMethodCall('addExpressionLanguageProvider', array(new Reference($id)));
             }
         }
 
         // security
-        if ($container->hasDefinition('security.access.expression_voter')) {
+        if ($container->has('security.access.expression_voter')) {
             $definition = $container->findDefinition('security.access.expression_voter');
             foreach ($container->findTaggedServiceIds('security.expression_language_provider') as $id => $attributes) {
                 $definition->addMethodCall('addExpressionLanguageProvider', array(new Reference($id)));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddExpressionLanguageProvidersPassTest.php
@@ -37,6 +37,26 @@ public function testProcessForRouter()
         $this->assertEquals(new Reference('some_routing_provider'), $calls[0][1][0]);
     }
 
+    public function testProcessForRouterAlias()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
+
+        $definition = new Definition('Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TestProvider');
+        $definition->addTag('routing.expression_language_provider');
+        $container->setDefinition('some_routing_provider', $definition);
+
+        $container->register('my_router', '\stdClass');
+        $container->setAlias('router', 'my_router');
+        $container->compile();
+
+        $router = $container->getDefinition('my_router');
+        $calls = $router->getMethodCalls();
+        $this->assertCount(1, $calls);
+        $this->assertEquals('addExpressionLanguageProvider', $calls[0][0]);
+        $this->assertEquals(new Reference('some_routing_provider'), $calls[0][1][0]);
+    }
+
     public function testProcessForSecurity()
     {
         $container = new ContainerBuilder();
@@ -55,6 +75,26 @@ public function testProcessForSecurity()
         $this->assertEquals('addExpressionLanguageProvider', $calls[0][0]);
         $this->assertEquals(new Reference('some_security_provider'), $calls[0][1][0]);
     }
+
+    public function testProcessForSecurityAlias()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddExpressionLanguageProvidersPass());
+
+        $definition = new Definition('Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TestProvider');
+        $definition->addTag('security.expression_language_provider');
+        $container->setDefinition('some_security_provider', $definition);
+
+        $container->register('my_security.access.expression_voter', '\stdClass');
+        $container->setAlias('security.access.expression_voter', 'my_security.access.expression_voter');
+        $container->compile();
+
+        $router = $container->getDefinition('my_security.access.expression_voter');
+        $calls = $router->getMethodCalls();
+        $this->assertCount(1, $calls);
+        $this->assertEquals('addExpressionLanguageProvider', $calls[0][0]);
+        $this->assertEquals(new Reference('some_security_provider'), $calls[0][1][0]);
+    }
 }
 
 class TestProvider

Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,15 @@ class AddExpressionLanguageProvidersPass implements CompilerPassInterface`
`28`	`28`	`public function process(ContainerBuilder $container)`
`29`	`29`	`{`
`30`	`30`	`// routing`
`31`		`- if ($container->hasDefinition('router')) {`
	`31`	`+ if ($container->has('router')) {`
`32`	`32`	`$definition = $container->findDefinition('router');`
`33`	`33`	`foreach ($container->findTaggedServiceIds('routing.expression_language_provider') as $id => $attributes) {`
`34`	`34`	`$definition->addMethodCall('addExpressionLanguageProvider', array(new Reference($id)));`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// security`
`39`		`- if ($container->hasDefinition('security.access.expression_voter')) {`
	`39`	`+ if ($container->has('security.access.expression_voter')) {`
`40`	`40`	`$definition = $container->findDefinition('security.access.expression_voter');`
`41`	`41`	`foreach ($container->findTaggedServiceIds('security.expression_language_provider') as $id => $attributes) {`
`42`	`42`	`$definition->addMethodCall('addExpressionLanguageProvider', array(new Reference($id)));`