Skip to content

Commit 5d230b5

Browse files
nicolas-grekasnicolas-grekas
committed
[DI] Introduce "container.service_locator" tag, replaces ServiceLocatorArgument
1 parent 18bbf37 commit 5d230b5

File tree

68 files changed

+141
-535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+141
-535
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Symfony\Component\DependencyInjection\Argument\ClosureProxyArgument;
1818
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
1919
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
20-
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
2120
use Symfony\Component\DependencyInjection\ContainerBuilder;
2221
use Symfony\Component\DependencyInjection\Definition;
2322
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -332,8 +331,6 @@ protected function describeContainerDefinition(Definition $definition, array $op
332331
$argumentsInformation[] = sprintf('Service(%s)', (string) $argument);
333332
} elseif ($argument instanceof IteratorArgument) {
334333
$argumentsInformation[] = sprintf('Iterator (%d element(s))', count($argument->getValues()));
335-
} elseif ($argument instanceof ServiceLocatorArgument) {
336-
$argumentsInformation[] = sprintf('ServiceLocator (%d service(s))', count($argument->getValues()));
337334
} elseif ($argument instanceof ClosureProxyArgument) {
338335
list($reference, $method) = $argument->getValues();
339336
$argumentsInformation[] = sprintf('ClosureProxy(Service(%s)::%s())', $reference, $method);

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\DependencyInjection\Argument\ClosureProxyArgument;
1616
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
1717
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
18-
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
1918
use Symfony\Component\DependencyInjection\ContainerBuilder;
2019
use Symfony\Component\DependencyInjection\Definition;
2120
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -436,12 +435,6 @@ private function getArgumentNodes(array $arguments, \DOMDocument $dom)
436435
} elseif ($argument instanceof IteratorArgument) {
437436
$argumentXML->setAttribute('type', 'iterator');
438437

439-
foreach ($this->getArgumentNodes($argument->getValues(), $dom) as $childArgumentXML) {
440-
$argumentXML->appendChild($childArgumentXML);
441-
}
442-
} elseif ($argument instanceof ServiceLocatorArgument) {
443-
$argumentXML->setAttribute('type', 'service-locator');
444-
445438
foreach ($this->getArgumentNodes($argument->getValues(), $dom) as $childArgumentXML) {
446439
$argumentXML->appendChild($childArgumentXML);
447440
}

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddConstraintValidatorsPass.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
1313

14-
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
14+
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
17+
use Symfony\Component\DependencyInjection\Definition;
1718
use Symfony\Component\DependencyInjection\Reference;
19+
use Symfony\Component\DependencyInjection\ServiceLocator;
1820

1921
class AddConstraintValidatorsPass implements CompilerPassInterface
2022
{
@@ -33,12 +35,12 @@ public function process(ContainerBuilder $container)
3335
}
3436

3537
if (isset($attributes[0]['alias'])) {
36-
$validators[$attributes[0]['alias']] = new Reference($id);
38+
$validators[$attributes[0]['alias']] = new ServiceClosureArgument(new Reference($id));
3739
}
3840

39-
$validators[$definition->getClass()] = new Reference($id);
41+
$validators[$definition->getClass()] = new ServiceClosureArgument(new Reference($id));
4042
}
4143

42-
$container->getDefinition('validator.validator_factory')->replaceArgument(0, new ServiceLocatorArgument($validators));
44+
$container->getDefinition('validator.validator_factory')->replaceArgument(0, (new Definition(ServiceLocator::class, array($validators)))->addTag('container.service_locator'));
4345
}
4446
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<!-- DependencyInjectionExtension -->
3232
<service id="form.extension" class="Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension" public="false">
33-
<argument type="service-locator" /><!-- All services with tag "form.type" are stored in a service locator by FormPass -->
33+
<argument /><!-- All services with tag "form.type" are stored in a service locator by FormPass -->
3434
<argument type="collection" /><!-- All services with tag "form.type_extension" are stored here by FormPass -->
3535
<argument type="iterator" /><!-- All services with tag "form.type_guesser" are stored here by FormPass -->
3636
</service>

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,13 @@
4949

5050
<service id="session_listener" class="Symfony\Component\HttpKernel\EventListener\SessionListener">
5151
<tag name="kernel.event_subscriber" />
52-
<argument type="service-locator">
53-
<argument key="session" type="service" id="session" on-invalid="null" />
52+
<argument type="service">
53+
<service class="Symfony\Component\DependencyInjection\ServiceLocator">
54+
<tag name="container.service_locator" />
55+
<argument type="collection">
56+
<argument key="session" type="service" id="session" on-invalid="ignore" />
57+
</argument>
58+
</service>
5459
</argument>
5560
</service>
5661

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,13 @@
2222

