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 7c45e6b

Browse filesBrowse files
xabbuhxabbuh
committed
deal with a decorated validator service
1 parent 800f306 commit 7c45e6b
Copy full SHA for 7c45e6b

File tree

2 files changed

+20
-43
lines changed
Filter options

2 files changed

+20
-43
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
+18-41Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,67 +13,44 @@
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();
31-
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');
23+
$container = new ContainerBuilder();
24+
$validatorFactoryDefinition = $container->register('validator.validator_factory')
25+
->setArguments(array(new Reference('service_container'), array()));
3826

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-
)));
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');
4731

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-
));
63-
64-
$addConstraintValidatorsPass = new AddConstraintValidatorsPass();
65-
$addConstraintValidatorsPass->process($container);
40+
),
41+
$validatorFactoryDefinition->getArgument(1)
42+
);
6643
}
6744

6845
public function testThatCompilerPassIsIgnoredIfThereIsNoConstraintValidatorFactoryDefinition()
6946
{
7047
$definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
71-
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
48+
$container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('has', 'findTaggedServiceIds', 'getDefinition'))->getMock();
7249

7350
$container->expects($this->never())->method('findTaggedServiceIds');
7451
$container->expects($this->never())->method('getDefinition');
7552
$container->expects($this->atLeastOnce())
76-
->method('hasDefinition')
53+
->method('has')
7754
->with('validator.validator_factory')
7855
->will($this->returnValue(false));
7956
$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.