From 821ca5286812d0fb51d667767d914b8259ca737e Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 10 Jan 2018 14:30:03 +0100 Subject: [PATCH] [FrameworkBundle] fix tests Add a public alias so that we can retrieve the private aliased annotation_reader service in an after removing compiler pass. --- .../TestBundle/DependencyInjection/AnnotationReaderPass.php | 2 +- .../Bundle/TestBundle/DependencyInjection/TestExtension.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php index 2de08632fa144..53555fd664174 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/AnnotationReaderPass.php @@ -19,6 +19,6 @@ class AnnotationReaderPass implements CompilerPassInterface public function process(ContainerBuilder $container) { // simulate using "annotation_reader" in a compiler pass - $container->get('annotation_reader'); + $container->get('test.annotation_reader'); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php index 38ce8d3990514..66489374f6220 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php @@ -11,6 +11,7 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection; +use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\Extension; use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; @@ -26,6 +27,8 @@ public function load(array $configs, ContainerBuilder $container) { $configuration = $this->getConfiguration($configs, $container); $config = $this->processConfiguration($configuration, $configs); + + $container->setAlias('test.annotation_reader', new Alias('annotation_reader', true)); } /**