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

Commite9040b5

Browse files
committed
Moved security expression provider pass to SecurityBundle
1 parentb560883 commite9040b5

File tree

6 files changed

+97
-45
lines changed

6 files changed

+97
-45
lines changed

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ CHANGELOG
66

77
* Allowed configuring taggable cache pools via a new`framework.cache.pools.tags` option (bool|service-id)
88
* Deprecated auto-injection of the container in AbstractController instances, register them as service subscribers instead
9+
* Moved the processing of services tagged`security.expression_language_provider` to the SecurityBundle
910

1011
4.1.0
1112
-----

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,5 @@ public function process(ContainerBuilder $container)
3434
$definition->addMethodCall('addExpressionLanguageProvider',array(newReference($id)));
3535
}
3636
}
37-
38-
// security
39-
if ($container->has('security.expression_language')) {
40-
$definition =$container->findDefinition('security.expression_language');
41-
foreach ($container->findTaggedServiceIds('security.expression_language_provider',true)as$id =>$attributes) {
42-
$definition->addMethodCall('registerProvider',array(newReference($id)));
43-
}
44-
}
4537
}
4638
}

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

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -57,41 +57,4 @@ public function testProcessForRouterAlias()
5757
$this->assertEquals('addExpressionLanguageProvider',$calls[0][0]);
5858
$this->assertEquals(newReference('some_routing_provider'),$calls[0][1][0]);
5959
}
60-
61-
publicfunctiontestProcessForSecurity()
62-
{
63-
$container =newContainerBuilder();
64-
$container->addCompilerPass(newAddExpressionLanguageProvidersPass());
65-
66-
$definition =newDefinition('\stdClass');
67-
$definition->addTag('security.expression_language_provider');
68-
$container->setDefinition('some_security_provider',$definition->setPublic(true));
69-
70-
$container->register('security.expression_language','\stdClass')->setPublic(true);
71-
$container->compile();
72-
73-
$calls =$container->getDefinition('security.expression_language')->getMethodCalls();
74-
$this->assertCount(1,$calls);
75-
$this->assertEquals('registerProvider',$calls[0][0]);
76-
$this->assertEquals(newReference('some_security_provider'),$calls[0][1][0]);
77-
}
78-
79-
publicfunctiontestProcessForSecurityAlias()
80-
{
81-
$container =newContainerBuilder();
82-
$container->addCompilerPass(newAddExpressionLanguageProvidersPass());
83-
84-
$definition =newDefinition('\stdClass');
85-
$definition->addTag('security.expression_language_provider');
86-
$container->setDefinition('some_security_provider',$definition->setPublic(true));
87-
88-
$container->register('my_security.expression_language','\stdClass')->setPublic(true);
89-
$container->setAlias('security.expression_language','my_security.expression_language');
90-
$container->compile();
91-
92-
$calls =$container->getDefinition('my_security.expression_language')->getMethodCalls();
93-
$this->assertCount(1,$calls);
94-
$this->assertEquals('registerProvider',$calls[0][0]);
95-
$this->assertEquals(newReference('some_security_provider'),$calls[0][1][0]);
96-
}
9760
}

‎src/Symfony/Bundle/SecurityBundle/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CHANGELOG
99
the token classes is deprecated. To use
1010
custom tokens extend the existing`Symfony\Component\Security\Core\Authentication\Token\AnonymousToken`
1111
or`Symfony\Component\Security\Core\Authentication\Token\RememberMeToken`.
12+
* Added`Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\AddExpressionLanguageProvidersPass`
1213

1314
4.1.0
1415
-----
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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\SecurityBundle\DependencyInjection\Compiler;
13+
14+
useSymfony\Component\DependencyInjection\ContainerBuilder;
15+
useSymfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
16+
useSymfony\Component\DependencyInjection\Reference;
17+
18+
/**
19+
* Registers the expression language providers.
20+
*
21+
* @author Fabien Potencier <fabien@symfony.com>
22+
*/
23+
class AddExpressionLanguageProvidersPassimplements CompilerPassInterface
24+
{
25+
/**
26+
* {@inheritdoc}
27+
*/
28+
publicfunctionprocess(ContainerBuilder$container)
29+
{
30+
if ($container->has('security.expression_language')) {
31+
$definition =$container->findDefinition('security.expression_language');
32+
foreach ($container->findTaggedServiceIds('security.expression_language_provider',true)as$id =>$attributes) {
33+
$definition->addMethodCall('registerProvider',array(newReference($id)));
34+
}
35+
}
36+
}
37+
}
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
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\SecurityBundle\Tests\DependencyInjection\Compiler;
13+
14+
usePHPUnit\Framework\TestCase;
15+
useSymfony\Component\DependencyInjection\ContainerBuilder;
16+
useSymfony\Component\DependencyInjection\Definition;
17+
useSymfony\Component\DependencyInjection\Reference;
18+
useSymfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddExpressionLanguageProvidersPass;
19+
20+
class AddExpressionLanguageProvidersPassTestextends TestCase
21+
{
22+
publicfunctiontestProcessForSecurity()
23+
{
24+
$container =newContainerBuilder();
25+
$container->addCompilerPass(newAddExpressionLanguageProvidersPass());
26+
27+
$definition =newDefinition('\stdClass');
28+
$definition->addTag('security.expression_language_provider');
29+
$container->setDefinition('some_security_provider',$definition->setPublic(true));
30+
31+
$container->register('security.expression_language','\stdClass')->setPublic(true);
32+
$container->compile();
33+
34+
$calls =$container->getDefinition('security.expression_language')->getMethodCalls();
35+
$this->assertCount(1,$calls);
36+
$this->assertEquals('registerProvider',$calls[0][0]);
37+
$this->assertEquals(newReference('some_security_provider'),$calls[0][1][0]);
38+
}
39+
40+
publicfunctiontestProcessForSecurityAlias()
41+
{
42+
$container =newContainerBuilder();
43+
$container->addCompilerPass(newAddExpressionLanguageProvidersPass());
44+
45+
$definition =newDefinition('\stdClass');
46+
$definition->addTag('security.expression_language_provider');
47+
$container->setDefinition('some_security_provider',$definition->setPublic(true));
48+
49+
$container->register('my_security.expression_language','\stdClass')->setPublic(true);
50+
$container->setAlias('security.expression_language','my_security.expression_language');
51+
$container->compile();
52+
53+
$calls =$container->getDefinition('my_security.expression_language')->getMethodCalls();
54+
$this->assertCount(1,$calls);
55+
$this->assertEquals('registerProvider',$calls[0][0]);
56+
$this->assertEquals(newReference('some_security_provider'),$calls[0][1][0]);
57+
}
58+
}

0 commit comments

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