[DI] Make tagged abstract services throw earlier

nicolas-grekas · nicolas-grekas · commit 388e4b3389f1 · 2017-04-13T15:45:25.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -55,8 +55,8 @@ public function process(ContainerBuilder $container)
             return;
         }
 
-        $taggedSubscribers = $container->findTaggedServiceIds($this->tagPrefix.'.event_subscriber');
-        $taggedListeners = $container->findTaggedServiceIds($this->tagPrefix.'.event_listener');
+        $taggedSubscribers = $container->findTaggedServiceIds($this->tagPrefix.'.event_subscriber', true);
+        $taggedListeners = $container->findTaggedServiceIds($this->tagPrefix.'.event_listener', true);
 
         if (empty($taggedSubscribers) && empty($taggedListeners)) {
             return;
@@ -78,10 +78,6 @@ public function process(ContainerBuilder $container)
 
                 uasort($subscribers, $sortFunc);
                 foreach ($subscribers as $id => $instance) {
-                    if ($container->getDefinition($id)->isAbstract()) {
-                        throw new InvalidArgumentException(sprintf('The abstract service "%s" cannot be tagged as a doctrine event subscriber.', $id));
-                    }
-
                     $em->addMethodCall('addEventSubscriber', array(new Reference($id)));
                 }
             }
