8000 review feedback: add definition back to xml + rm if needed · symfony/symfony@8ae4629 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8ae4629

Browse files
dmaicherdmaicher
committed
review feedback: add definition back to xml + rm if needed
1 parent 02c90ef commit 8ae4629

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ public function load(array $configs, ContainerBuilder $container)
318318
$loader->load('web_link.xml');
319319
}
320320

321-
if ($config['reset_services_on_terminate']) {
322-
$container->register(ServiceResetListener::class)->addTag('kernel.event_subscriber')->setPublic(false);
321+
if (!$config['reset_services_on_terminate']) {
322+
$container->removeDefinition(ServiceResetListener::class);
323323
}
324324

325325
$this->addAnnotatedClassesToCompile(array(

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,11 @@
7474
<service id="Symfony\Component\Config\Resource\SelfCheckingResourceChecker">
7575
<tag name="config_cache.resource_checker" priority="-990" />
7676
</service>
77+
78+
<service id="Symfony\Component\HttpKernel\EventListener\ServiceResetListener">
79+
<argument /> <!-- ResettableServicePass will inject an iterator of initialized services here ($serviceId => $serviceInstance) -->
80+
<argument type="collection" /> <!-- ResettableServicePass will inject an array of reset methods here ($serviceId => $method) -->
81+
<tag name="kernel.event_subscriber" />
82+
</service>
7783
</services>
7884
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -999,19 +999,16 @@ public function testCachePoolServices()
999999
$this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.def', 'cache.app', 11);
10001000
}
10011001

1002-
public function testDoesNotAddServiceResetListenerDefWhenOptionSetToFalse()
1002+
public function testRemovesServiceResetListenerDefWhenOptionSetToFalse()
10031003
{
10041004
$container = $this->createContainerFromFile('default_config');
10051005
$this->assertFalse($container->hasDefinition(ServiceResetListener::class));
10061006
}
10071007

1008-
public function testAddsServiceResetListenerDefWhenOptionSetToTrue()
1008+
public function testDoesNotRemoveServiceResetListenerDefWhenOptionSetToTrue()
10091009
{
10101010
$container = $this->createContainerFromFile('reset_services');
1011-
$this->assertEquals(
1012-
(new Definition(ServiceResetListener::class))->addTag('kernel.event_subscriber')->setPublic(false),
1013-
$container->getDefinition(ServiceResetListener::class)
1014-
);
1011+
$this->assertTrue($container->hasDefinition(ServiceResetListener::class));
10151012
}
10161013

10171014
protected function createContainer(array $data = array())

0 commit comments

Comments
 (0)
0