Anomalie #667: Identifiant (login): Possibilité de s'identifié avec l'email

app/Resources/translations/userui.fr.yml

@@ -9,7 +9,7 @@ login:
 
 security:
   login:
-    username: "Identifiant (adresse email)"
+    username: "Identifiant (pseudo ou email)"
     password: "Mot de passe"
 
 start:

composer.lock

@@ -8,12 +8,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony2admingenerator/AdmingeneratorGeneratorBundle.git",
-                "reference": "848a74cd26bda2988f52d9168ddffccb91a87f33"
+                "reference": "6fea0cc8aa814f877c3b1ae535a7addbfb904bc2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/848a74cd26bda2988f52d9168ddffccb91a87f33",
-                "reference": "848a74cd26bda2988f52d9168ddffccb91a87f33",
+                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/6fea0cc8aa814f877c3b1ae535a7addbfb904bc2",
+                "reference": "6fea0cc8aa814f877c3b1ae535a7addbfb904bc2",
                 "shasum": ""
             },
             "require": {
@@ -30,9 +30,10 @@
                 "doctrine/orm": ">=2.2.3,<2.5-dev"
             },
             "suggest": {
+                "avalanche123/imagine-bundle": "Image manipulation using Imagine and Twig Filters",
                 "cedriclombardot/admingenerator-user-bundle": "Help you to overwrite the base layout of FOSUserBundle or others giving a parameter key of the container"
             },
-            "time": "2013-04-04 23:29:16",
+            "time": "2013-04-23 06:32:11",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {
@@ -72,12 +73,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/cedriclombardot/TwigGenerator.git",
-                "reference": "b4a846956d330ed464070f6276801d16c92ae5c5"
+                "reference": "v1.0.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cedriclombardot/TwigGenerator/zipball/b4a846956d330ed464070f6276801d16c92ae5c5",
-                "reference": "b4a846956d330ed464070f6276801d16c92ae5c5",
+                "url": "https://api.github.com/repos/cedriclombardot/TwigGenerator/zipball/v1.0.0",
+                "reference": "v1.0.0",
                 "shasum": ""
             },
             "require": {
@@ -166,7 +167,7 @@
                 {
                     "name": "Johannes Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -186,12 +187,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/data-fixtures.git",
-                "reference": "eef10f6b92706bdae2841a8fdeb45ad8999b15b3"
+                "reference": "6924952026b77ff492da559b04ad166d25c611cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/eef10f6b92706bdae2841a8fdeb45ad8999b15b3",
-                "reference": "eef10f6b92706bdae2841a8fdeb45ad8999b15b3",
+                "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/6924952026b77ff492da559b04ad166d25c611cb",
+                "reference": "6924952026b77ff492da559b04ad166d25c611cb",
                 "shasum": ""
             },
             "require": {
@@ -206,7 +207,7 @@
                 "doctrine/orm": "For loading ORM fixtures",
                 "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures"
             },
-            "time": "2013-03-11 00:25:48",
+            "time": "2013-04-11 23:14:04",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -646,19 +647,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Gregwar/ImageBundle.git",
-                "reference": "55c372324c28c95f311d106ef75c01fb3b58cba3"
+                "reference": "9c76744f1715da673cf194a5c6baed1597b55f53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/55c372324c28c95f311d106ef75c01fb3b58cba3",
-                "reference": "55c372324c28c95f311d106ef75c01fb3b58cba3",
+                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/9c76744f1715da673cf194a5c6baed1597b55f53",
+                "reference": "9c76744f1715da673cf194a5c6baed1597b55f53",
                 "shasum": ""
             },
             "require": {
                 "ext-gd": "*",
                 "php": ">=5.3.0"
             },
-            "time": "2013-02-26 09:27:31",
+            "time": "2013-04-24 17:00:58",
             "type": "symfony-bundle",
             "autoload": {
                 "psr-0": {
@@ -764,7 +765,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -865,7 +866,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -908,7 +909,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -971,7 +972,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -1231,12 +1232,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/whiteoctober/Pagerfanta.git",
-                "reference": "4fded9adde16a4133b4db9f14815efadbbd268d1"
+                "reference": "65c24acf84410837aa873801f5a09b4039a5735b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/4fded9adde16a4133b4db9f14815efadbbd268d1",
-                "reference": "4fded9adde16a4133b4db9f14815efadbbd268d1",
+                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/65c24acf84410837aa873801f5a09b4039a5735b",
+                "reference": "65c24acf84410837aa873801f5a09b4039a5735b",
                 "shasum": ""
             },
             "require": {
@@ -1256,7 +1257,7 @@
                 "propel/propel1": "To use the PropelAdapter",
                 "solarium/solarium": "To use the SolariumAdapter."
             },
-            "time": "2013-04-04 17:07:12",
+            "time": "2013-04-24 11:37:27",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1282,6 +1283,8 @@
             "description": "Pagination for PHP 5.3",
             "keywords": [
                 "page",
+                "pagination",
+                "paginator",
                 "paging"
             ]
         },
@@ -1480,12 +1483,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sonata-project/SonataAdminBundle.git",
-                "reference": "839771a96dfcabf22d434e5dc6722b3bc88a6320"
+                "reference": "041174991a1d3c6725e1603c389b5767261972c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/839771a96dfcabf22d434e5dc6722b3bc88a6320",
-                "reference": "839771a96dfcabf22d434e5dc6722b3bc88a6320",
+                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/041174991a1d3c6725e1603c389b5767261972c7",
+                "reference": "041174991a1d3c6725e1603c389b5767261972c7",
                 "shasum": ""
             },
             "require": {
@@ -1512,7 +1515,7 @@
                 "sonata-project/doctrine-orm-admin-bundle": "2.1.*@dev",
                 "sonata-project/intl-bundle": "2.1.*"
             },
-            "time": "2013-04-05 09:00:56",
+            "time": "2013-04-11 21:38:12",
             "type": "symfony-bundle",
             "extra": {
                 "branch-alias": {

src/Muzich/CoreBundle/Resources/config/security.yml

@@ -5,7 +5,7 @@ parameters:
 security:
     providers:
         fos_userbundle:
-            id: fos_user.user_manager
+            id: fos_user.user_provider.username_email
     encoders:
         "FOS\UserBundle\Model\UserInterface":
             algorithm: sha512