rename option + add definition only if needed

dmaicher · dmaicher · commit b667029f6958 · 2017-10-16T20:08:54.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -107,7 +107,7 @@ public function getConfigTreeBuilder()
                     ->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
                     ->prototype('scalar')->end()
                 ->end()
-                ->booleanNode('reset_services')->defaultFalse()->end()
+                ->booleanNode('reset_services_on_terminate')->defaultFalse()->end()
             ->end()
         ;
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -318,8 +318,9 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('web_link.xml');
         }
 
-        if (!$config['reset_services']) {
-            $container->removeDefinition(ServiceResetListener::class);
+        if ($config['reset_services_on_terminate']) {
+            $container->register(ServiceResetListener::class)
+                ->addTag('kernel.event_subscriber');
         }
 
         $this->addAnnotatedClassesToCompile(array(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -38,7 +38,7 @@
         <xsd:attribute name="secret" type="xsd:string" />
         <xsd:attribute name="default-locale" type="xsd:string" />
         <xsd:attribute name="test" type="xsd:boolean" />
-        <xsd:attribute name="reset-services" type="xsd:boolean" />
+        <xsd:attribute name="reset-services-on-terminate" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:complexType name="form">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -74,11 +74,5 @@
         <service id="Symfony\Component\Config\Resource\SelfCheckingResourceChecker">
             <tag name="config_cache.resource_checker" priority="-990" />
         </service>
-
-        <service id="Symfony\Component\HttpKernel\EventListener\ServiceResetListener">
-            <argument /> <!-- ResettableServicePass will inject an iterator of initialized services here ($serviceId => $serviceInstance) -->
-            <argument type="collection" /> <!-- ResettableServicePass will inject an array of reset methods here ($serviceId => $method) -->
-            <tag name="kernel.event_subscriber" />
-        </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -352,7 +352,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
                     ),
                 ),
             ),
-            'reset_services' => false,
+            'reset_services_on_terminate' => false,
         );
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/reset_services.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/reset_services.php
@@ -1,5 +1,5 @@
 <?php
 
 $container->loadFromExtension('framework', array(
-    'reset_services' => true,
+    'reset_services_on_terminate' => true,
 ));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/reset_services.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/reset_services.xml
@@ -6,5 +6,5 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
                         http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
-    <framework:config reset-services="true" />
+    <framework:config reset-services-on-terminate="true" />
 </container>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/reset_services.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/reset_services.yml
@@ -1,2 +1,2 @@
 framework:
-    reset_services: true
+    reset_services_on_terminate: true
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -999,16 +999,16 @@ public function testCachePoolServices()
         $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.def', 'cache.app', 11);
     }
 
-    public function testRemovesServiceResetListenerDefWhenOptionSetToFalse()
+    public function testDoesNotAddServiceResetListenerDefWhenOptionSetToFalse()
     {
         $container = $this->createContainerFromFile('default_config');
         $this->assertFalse($container->hasDefinition(ServiceResetListener::class));
     }
 
-    public function testDoesNotRemoveServiceResetListenerDefWhenOptionSetToTrue()
+    public function testAddsServiceResetListenerDefWhenOptionSetToTrue()
     {
         $container = $this->createContainerFromFile('reset_services');
-        $this->assertTrue($container->hasDefinition(ServiceResetListener::class));
+        $this->assertEquals((new Definition(ServiceResetListener::class))->addTag('kernel.event_subscriber'), $container->getDefinition(ServiceResetListener::class));
     }
 
     protected function createContainer(array $data = array())

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function getConfigTreeBuilder()`
`107`	`107`	`->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()`
`108`	`108`	`->prototype('scalar')->end()`
`109`	`109`	`->end()`
`110`		`- ->booleanNode('reset_services')->defaultFalse()->end()`
	`110`	`+ ->booleanNode('reset_services_on_terminate')->defaultFalse()->end()`
`111`	`111`	`->end()`
`112`	`112`	`;`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -318,8 +318,9 @@ public function load(array $configs, ContainerBuilder $container)`
`318`	`318`	`$loader->load('web_link.xml');`
`319`	`319`	`}`
`320`	`320`
`321`		`- if (!$config['reset_services']) {`
`322`		`- $container->removeDefinition(ServiceResetListener::class);`
	`321`	`+ if ($config['reset_services_on_terminate']) {`
	`322`	`+ $container->register(ServiceResetListener::class)`
	`323`	`+ ->addTag('kernel.event_subscriber');`
`323`	`324`	`}`
`324`	`325`
`325`	`326`	`$this->addAnnotatedClassesToCompile(array(`
Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor`
`352`	`352`	`),`
`353`	`353`	`),`
`354`	`354`	`),`
`355`		`- 'reset_services' => false,`
	`355`	`+ 'reset_services_on_terminate' => false,`
`356`	`356`	`);`
`357`	`357`	`}`
`358`	`358`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`framework:`
`2`		`- reset_services: true`
	`2`	`+ reset_services_on_terminate: true`
Original file line number	Diff line number	Diff line change
`@@ -999,16 +999,16 @@ public function testCachePoolServices()`
`999`	`999`	`$this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.def', 'cache.app', 11);`
`1000`	`1000`	`}`
`1001`	`1001`
`1002`		`- public function testRemovesServiceResetListenerDefWhenOptionSetToFalse()`
	`1002`	`+ public function testDoesNotAddServiceResetListenerDefWhenOptionSetToFalse()`
`1003`	`1003`	`{`
`1004`	`1004`	`$container = $this->createContainerFromFile('default_config');`
`1005`	`1005`	`$this->assertFalse($container->hasDefinition(ServiceResetListener::class));`
`1006`	`1006`	`}`
`1007`	`1007`
`1008`		`- public function testDoesNotRemoveServiceResetListenerDefWhenOptionSetToTrue()`
	`1008`	`+ public function testAddsServiceResetListenerDefWhenOptionSetToTrue()`
`1009`	`1009`	`{`
`1010`	`1010`	`$container = $this->createContainerFromFile('reset_services');`
`1011`		`- $this->assertTrue($container->hasDefinition(ServiceResetListener::class));`
	`1011`	`+ $this->assertEquals((new Definition(ServiceResetListener::class))->addTag('kernel.event_subscriber'), $container->getDefinition(ServiceResetListener::class));`
`1012`	`1012`	`}`
`1013`	`1013`
`1014`	`1014`	`protected function createContainer(array $data = array())`