Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commitd13db62

Browse files
committed
minor #18529 [HttpKernel] Renamed the argument resolver tag (iltar)
This PR was merged into the 3.1-dev branch.Discussion----------[HttpKernel] Renamed the argument resolver tag| Q | A| ------------- | ---| Branch? | master| Bug fix? | no| New feature? | no| BC breaks? | not if merged before 3.1| Deprecations? | no| Tests pass? | yes| Fixed tickets | ~| License | MIT| Doc PR | ~Changed as discussed several times:symfony/symfony#18510 (comment),symfony/symfony-docs#6422 (comment).Commits-------cd10057 Renamed argument resolver tag, added test
2 parents151fe5a +983b892 commitd13db62

File tree

3 files changed

+69
-5
lines changed

3 files changed

+69
-5
lines changed

‎DependencyInjection/Compiler/ControllerArgumentValueResolverPass.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function process(ContainerBuilder $container)
2929
}
3030

3131
$definition =$container->getDefinition('argument_resolver');
32-
$argumentResolvers =$this->findAndSortTaggedServices('controller_argument.value_resolver',$container);
32+
$argumentResolvers =$this->findAndSortTaggedServices('controller.argument_value_resolver',$container);
3333
$definition->replaceArgument(1,$argumentResolvers);
3434
}
3535

‎Resources/config/web.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
</service>
2626

2727
<serviceid="argument_resolver.request_attribute"class="Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestAttributeValueResolver"public="false">
28-
<tagname="controller_argument.value_resolver"priority="100" />
28+
<tagname="controller.argument_value_resolver"priority="100" />
2929
</service>
3030

3131
<serviceid="argument_resolver.request"class="Symfony\Component\HttpKernel\Controller\ArgumentResolver\RequestValueResolver"public="false">
32-
<tagname="controller_argument.value_resolver"priority="50" />
32+
<tagname="controller.argument_value_resolver"priority="50" />
3333
</service>
3434

3535
<serviceid="argument_resolver.default"class="Symfony\Component\HttpKernel\Controller\ArgumentResolver\DefaultValueResolver"public="false">
36-
<tagname="controller_argument.value_resolver"priority="-100" />
36+
<tagname="controller.argument_value_resolver"priority="-100" />
3737
</service>
3838

3939
<serviceid="argument_resolver.variadic"class="Symfony\Component\HttpKernel\Controller\ArgumentResolver\VariadicValueResolver"public="false">
40-
<tagname="controller_argument.value_resolver"priority="-150" />
40+
<tagname="controller.argument_value_resolver"priority="-150" />
4141
</service>
4242

4343
<serviceid="response_listener"class="Symfony\Component\HttpKernel\EventListener\ResponseListener">
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespaceSymfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
13+
14+
useSymfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ControllerArgumentValueResolverPass;
15+
useSymfony\Component\DependencyInjection\ContainerBuilder;
16+
useSymfony\Component\DependencyInjection\Definition;
17+
useSymfony\Component\DependencyInjection\Reference;
18+
useSymfony\Component\HttpKernel\Controller\ArgumentResolver;
19+
20+
class ControllerArgumentValueResolverPassTestextends \PHPUnit_Framework_TestCase
21+
{
22+
publicfunctiontestServicesAreOrderedAccordingToPriority()
23+
{
24+
$services =array(
25+
'n3' =>array(array()),
26+
'n1' =>array(array('priority' =>200)),
27+
'n2' =>array(array('priority' =>100)),
28+
);
29+
30+
$expected =array(
31+
newReference('n1'),
32+
newReference('n2'),
33+
newReference('n3'),
34+
);
35+
36+
$definition =newDefinition(ArgumentResolver::class,array(null,array()));
37+
$container =newContainerBuilder();
38+
$container->setDefinition('argument_resolver',$definition);
39+
40+
foreach ($servicesas$id =>list($tag)) {
41+
$container->register($id)->addTag('controller.argument_value_resolver',$tag);
42+
}
43+
44+
(newControllerArgumentValueResolverPass())->process($container);
45+
$this->assertEquals($expected,$definition->getArgument(1));
46+
}
47+
48+
publicfunctiontestReturningEmptyArrayWhenNoService()
49+
{
50+
$definition =newDefinition(ArgumentResolver::class,array(null,array()));
51+
$container =newContainerBuilder();
52+
$container->setDefinition('argument_resolver',$definition);
53+
54+
(newControllerArgumentValueResolverPass())->process($container);
55+
$this->assertEquals(array(),$definition->getArgument(1));
56+
}
57+
58+
publicfunctiontestNoArgumentResolver()
59+
{
60+
$container =newContainerBuilder();
61+
62+
(newControllerArgumentValueResolverPass())->process($container);
63+
}
64+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp