minor #25745 [FrameworkBundle] fix tests (xabbuh)

fabpot · fabpot · commit ae101f46256b · 2018-01-10T18:53:26.000+01:00
This PR was merged into the 4.0 branch. Discussion ---------- [FrameworkBundle] fix tests | Q | A | ------------- | --- | Branch? | 4.0 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Add a public alias so that we can retrieve the private aliased annotation_reader service in an after removing compiler pass. Commits ------- 821ca52 [FrameworkBundle] fix tests
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
@@ -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
@@ -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));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ class AnnotationReaderPass implements CompilerPassInterface`
`19`	`19`	`public function process(ContainerBuilder $container)`
`20`	`20`	`{`
`21`	`21`	`// simulate using "annotation_reader" in a compiler pass`
`22`		`- $container->get('annotation_reader');`
	`22`	`+ $container->get('test.annotation_reader');`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection;`
`13`	`13`
	`14`	`+use Symfony\Component\DependencyInjection\Alias;`
`14`	`15`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`15`	`16`	`use Symfony\Component\DependencyInjection\Extension\Extension;`
`16`	`17`	`use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;`
`@@ -26,6 +27,8 @@ public function load(array $configs, ContainerBuilder $container)`
`26`	`27`	`{`
`27`	`28`	`$configuration = $this->getConfiguration($configs, $container);`
`28`	`29`	`$config = $this->processConfiguration($configuration, $configs);`
	`30`	`+`
	`31`	`+ $container->setAlias('test.annotation_reader', new Alias('annotation_reader', true));`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`/**`