Fixed phpdoc and updated the changelog

CHANGELOG-2.1.md

@@ -30,6 +30,32 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
 
 ### SecurityBundle
 
+ * refactored the user provider configuration. The configuration changed for the chain provider and the memory provider:
+
+   Before:
+
+        security:
+            providers:
+                my_chain_provider:
+                    providers: [my_memory_provider, my_doctrine_provider]
+                my_memory_provider:
+                    users:
+                        toto: { password: foobar, roles: [ROLE_USER] }
+                        foo: { password: bar, roles: [ROLE_USER, ROLE_ADMIN] }
+
+   After:
+
+        security:
+            providers:
+                my_chain_provider:
+                    chain:
+                        providers: [my_memory_provider, my_doctrine_provider]
+                my_memory_provider:
+                    memory:
+                        users:
+                            toto: { password: foobar, roles: [ROLE_USER] }
+                            foo: { password: bar, roles: [ROLE_USER, ROLE_ADMIN] }
+
  * added a validator for the user password
 
 ### WebProfilerBundle

src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Security/UserProvider/EntityFactory.php

@@ -19,7 +19,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * HttpBasicFactory creates services for HTTP basic authentication.
+ * EntityFactory creates services for Doctrine user provider.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Christophe Coevoet <stof@notk.org>

src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/InMemoryFactory.php

@@ -18,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * HttpBasicFactory creates services for HTTP basic authentication.
+ * InMemoryFactory creates services for the memory provider.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Christophe Coevoet <stof@notk.org>

src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/UserProviderFactoryInterface.php

@@ -15,7 +15,7 @@ use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * SecurityFactoryInterface is the interface for all security authentication listener.
+ * UserProviderFactoryInterface is the interface for all user provider factories.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Christophe Coevoet <stof@notk.org>