8000 merged branch DenisGorbachev/patch-1 (PR #6046) · rvdbogerd/symfony@b358748 · GitHub
[go: up one dir, main page]

Skip to content

Commit b358748

Browse files
committed
merged branch DenisGorbachev/patch-1 (PR symfony#6046)
This PR was merged into the master branch. Commits ------- acbb393 Renamed variable for consistency Discussion ---------- [SecurityBundle] Renamed variable for consistency Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - License of the code: MIT Documentation PR: -
2 parents 7e88ecc + acbb393 commit b358748

File tree

1 file changed

+3
-3
lines changed
  • src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory

1 file changed

+3
-3
lines changed

src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/X509Factory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class X509Factory implements SecurityFactoryInterface
2727
{
2828
public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
2929
{
30-
$provider = 'security.authentication.provider.pre_authenticated.'.$id;
30+
$providerId = 'security.authentication.provider.pre_authenticated.'.$id;
3131
$container
32-
->setDefinition($provider, new DefinitionDecorator('security.authentication.provider.pre_authenticated'))
32+
->setDefinition($providerId, new DefinitionDecorator('security.authentication.provider.pre_authenticated'))
3333
->replaceArgument(0, new Reference($userProvider))
3434
->addArgument($id)
3535
;
@@ -41,7 +41,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
4141
$listener->replaceArgument(3, $config['user']);
4242
$listener->replaceArgument(4, $config['credentials']);
4343

44-
return array($provider, $listenerId, $defaultEntryPoint);
44+
return array($providerId, $listenerId, $defaultEntryPoint);
4545
}
4646

4747
public function getPosition()

0 commit comments

Comments
 (0)
0