merged branch DenisGorbachev/patch-1 (PR #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: -

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

@@ -27,9 +27,9 @@ class X509Factory implements SecurityFactoryInterface
 {
     public function create(ContainerBuilder $container, $id, $config, $userProvider, $defaultEntryPoint)
     {
-        $provider = 'security.authentication.provider.pre_authenticated.'.$id;
+        $providerId = 'security.authentication.provider.pre_authenticated.'.$id;
         $container
-            ->setDefinition($provider, new DefinitionDecorator('security.authentication.provider.pre_authenticated'))
+            ->setDefinition($providerId, new DefinitionDecorator('security.authentication.provider.pre_authenticated'))
             ->replaceArgument(0, new Reference($userProvider))
             ->addArgument($id)
         ;
@@ -41,7 +41,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
         $listener->replaceArgument(3, $config['user']);
         $listener->replaceArgument(4, $config['credentials']);
 
-        return array($provider, $listenerId, $defaultEntryPoint);
+        return array($providerId, $listenerId, $defaultEntryPoint);
     }
 
     public function getPosition()