2323
<service id="test.session.listener" class="Symfony\Component\HttpKernel\EventListener\TestSessionListener">
2424
<tag name="kernel.event_subscriber" />
25-
<argument type="service-locator">
26-
<argument key="session" type="service" id="session" on-invalid="null" />
25+
<argument type="service">
26+
<service class="Symfony\Component\DependencyInjection\ServiceLocator">
27+
<tag name="container.service_locator" />
28+
<argument type="collection">
29+
<argument key="session" type="service" id="session" on-invalid="ignore" />
30+
</argument>
31+
</service>
2732
</argument>
2833
</service>
2934
</services>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</service>
5858

5959
<service id="validator.validator_factory" class="Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory" public="false">
60-
<argument type="service-locator" /> <!-- Constraint validators locator -->
60+
<argument /> <!-- Constraint validators locator -->
6161
</service>
6262

6363
<service id="validator.expression" class="Symfony\Component\Validator\Constraints\ExpressionValidator">

‎src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ private function assertDescription($expectedDescription, $describedObject, array
192192
$this->getDescriptor()->describe($output, $describedObject, $options);
193193

194194
if ('json' === $this->getFormat()) {
195-
$this->assertEquals(json_decode($expectedDescription), json_decode($output->fetch()));
195+
$this->assertEquals(json_encode(json_decode($expectedDescription), JSON_PRETTY_PRINT), json_encode(json_decode($output->fetch()), JSON_PRETTY_PRINT));
196196
} else {
197197
$this->assertEquals(trim($expectedDescription), trim(str_replace(PHP_EOL, "\n", $output->fetch())));
198198
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Symfony\Component\DependencyInjection\Alias;
1515
use Symfony\Component\DependencyInjection\Argument\ClosureProxyArgument;
1616
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
17-
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
1817
use Symfony\Component\DependencyInjection\ContainerBuilder;
1918
use Symfony\Component\DependencyInjection\Definition;
2019
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -121,10 +120,6 @@ public static function getContainerDefinitions()
121120
new Reference('definition_2'),
122121
)))
123122
->addArgument(new ClosureProxyArgument('definition1', 'get'))
124-
->addArgument(new ServiceLocatorArgument(array(
125-
'def1' => new Reference('definition_1'),
126-
'def2' => new Reference('definition_2'),
127-
)))
128123
->setFactory(array('Full\\Qualified\\FactoryClass', 'get')),
129124
'definition_2' => $definition2
130125
->setPublic(false)

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,19 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConstraintValidatorsPass;
16-
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
16+
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
1717
use Symfony\Component\DependencyInjection\ContainerBuilder;
18+
use Symfony\Component\DependencyInjection\Definition;
1819
use Symfony\Component\DependencyInjection\Reference;
20+
use Symfony\Component\DependencyInjection\ServiceLocator;
1921

2022
class AddConstraintValidatorsPassTest extends TestCase
2123
{
2224
public function testThatConstraintValidatorServicesAreProcessed()
2325
{
2426
$container = new ContainerBuilder();
2527
$validatorFactory = $container->register('validator.validator_factory')
26-
->setArguments(array(new ServiceLocatorArgument(array())));
28+
->addArgument(array());
2729

2830
$container->register('my_constraint_validator_service1', Validator1::class)
2931
->addTag('validator.constraint_validator', array('alias' => 'my_constraint_validator_alias1'));
@@ -36,11 +38,11 @@ public function testThatConstraintValidatorServicesAreProcessed()
3638
$addConstraintValidatorsPass = new AddConstraintValidatorsPass();
3739
$addConstraintValidatorsPass->process($container);
3840

39-
$this->assertEquals(new ServiceLocatorArgument(array(
40-
Validator1::class => new Reference('my_constraint_validator_service1'),
41-
'my_constraint_validator_alias1' => new Reference('my_constraint_validator_service1'),
42-
Validator2::class => new Reference('my_constraint_validator_service2'),
43-
)), $validatorFactory->getArgument(0));
41+
$this->assertEquals((new Definition(ServiceLocator::class, array(array(
42+
Validator1::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
43+
'my_constraint_validator_alias1' => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
44+
Validator2::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service2')),
45+
))))->addTag('container.service_locator'), $validatorFactory->getArgument(0));
4446
}
4547

4648
public function testThatCompilerPassIsIgnoredIfThereIsNoConstraintValidatorFactoryDefinition()

0 commit comments

Comments
 (0)