merged branch lyrixx/fix-security-config (PR #7528)

fabpot · fabpot · commit e57b4e5bc4e8 · 2013-04-01T10:00:34.000+02:00
This PR was merged into the 2.1 branch. Discussion ---------- [2.1][SecurityBundle] Fixed configuration exemple | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 2c7a99b [SecurityBundle] Fixed configuration exemple
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -301,16 +301,15 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
             ->children()
                 ->arrayNode('providers')
                     ->example(array(
-                        'memory' => array(
-                            'name' => 'memory',
+                        'my_memory_provider' => array(
                             'memory' => array(
                                 'users' => array(
                                     'foo' => array('password' => 'foo', 'roles' => 'ROLE_USER'),
                                     'bar' => array('password' => 'bar', 'roles' => '[ROLE_USER, ROLE_ADMIN]')
                                 ),
                             )
                         ),
-                        'entity' => array('entity' => array('class' => 'SecurityBundle:User', 'property' => 'username'))
+                        'my_entity_provider' => array('entity' => array('class' => 'SecurityBundle:User', 'property' => 'username'))
                     ))
                     ->disallowNewKeysInSubsequentConfigs()
                     ->isRequired()
