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

Commitfaafec4

Browse files
committed
bug#37044 [DependencyInjection] Apply ExpressionLanguageProviderPass to router.default (wizhippo)
This PR was squashed before being merged into the 5.1 branch.Discussion----------[DependencyInjection] Apply ExpressionLanguageProviderPass to router.default| Q | A| ------------- | ---| Branch? | 5.1| Bug fix? | yes| New feature? | no| Deprecations? | no| Tickets |Fix#37042| License | MITUsing a `chain_router` usually replaces the `router` and add the `router.default` to it's chain.This would `addExpressionLanguageProvider` to the default router only as the chain router is not expected to have `addExpressionLanguageProvider` as it is not part of the router interface.Commits-------215ad1f [DependencyInjection] Apply ExpressionLanguageProviderPass to router.default
2 parents69c37c0 +215ad1f commitfaafec4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class AddExpressionLanguageProvidersPass implements CompilerPassInterface
2828
publicfunctionprocess(ContainerBuilder$container)
2929
{
3030
// routing
31-
if ($container->has('router')) {
32-
$definition =$container->findDefinition('router');
31+
if ($container->has('router.default')) {
32+
$definition =$container->findDefinition('router.default');
3333
foreach ($container->findTaggedServiceIds('routing.expression_language_provider',true)as$id =>$attributes) {
3434
$definition->addMethodCall('addExpressionLanguageProvider', [newReference($id)]);
3535
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ class AddExpressionLanguageProvidersPassTest extends TestCase
2222
publicfunctiontestProcessForRouter()
2323
{
2424
$container =newContainerBuilder();
25-
$container->addCompilerPass(newAddExpressionLanguageProvidersPass(false));
25+
$container->addCompilerPass(newAddExpressionLanguageProvidersPass());
2626

2727
$definition =newDefinition('\stdClass');
2828
$definition->addTag('routing.expression_language_provider');
2929
$container->setDefinition('some_routing_provider',$definition->setPublic(true));
3030

31-
$container->register('router','\stdClass')->setPublic(true);
31+
$container->register('router.default','\stdClass')->setPublic(true);
3232
$container->compile();
3333

34-
$router =$container->getDefinition('router');
34+
$router =$container->getDefinition('router.default');
3535
$calls =$router->getMethodCalls();
3636
$this->assertCount(1,$calls);
3737
$this->assertEquals('addExpressionLanguageProvider',$calls[0][0]);
@@ -41,14 +41,14 @@ public function testProcessForRouter()
4141
publicfunctiontestProcessForRouterAlias()
4242
{
4343
$container =newContainerBuilder();
44-
$container->addCompilerPass(newAddExpressionLanguageProvidersPass(false));
44+
$container->addCompilerPass(newAddExpressionLanguageProvidersPass());
4545

4646
$definition =newDefinition('\stdClass');
4747
$definition->addTag('routing.expression_language_provider');
4848
$container->setDefinition('some_routing_provider',$definition->setPublic(true));
4949

5050
$container->register('my_router','\stdClass')->setPublic(true);
51-
$container->setAlias('router','my_router');
51+
$container->setAlias('router.default','my_router');
5252
$container->compile();
5353

5454
$router =$container->getDefinition('my_router');

0 commit comments

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