#21809 [SecurityBundle] bugfix: if security provider's name contains upper cases then container didn't compile

Antanas Arvasevicius · Antanas Arvasevicius · commit 7625f9eda89f · 2017-03-01T15:43:55.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -558,7 +558,7 @@ private function createUserProviders($config, ContainerBuilder $container)
     // Parses a <provider> tag and returns the id for the related user provider service
     private function createUserDaoProvider($name, $provider, ContainerBuilder $container)
     {
-        $name = $this->getUserProviderId(strtolower($name));
+        $name = $this->getUserProviderId($name);
 
         // Doctrine Entity and In-memory DAO provider are managed by factories
         foreach ($this->userProviderFactories as $factory) {
@@ -582,7 +582,7 @@ private function createUserDaoProvider($name, $provider, ContainerBuilder $conta
         if (isset($provider['chain'])) {
             $providers = array();
             foreach ($provider['chain']['providers'] as $providerName) {
-                $providers[] = new Reference($this->getUserProviderId(strtolower($providerName)));
+                $providers[] = new Reference($this->getUserProviderId($providerName));
             }
 
             $container
@@ -597,7 +597,7 @@ private function createUserDaoProvider($name, $provider, ContainerBuilder $conta
 
     private function getUserProviderId($name)
     {
-        return 'security.user.provider.concrete.'.$name;
+        return 'security.user.provider.concrete.'.strtolower($name);
     }
 
     private function createExceptionListener($container, $config, $id, $defaultEntryPoint, $stateless)
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CamelCasedProviders/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CamelCasedProviders/bundles.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return array(
+    new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+    new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+    new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+    new Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AclBundle\AclBundle(),
+);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CamelCasedProviders/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CamelCasedProviders/config.yml
@@ -0,0 +1,23 @@
+imports:
+    - { resource: ./../config/framework.yml }
+
+doctrine:
+    dbal:
+        driver:   pdo_sqlite
+        memory:   true
+        charset:  UTF8
+
+security:
+
+    firewalls:
+        default:
+            anonymous: ~
+            provider: camelCasedName
+
+    encoders:
+        Symfony\Component\Security\Core\User\User: plaintext
+
+    providers:
+        camelCasedName:
+            entity:
+                class: Symfony\Component\Security\Core\User\User
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CamelCasedProvidersCausesExceptionsTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CamelCasedProvidersCausesExceptionsTest.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
+
+class CamelCasedProvidersCausesExceptionsTest extends WebTestCase
+{
+    public function testBugfixExceptionThenCamelCasedProviderIsGiven()
+    {
+        $client = $this->createClient(array('test_case' => 'CamelCasedProviders', 'root_config' => 'config.yml'));
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ private function createUserProviders($config, ContainerBuilder $container)`
`558`	`558`	`// Parses a <provider> tag and returns the id for the related user provider service`
`559`	`559`	`private function createUserDaoProvider($name, $provider, ContainerBuilder $container)`
`560`	`560`	`{`
`561`		`- $name = $this->getUserProviderId(strtolower($name));`
	`561`	`+ $name = $this->getUserProviderId($name);`
`562`	`562`
`563`	`563`	`// Doctrine Entity and In-memory DAO provider are managed by factories`
`564`	`564`	`foreach ($this->userProviderFactories as $factory) {`
`@@ -582,7 +582,7 @@ private function createUserDaoProvider($name, $provider, ContainerBuilder $conta`
`582`	`582`	`if (isset($provider['chain'])) {`
`583`	`583`	`$providers = array();`
`584`	`584`	`foreach ($provider['chain']['providers'] as $providerName) {`
`585`		`- $providers[] = new Reference($this->getUserProviderId(strtolower($providerName)));`
	`585`	`+ $providers[] = new Reference($this->getUserProviderId($providerName));`
`586`	`586`	`}`
`587`	`587`
`588`	`588`	`$container`
`@@ -597,7 +597,7 @@ private function createUserDaoProvider($name, $provider, ContainerBuilder $conta`
`597`	`597`
`598`	`598`	`private function getUserProviderId($name)`
`599`	`599`	`{`
`600`		`- return 'security.user.provider.concrete.'.$name;`
	`600`	`+ return 'security.user.provider.concrete.'.strtolower($name);`
`601`	`601`	`}`
`602`	`602`
`603`	`603`	`private function createExceptionListener($container, $config, $id, $defaultEntryPoint, $stateless)`