8000 rename option + add definition only if needed · symfony/symfony@19ee0b0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 19ee0b0

Browse files
dmaicherdmaicher
committed
rename option + add definition only if needed
1 parent 9dca09b commit 19ee0b0

File tree

9 files changed

+11
-17
lines changed

9 files changed

+11
-17
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function getConfigTreeBuilder()
107107
->beforeNormalization()->ifString()->then(function ($v) { return array($v); })->end()
108108
->prototype('scalar')->end()
109109
->end()
110-
->booleanNode('reset_services')->defaultFalse()->end()
110+
->booleanNode('reset_services_on_terminate')->defaultFalse()->end()
111111
->end()
112112
;
113113

‎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']) {
322-
$container->removeDefinition(ServiceResetListener::class);
321+
if ($config['reset_services_on_terminate']) {
322+
$container->register(ServiceResetListener::class)->addTag('kernel.event_subscriber');
323323
}
324324

325325
$this->addAnnotatedClassesToCompile(array(

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<xsd:attribute name="secret" type="xsd:string" />
3939
<xsd:attribute name="default-locale" type="xsd:string" />
4040
<xsd:attribute name="test" type="xsd:boolean" />
41-
<xsd:attribute name="reset-services" type="xsd:boolean" />
41+
<xsd:attribute name="reset-services-on-terminate" type="xsd:boolean" />
4242
</xsd:complexType>
4343

4444
<xsd:complexType name="form">

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,5 @@
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>
8377
</services>
8478
</container>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
352352
),
353353
),
354354
),
355-
'reset_services' => false,
355+
'reset_services_on_terminate' => false,
356356
);
357357
}
358358
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/reset_services.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22

33
$container->loadFromExtension('framework', array(
4-
'reset_services' => true,
4+
'reset_services_on_terminate' => true,
55
));

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/reset_services.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
77
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
88

9-
<framework:config reset-services="true" />
9+
<framework:config reset-services-on-terminate="true" />
1010
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/reset_services.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
framework:
2-
reset_services: true
2+
reset_services_on_terminate: true

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

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

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

1008-
public function testDoesNotRemoveServiceResetListenerDefWhenOptionSetToTrue()
1008+
public function testAddsServiceResetListenerDefWhenOptionSetToTrue()
10091009
{
10101010
$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));
10121012
}
10131013

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

0 commit comments

Comments
 (0)
0