@@ -94,10 +90,6 @@ public function process(ContainerBuilder $container)
 
                 uasort($listeners, $sortFunc);
                 foreach ($listeners as $id => $instance) {
-                    if ($container->getDefinition($id)->isAbstract()) {
-                        throw new InvalidArgumentException(sprintf('The abstract service "%s" cannot be tagged as a doctrine event listener.', $id));
-                    }
-
                     $em->addMethodCall('addEventListener', array(
                         array_unique($instance['event']),
                         isset($instance['lazy']) && $instance['lazy'] ? $id : new Reference($id),
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheClearerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddCacheClearerPass.php
@@ -32,7 +32,7 @@ public function process(ContainerBuilder $container)
         }
 
         $clearers = array();
-        foreach ($container->findTaggedServiceIds('kernel.cache_clearer') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('kernel.cache_clearer', true) as $id => $attributes) {
             $clearers[] = new Reference($id);
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php
@@ -30,15 +30,15 @@ public function process(ContainerBuilder $container)
         // routing
         if ($container->has('router')) {
             $definition = $container->findDefinition('router');
-            foreach ($container->findTaggedServiceIds('routing.expression_language_provider') as $id => $attributes) {
+            foreach ($container->findTaggedServiceIds('routing.expression_language_provider', true) as $id => $attributes) {
                 $definition->addMethodCall('addExpressionLanguageProvider', array(new Reference($id)));
             }
         }
 
         // security
         if ($container->has('security.access.expression_voter')) {
             $definition = $container->findDefinition('security.access.expression_voter');
-            foreach ($container->findTaggedServiceIds('security.expression_language_provider') as $id => $attributes) {
+            foreach ($container->findTaggedServiceIds('security.expression_language_provider', true) as $id => $attributes) {
                 $definition->addMethodCall('addExpressionLanguageProvider', array(new Reference($id)));
             }
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ProfilerPass.php
@@ -33,7 +33,7 @@ public function process(ContainerBuilder $container)
 
         $collectors = new \SplPriorityQueue();
         $order = PHP_INT_MAX;
-        foreach ($container->findTaggedServiceIds('data_collector') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('data_collector', true) as $id => $attributes) {
             $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
             $template = null;
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php
@@ -32,7 +32,7 @@ public function process(ContainerBuilder $container)
 
         if ($container->hasDefinition('templating.engine.php')) {
             $helpers = array();
-            foreach ($container->findTaggedServiceIds('templating.helper') as $id => $attributes) {
+            foreach ($container->findTaggedServiceIds('templating.helper', true) as $id => $attributes) {
                 if (isset($attributes[0]['alias'])) {
                     $helpers[$attributes[0]['alias']] = $id;
                 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TranslationDumperPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TranslationDumperPass.php
@@ -28,7 +28,7 @@ public function process(ContainerBuilder $container)
 
         $definition = $container->getDefinition('translation.writer');
 
-        foreach ($container->findTaggedServiceIds('translation.dumper') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('translation.dumper', true) as $id => $attributes) {
             $definition->addMethodCall('addDumper', array($attributes[0]['alias'], new Reference($id)));
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TranslationExtractorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TranslationExtractorPass.php
@@ -29,7 +29,7 @@ public function process(ContainerBuilder $container)
 
         $definition = $container->getDefinition('translation.extractor');
 
-        foreach ($container->findTaggedServiceIds('translation.extractor') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('translation.extractor', true) as $id => $attributes) {
             if (!isset($attributes[0]['alias'])) {
                 throw new RuntimeException(sprintf('The alias for the tag "translation.extractor" of service "%s" must be set.', $id));
             }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TranslatorPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TranslatorPass.php
@@ -26,7 +26,7 @@ public function process(ContainerBuilder $container)
 
         $loaders = array();
         $loaderRefs = array();
-        foreach ($container->findTaggedServiceIds('translation.loader') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('translation.loader', true) as $id => $attributes) {
             $loaderRefs[$id] = new Reference($id);
             $loaders[$id][] = $attributes[0]['alias'];
             if (isset($attributes[0]['legacy-alias'])) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php
@@ -25,7 +25,7 @@ class ValidateWorkflowsPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $taggedServices = $container->findTaggedServiceIds('workflow.definition');
+        $taggedServices = $container->findTaggedServiceIds('workflow.definition', true);
         foreach ($taggedServices as $id => $tags) {
             $definition = $container->get($id);
             foreach ($tags as $tag) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
@@ -34,9 +34,6 @@ public function testThatConstraintValidatorServicesAreProcessed()
             ->addTag('validator.constraint_validator', array('alias' => 'my_constraint_validator_alias1'));
         $container->register('my_constraint_validator_service2', Validator2::class)
             ->addTag('validator.constraint_validator');
-        $container->register('my_abstract_constraint_validator')
-            ->setAbstract(true)
-            ->addTag('validator.constraint_validator');
 
         $addConstraintValidatorsPass = new AddConstraintValidatorsPass();
         $addConstraintValidatorsPass->process($container);
@@ -49,6 +46,24 @@ public function testThatConstraintValidatorServicesAreProcessed()
         $this->assertEquals($expected, $container->getDefinition((string) $validatorFactory->getArgument(0)));
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage The service "my_abstract_constraint_validator" tagged "validator.constraint_validator" must not be abstract.
+     */
+    public function testAbstractConstraintValidator()
+    {
+        $container = new ContainerBuilder();
+        $validatorFactory = $container->register('validator.validator_factory')
+            ->addArgument(array());
+
+        $container->register('my_abstract_constraint_validator')
+            ->setAbstract(true)
+            ->addTag('validator.constraint_validator');
+
+        $addConstraintValidatorsPass = new AddConstraintValidatorsPass();
+        $addConstraintValidatorsPass->process($container);
+    }
+
     public function testThatCompilerPassIsIgnoredIfThereIsNoConstraintValidatorFactoryDefinition()
     {
         $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
@@ -29,13 +29,8 @@ public function process(ContainerBuilder $container)
 
         $definition = $container->getDefinition('twig.runtime_loader');
         $mapping = array();
-        foreach ($container->findTaggedServiceIds('twig.runtime') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('twig.runtime', true) as $id => $attributes) {
             $def = $container->getDefinition($id);
-
-            if ($def->isAbstract()) {
-                continue;
-            }
-
             $mapping[$def->getClass()] = new Reference($id);
         }
 
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigEnvironmentPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigEnvironmentPass.php
@@ -36,7 +36,7 @@ public function process(ContainerBuilder $container)
         // be registered.
         $calls = $definition->getMethodCalls();
         $definition->setMethodCalls(array());
-        foreach ($container->findTaggedServiceIds('twig.extension') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('twig.extension', true) as $id => $attributes) {
             $definition->addMethodCall('addExtension', array(new Reference($id)));
         }
         $definition->setMethodCalls(array_merge($definition->getMethodCalls(), $calls));
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/TwigLoaderPass.php
@@ -32,7 +32,7 @@ public function process(ContainerBuilder $container)
         $prioritizedLoaders = array();
         $found = 0;
 
-        foreach ($container->findTaggedServiceIds('twig.loader') as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds('twig.loader', true) as $id => $attributes) {
             $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
             $prioritizedLoaders[$priority][] = $id;
             ++$found;
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -25,16 +25,11 @@ class AddConsoleCommandPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $commandServices = $container->findTaggedServiceIds('console.command');
+        $commandServices = $container->findTaggedServiceIds('console.command', true);
         $serviceIds = array();
 
         foreach ($commandServices as $id => $tags) {
             $definition = $container->getDefinition($id);
-
-            if ($definition->isAbstract()) {
-                throw new \InvalidArgumentException(sprintf('The service "%s" tagged "console.command" must not be abstract.', $id));
-            }
-
             $class = $container->getParameterBag()->resolveValue($definition->getClass());
 
             if (!$r = $container->getReflectionClass($class)) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -40,7 +40,7 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container
     {
         $services = array();
 
-        foreach ($container->findTaggedServiceIds($tagName) as $serviceId => $attributes) {
+        foreach ($container->findTaggedServiceIds($tagName, true) as $serviceId => $attributes) {
             $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
             $services[$priority][] = new Reference($serviceId);
         }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveTagsInheritancePass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveTagsInheritancePass.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
@@ -21,6 +22,24 @@
  */
 class ResolveTagsInheritancePass extends AbstractRecursivePass
 {
+    private $abstractInheritedParents = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        try {
+            parent::process($container);
+
+            foreach ($this->abstractInheritedParents as $id) {
+                $container->findDefinition($id)->setTags(array());
+            }
+        } finally {
+            $this->abstractInheritedParents = array();
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -36,6 +55,9 @@ protected function processValue($value, $isRoot = false)
         }
 
         $parentDef = $this->container->findDefinition($parent);
+        if ($parentDef->isAbstract()) {
+            $this->abstractInheritedParents[$parent] = $parent;
+        }
 
         if ($parentDef instanceof ChildDefinition) {
             $this->processValue($parentDef);
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1200,16 +1200,20 @@ public function resolveServices($value)
      *     }
      * }
      *
-     * @param string $name The tag name
+     * @param string $name
+     * @param bool   $throwOnAbstract
      *
      * @return array An array of tags with the tagged service as key, holding a list of attribute arrays
      */
-    public function findTaggedServiceIds($name)
+    public function findTaggedServiceIds($name, $throwOnAbstract = false)
     {
         $this->usedTags[] = $name;
         $tags = array();
         foreach ($this->getDefinitions() as $id => $definition) {
             if ($definition->hasTag($name)) {
+                if ($throwOnAbstract && $definition->isAbstract()) {
+                    throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must not be abstract.', $id, $name));
+                }
                 $tags[$id] = $definition->getTag($name);
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTagsInheritancePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveTagsInheritancePassTest.php
@@ -22,13 +22,13 @@ public function testProcess()
     {
         $container = new ContainerBuilder();
         $container->register('grandpa', self::class)->addTag('g');
-        $container->setDefinition('parent', new ChildDefinition('grandpa'))->addTag('p')->setInheritTags(true);
+        $container->setDefinition('parent', new ChildDefinition('grandpa'))->addTag('p')->setInheritTags(true)->setAbstract(true);
         $container->setDefinition('child', new ChildDefinition('parent'))->setInheritTags(true);
 
         (new ResolveTagsInheritancePass())->process($container);
 
         $expected = array('p' => array(array()), 'g' => array(array()));
-        $this->assertSame($expected, $container->getDefinition('parent')->getTags());
         $this->assertSame($expected, $container->getDefinition('child')->getTags());
+        $this->assertSame(array(), $container->getDefinition('parent')->getTags());
     }
 }
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -60,11 +60,8 @@ public function process(ContainerBuilder $container)
 
         $definition = $container->findDefinition($this->dispatcherService);
 
-        foreach ($container->findTaggedServiceIds($this->listenerTag) as $id => $events) {
+        foreach ($container->findTaggedServiceIds($this->listenerTag, true) as $id => $events) {
             $def = $container->getDefinition($id);
-            if ($def->isAbstract()) {
-                throw new InvalidArgumentException(sprintf('The service "%s" must not be abstract as event listeners are lazy-loaded.', $id));
-            }
 
             foreach ($events as $event) {
                 $priority = isset($event['priority']) ? $event['priority'] : 0;
@@ -87,11 +84,8 @@ public function process(ContainerBuilder $container)
 
         $extractingDispatcher = new ExtractingEventDispatcher();
 
-        foreach ($container->findTaggedServiceIds($this->subscriberTag) as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds($this->subscriberTag, true) as $id => $attributes) {
             $def = $container->getDefinition($id);
-            if ($def->isAbstract()) {
-                throw new InvalidArgumentException(sprintf('The service "%s" must not be abstract as event subscribers are lazy-loaded.', $id));
-            }
 
             // We must assume that the class value has been correctly filled, even if the service is created by a factory
             $class = $container->getParameterBag()->resolveValue($def->getClass());
diff --git a/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -89,7 +89,7 @@ public function testValidEventSubscriber()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The service "foo" must not be abstract as event listeners are lazy-loaded.
+     * @expectedExceptionMessage The service "foo" tagged "kernel.event_listener" must not be abstract.
      */
     public function testAbstractEventListener()
     {
@@ -103,7 +103,7 @@ public function testAbstractEventListener()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The service "foo" must not be abstract as event subscribers are lazy-loaded.
+     * @expectedExceptionMessage The service "foo" tagged "kernel.event_subscriber" must not be abstract.
      */
     public function testAbstractEventSubscriber()
     {
diff --git a/src/Symfony/Component/Form/DependencyInjection/FormPass.php b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
@@ -61,10 +61,9 @@ private function processFormTypes(ContainerBuilder $container, Definition $defin
         $servicesMap = array();
 
         // Builds an array with fully-qualified type class names as keys and service IDs as values
-        foreach ($container->findTaggedServiceIds($this->formTypeTag) as $serviceId => $tag) {
-            $serviceDefinition = $container->getDefinition($serviceId);
-
+        foreach ($container->findTaggedServiceIds($this->formTypeTag, true) as $serviceId => $tag) {
             // Add form type service to the service locator
+            $serviceDefinition = $container->getDefinition($serviceId);
             $servicesMap[$serviceDefinition->getClass()] = new Reference($serviceId);
         }
 
@@ -98,7 +97,7 @@ private function processFormTypeExtensions(ContainerBuilder $container)
     private function processFormTypeGuessers(ContainerBuilder $container)
     {
         $guessers = array();
-        foreach ($container->findTaggedServiceIds($this->formTypeGuesserTag) as $serviceId => $tags) {
+        foreach ($container->findTaggedServiceIds($this->formTypeGuesserTag, true) as $serviceId => $tags) {
             $guessers[] = new Reference($serviceId);
         }
 
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
@@ -46,12 +46,8 @@ public function process(ContainerBuilder $container)
 
         $definition = $container->getDefinition($this->handlerService);
         $renderers = array();
-        foreach ($container->findTaggedServiceIds($this->rendererTag) as $id => $tags) {
+        foreach ($container->findTaggedServiceIds($this->rendererTag, true) as $id => $tags) {
             $def = $container->getDefinition($id);
-            if ($def->isAbstract()) {
-                continue;
-            }
-
             $class = $container->getParameterBag()->resolveValue($def->getClass());
 
             if (!$r = $container->getReflectionClass($class)) {
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -48,12 +48,8 @@ public function process(ContainerBuilder $container)
         $parameterBag = $container->getParameterBag();
         $controllers = array();
 
-        foreach ($container->findTaggedServiceIds($this->controllerTag) as $id => $tags) {
+        foreach ($container->findTaggedServiceIds($this->controllerTag, true) as $id => $tags) {
             $def = $container->getDefinition($id);
-
-            if ($def->isAbstract()) {
-                continue;
-            }
             $class = $def->getClass();
             $autowire = $def->isAutowired();
 
diff --git a/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php b/src/Symfony/Component/Routing/DependencyInjection/RoutingResolverPass.php
@@ -39,7 +39,7 @@ public function process(ContainerBuilder $container)
 
         $definition = $container->getDefinition($this->resolverServiceId);
 
-        foreach ($container->findTaggedServiceIds($this->loaderTag) as $id => $attributes) {
+        foreach ($container->findTaggedServiceIds($this->loaderTag, true) as $id => $attributes) {
             $definition->addMethodCall('addLoader', array(new Reference($id)));
         }
     }
diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddConstraintValidatorsPass.php
diff --git a/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php b/src/Symfony/Component/Validator/DependencyInjection/AddValidatorInitializersPass.php
diff --git a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function process(ContainerBuilder $container)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`$clearers = array();`
`35`		`- foreach ($container->findTaggedServiceIds('kernel.cache_clearer') as $id => $attributes) {`
	`35`	`+ foreach ($container->findTaggedServiceIds('kernel.cache_clearer', true) as $id => $attributes) {`
`36`	`36`	`$clearers[] = new Reference($id);`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,15 @@ public function process(ContainerBuilder $container)`
`30`	`30`	`// routing`
`31`	`31`	`if ($container->has('router')) {`
`32`	`32`	`$definition = $container->findDefinition('router');`
`33`		`- foreach ($container->findTaggedServiceIds('routing.expression_language_provider') as $id => $attributes) {`
	`33`	`+ foreach ($container->findTaggedServiceIds('routing.expression_language_provider', true) as $id => $attributes) {`
`34`	`34`	`$definition->addMethodCall('addExpressionLanguageProvider', array(new Reference($id)));`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// security`
`39`	`39`	`if ($container->has('security.access.expression_voter')) {`
`40`	`40`	`$definition = $container->findDefinition('security.access.expression_voter');`
`41`		`- foreach ($container->findTaggedServiceIds('security.expression_language_provider') as $id => $attributes) {`
	`41`	`+ foreach ($container->findTaggedServiceIds('security.expression_language_provider', true) as $id => $attributes) {`
`42`	`42`	`$definition->addMethodCall('addExpressionLanguageProvider', array(new Reference($id)));`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function process(ContainerBuilder $container)`
`28`	`28`
`29`	`29`	`$definition = $container->getDefinition('translation.writer');`
`30`	`30`
`31`		`- foreach ($container->findTaggedServiceIds('translation.dumper') as $id => $attributes) {`
	`31`	`+ foreach ($container->findTaggedServiceIds('translation.dumper', true) as $id => $attributes) {`
`32`	`32`	`$definition->addMethodCall('addDumper', array($attributes[0]['alias'], new Reference($id)));`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function process(ContainerBuilder $container)`
`29`	`29`
`30`	`30`	`$definition = $container->getDefinition('translation.extractor');`
`31`	`31`
`32`		`- foreach ($container->findTaggedServiceIds('translation.extractor') as $id => $attributes) {`
	`32`	`+ foreach ($container->findTaggedServiceIds('translation.extractor', true) as $id => $attributes) {`
`33`	`33`	`if (!isset($attributes[0]['alias'])) {`
`34`	`34`	`throw new RuntimeException(sprintf('The alias for the tag "translation.extractor" of service "%s" must be set.', $id));`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class ValidateWorkflowsPass implements CompilerPassInterface`
`25`	`25`	`{`
`26`	`26`	`public function process(ContainerBuilder $container)`
`27`	`27`	`{`
`28`		`- $taggedServices = $container->findTaggedServiceIds('workflow.definition');`
	`28`	`+ $taggedServices = $container->findTaggedServiceIds('workflow.definition', true);`
`29`	`29`	`foreach ($taggedServices as $id => $tags) {`
`30`	`30`	`$definition = $container->get($id);`
`31`	`31`	`foreach ($tags as $tag) {`