Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1ee77ff

Browse filesBrowse files
xabbuhxabbuh
committed
deal with decorated constraint validator factories
1 parent 800f306 commit 1ee77ff
Copy full SHA for 1ee77ff

File tree

Expand file treeCollapse file tree

2 files changed

+43
-40
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+43
-40
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddConstraintValidatorsPass.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class AddConstraintValidatorsPass implements CompilerPassInterface
1919
{
2020
public function process(ContainerBuilder $container)
2121
{
22-
if (!$container->hasDefinition('validator.validator_factory')) {
22+
if (!$container->has('validator.validator_factory')) {
2323
return;
2424
}
2525

@@ -42,6 +42,6 @@ public function process(ContainerBuilder $container)
4242
$validators[$definition->getClass()] = $id;
4343
}
4444

45-
$container->getDefinition('validator.validator_factory')->replaceArgument(1, $validators);
45+
$container->findDefinition('validator.validator_factory')->replaceArgument(1, $validators);
4646
}
4747
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php
+41-38Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,67 +13,70 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddConstraintValidatorsPass;
16+
use Symfony\Component\DependencyInjection\ContainerBuilder;
17+
use Symfony\Component\DependencyInjection\Reference;
1618

1719
class AddConstraintValidatorsPassTest extends TestCase
1820
{
1921
public function testThatConstraintValidatorServicesAreProcessed()
2022
{
21-
$services = array(
22-
'my_constraint_validator_service1' => array(0 => array('alias' => 'my_constraint_validator_alias1')),
23-
'my_constraint_validator_service2' => array(),
24-
);
25-
26-
$validatorFactoryDefinition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
27-
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('findTaggedServiceIds', 'getDefinition', 'hasDefinition'))->getMock();
28-
29-
$validatorDefinition1 = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->setMethods(array('getClass'))->getMock();
30-
$validatorDefinition2 = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->setMethods(array('getClass'))->getMock();
23+
$container = new ContainerBuilder();
24+
$validatorFactoryDefinition = $container->register('validator.validator_factory')
25+
->setArguments(array(new Reference('service_container'), array()));
3126

32-
$validatorDefinition1->expects($this->atLeastOnce())
33-
->method('getClass')
34-
->willReturn('My\Fully\Qualified\Class\Named\Validator1');
35-
$validatorDefinition2->expects($this->atLeastOnce())
36-
->method('getClass')
37-
->willReturn('My\Fully\Qualified\Class\Named\Validator2');
27+
$container->register('my_constraint_validator_service1', 'My\Fully\Qualified\Class\Named\Validator1')
28+
->addTag('validator.constraint_validator', array('alias' => 'my_constraint_validator_alias1'));
29+
$container->register('my_constraint_validator_service2', 'My\Fully\Qualified\Class\Named\Validator2')
30+
->addTag('validator.constraint_validator');
3831

39-
$container->expects($this->any())
40-
->method('getDefinition')
41-
->with($this->anything())
42-
->will($this->returnValueMap(array(
43-
array('my_constraint_validator_service1', $validatorDefinition1),
44-
array('my_constraint_validator_service2', $validatorDefinition2),
45-
array('validator.validator_factory', $validatorFactoryDefinition),
46-
)));
47-
48-
$container->expects($this->atLeastOnce())
49-
->method('findTaggedServiceIds')
50-
->will($this->returnValue($services));
51-
$container->expects($this->atLeastOnce())
52-
->method('hasDefinition')
53-
->with('validator.validator_factory')
54-
->will($this->returnValue(true));
32+
$addConstraintValidatorsPass = new AddConstraintValidatorsPass();
33+
$addConstraintValidatorsPass->process($container);
5534

56-
$validatorFactoryDefinition->expects($this->once())
57-
->method('replaceArgument')
58-
->with(1, array(
35+
$this->assertEquals(
36+
array(
5937
'My\Fully\Qualified\Class\Named\Validator1' => 'my_constraint_validator_service1',
6038
'my_constraint_validator_alias1' => 'my_constraint_validator_service1',
6139
'My\Fully\Qualified\Class\Named\Validator2' => 'my_constraint_validator_service2',
62-
));
40+
),
41+
$validatorFactoryDefinition->getArgument(1)
42+
);
43+
}
44+
45+
public function testThatConstraintValidatorServicesAreProcessedIfTheValidatorFactoryIsDecorated()
46+
{
47+
$container = new ContainerBuilder();
48+
$validatorFactoryDefinition = $container->register('validator_factory_decorator.inner')
49+
->setArguments(array(new Reference('service_container'), array()));
50+
$container->register('validator_factory_decorator')->setArguments(array(new Reference('validator_factory_decorator.inner')));
51+
$container->setAlias('validator.validator_factory', 'validator_factory_decorator.inner');
52+
53+
$container->register('my_constraint_validator_service1', 'My\Fully\Qualified\Class\Named\Validator1')
54+
->addTag('validator.constraint_validator', array('alias' => 'my_constraint_validator_alias1'));
55+
$container->register('my_constraint_validator_service2', 'My\Fully\Qualified\Class\Named\Validator2')
56+
->addTag('validator.constraint_validator');
6357

6458
$addConstraintValidatorsPass = new AddConstraintValidatorsPass();
6559
$addConstraintValidatorsPass->process($container);
60+
61+
$this->assertEquals(
62+
array(
63+
'My\Fully\Qualified\Class\Named\Validator1' => 'my_constraint_validator_service1',
64+
'my_constraint_validator_alias1' => 'my_constraint_validator_service1',
65+
'My\Fully\Qualified\Class\Named\Validator2' => 'my_constraint_validator_service2',
66+
),
67+
$validatorFactoryDefinition->getArgument(1)
68+
);
6669
}
6770

6871
public function testThatCompilerPassIsIgnoredIfThereIsNoConstraintValidatorFactoryDefinition()
6972
{
7073
$definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
71-
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
74+
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('has', 'findTaggedServiceIds', 'getDefinition'))->getMock();
7275

7376
$container->expects($this->never())->method('findTaggedServiceIds');
7477
$container->expects($this->never())->method('getDefinition');
7578
$container->expects($this->atLeastOnce())
76-
->method('hasDefinition')
79+
->method('has')
7780
->with('validator.validator_factory')
7881
->will($this->returnValue(false));
7982
$definition->expects($this->never())->method('replaceArgument');

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.