[HttpKernel] fix merge

nicolas-grekas · nicolas-grekas · commit dc5be0062828 · 2022-12-16T16:06:54.000+01:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -33,8 +33,12 @@ class WebProfilerExtensionTest extends TestCase
 
     public static function assertSaneContainer(Container $container)
     {
+        $removedIds = $container->getRemovedIds();
         $errors = [];
         foreach ($container->getServiceIds() as $id) {
+            if (isset($removedIds[$id])) {
+                continue;
+            }
             try {
                 $container->get($id);
             } catch (\Exception $e) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -467,7 +467,7 @@ public function testAutowireAttribute()
         $container = new ContainerBuilder();
         $resolver = $container->register('argument_resolver.service', 'stdClass')->addArgument([]);
 
-        $container->register('some.id', \stdClass::class);
+        $container->register('some.id', \stdClass::class)->setPublic(true);
         $container->setParameter('some.parameter', 'foo');
 
         $container->register('foo', WithAutowireAttribute::class)
