Merge branch '5.0'

* 5.0:
  [DI] fix merge

Author: nicolas-grekas

Tests/Fixtures/php/services_subscriber.php

@@ -45,8 +45,8 @@ public function isCompiled(): bool
     public function getRemovedIds(): array
     {
         return [
-            '.service_locator.bPEFRiK' => true,
-            '.service_locator.bPEFRiK.foo_service' => true,
+            '.service_locator.2Wk0Efb' => true,
+            '.service_locator.2Wk0Efb.foo_service' => true,
             'Psr\\Container\\ContainerInterface' => true,
             'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
             'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => true,