From 46979074142e73ff3efb1eeab5c7ab1460f0e01b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Sun, 7 Jul 2019 17:53:50 +0200
Subject: [PATCH] [FrameworkBundle] Add support for autowiring ServicesResetter
 and make it always available

---
 .../Bundle/FrameworkBundle/Resources/config/services.xml   | 1 +
 .../DependencyInjection/ResettableServicePass.php          | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
index 10e641c83dd17..e23e5d8131c79 100644
--- 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
index c1199f639edf8..9c030f19c1a60 100644
--- 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);