bug symfony#22866 [DI] Check for privates before shared services (ro0NL)

fabpot · fabpot · commit 44e28e36e422 · 2017-05-24T16:25:02.000+02:00
This PR was merged into the 3.2 branch. Discussion ---------- [DI] Check for privates before shared services | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#22801 (comment), symfony#22801 (comment) | License | MIT | Doc PR | symfony/symfony-docs#...  cc @stof Commits ------- 4f683a9 [DI] Check for privates before shared services
diff --git a/Tests/DependencyInjection/WebProfilerExtensionTest.php b/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -27,10 +27,13 @@ class WebProfilerExtensionTest extends TestCase
      */
     private $container;
 
-    public static function assertSaneContainer(Container $container, $message = '')
+    public static function assertSaneContainer(Container $container, $message = '', $knownPrivates = array())
     {
         $errors = array();
         foreach ($container->getServiceIds() as $id) {
+            if (in_array($id, $knownPrivates, true)) { // to be removed in 4.0
+                continue;
+            }
             try {
                 $container->get($id);
             } catch (\Exception $e) {
@@ -98,7 +101,7 @@ public function testToolbarConfig($toolbarEnabled, $interceptRedirects, $listene
 
         $this->assertSame($listenerInjected, $this->container->has('web_profiler.debug_toolbar'));
 
-        $this->assertSaneContainer($this->getDumpedContainer());
+        $this->assertSaneContainer($this->getDumpedContainer(), '', array('web_profiler.csp.handler'));
 
         if ($listenerInjected) {
             $this->assertSame($listenerEnabled, $this->container->get('web_profiler.debug_toolbar')->isEnabled());
