[FrameworkBundle] Add support for autowiring ServicesResetter and make it always available

lyrixx · lyrixx · commit 46979074142e · 2019-07-07T17:59:00.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -112,6 +112,7 @@
         </service>
 
         <service id="services_resetter" class="Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter" public="true" />
+        <service id="Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter" alias="services_resetter" />
 
         <service id="reverse_container" class="Symfony\Component\DependencyInjection\ReverseContainer">
             <argument type="service" id="service_container" />
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/ResettableServicePass.php
@@ -52,13 +52,6 @@ public function process(ContainerBuilder $container)
             $methods[$id] = $attributes['method'];
         }
 
-        if (empty($services)) {
-            $container->removeAlias('services_resetter');
-            $container->removeDefinition('services_resetter');
-
-            return;
-        }
-
         $container->findDefinition('services_resetter')
             ->setArgument(0, new IteratorArgument($services))
             ->setArgument(1, $methods);
