Browse Source

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

Sevajol Bastien 12 years ago
parent
commit
36df2a93e7

+ 1 - 1
app/Resources/translations/userui.fr.yml View File

9
 
9
 
10
 security:
10
 security:
11
   login:
11
   login:
12
-    username: "Identifiant (adresse email)"
12
+    username: "Identifiant (pseudo ou email)"
13
     password: "Mot de passe"
13
     password: "Mot de passe"
14
 
14
 
15
 start:
15
 start:

+ 0 - 0
app/bootstrap.php.cache View File


+ 31 - 28
composer.lock View File

8
             "source": {
8
             "source": {
9
                 "type": "git",
9
                 "type": "git",
10
                 "url": "https://github.com/symfony2admingenerator/AdmingeneratorGeneratorBundle.git",
10
                 "url": "https://github.com/symfony2admingenerator/AdmingeneratorGeneratorBundle.git",
11
-                "reference": "848a74cd26bda2988f52d9168ddffccb91a87f33"
11
+                "reference": "6fea0cc8aa814f877c3b1ae535a7addbfb904bc2"
12
             },
12
             },
13
             "dist": {
13
             "dist": {
14
                 "type": "zip",
14
                 "type": "zip",
15
-                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/848a74cd26bda2988f52d9168ddffccb91a87f33",
16
-                "reference": "848a74cd26bda2988f52d9168ddffccb91a87f33",
15
+                "url": "https://api.github.com/repos/symfony2admingenerator/AdmingeneratorGeneratorBundle/zipball/6fea0cc8aa814f877c3b1ae535a7addbfb904bc2",
16
+                "reference": "6fea0cc8aa814f877c3b1ae535a7addbfb904bc2",
17
                 "shasum": ""
17
                 "shasum": ""
18
             },
18
             },
19
             "require": {
19
             "require": {
30
                 "doctrine/orm": ">=2.2.3,<2.5-dev"
30
                 "doctrine/orm": ">=2.2.3,<2.5-dev"
31
             },
31
             },
32
             "suggest": {
32
             "suggest": {
33
+                "avalanche123/imagine-bundle": "Image manipulation using Imagine and Twig Filters",
33
                 "cedriclombardot/admingenerator-user-bundle": "Help you to overwrite the base layout of FOSUserBundle or others giving a parameter key of the container"
34
                 "cedriclombardot/admingenerator-user-bundle": "Help you to overwrite the base layout of FOSUserBundle or others giving a parameter key of the container"
34
             },
35
             },
35
-            "time": "2013-04-04 23:29:16",
36
+            "time": "2013-04-23 06:32:11",
36
             "type": "symfony-bundle",
37
             "type": "symfony-bundle",
37
             "extra": {
38
             "extra": {
38
                 "branch-alias": {
39
                 "branch-alias": {
72
             "source": {
73
             "source": {
73
                 "type": "git",
74
                 "type": "git",
74
                 "url": "https://github.com/cedriclombardot/TwigGenerator.git",
75
                 "url": "https://github.com/cedriclombardot/TwigGenerator.git",
75
-                "reference": "b4a846956d330ed464070f6276801d16c92ae5c5"
76
+                "reference": "v1.0.0"
76
             },
77
             },
77
             "dist": {
78
             "dist": {
78
                 "type": "zip",
79
                 "type": "zip",
79
-                "url": "https://api.github.com/repos/cedriclombardot/TwigGenerator/zipball/b4a846956d330ed464070f6276801d16c92ae5c5",
80
-                "reference": "b4a846956d330ed464070f6276801d16c92ae5c5",
80
+                "url": "https://api.github.com/repos/cedriclombardot/TwigGenerator/zipball/v1.0.0",
81
+                "reference": "v1.0.0",
81
                 "shasum": ""
82
                 "shasum": ""
82
             },
83
             },
83
             "require": {
84
             "require": {
166
                 {
167
                 {
167
                     "name": "Johannes Schmitt",
168
                     "name": "Johannes Schmitt",
168
                     "email": "schmittjoh@gmail.com",
169
                     "email": "schmittjoh@gmail.com",
169
-                    "homepage": "http://jmsyst.com",
170
+                    "homepage": "https://github.com/schmittjoh",
170
                     "role": "Developer of wrapped JMSSerializerBundle"
171
                     "role": "Developer of wrapped JMSSerializerBundle"
171
                 }
172
                 }
172
             ],
173
             ],
186
             "source": {
187
             "source": {
187
                 "type": "git",
188
                 "type": "git",
188
                 "url": "https://github.com/doctrine/data-fixtures.git",
189
                 "url": "https://github.com/doctrine/data-fixtures.git",
189
-                "reference": "eef10f6b92706bdae2841a8fdeb45ad8999b15b3"
190
+                "reference": "6924952026b77ff492da559b04ad166d25c611cb"
190
             },
191
             },
191
             "dist": {
192
             "dist": {
192
                 "type": "zip",
193
                 "type": "zip",
193
-                "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/eef10f6b92706bdae2841a8fdeb45ad8999b15b3",
194
-                "reference": "eef10f6b92706bdae2841a8fdeb45ad8999b15b3",
194
+                "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/6924952026b77ff492da559b04ad166d25c611cb",
195
+                "reference": "6924952026b77ff492da559b04ad166d25c611cb",
195
                 "shasum": ""
196
                 "shasum": ""
196
             },
197
             },
197
             "require": {
198
             "require": {
206
                 "doctrine/orm": "For loading ORM fixtures",
207
                 "doctrine/orm": "For loading ORM fixtures",
207
                 "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures"
208
                 "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures"
208
             },
209
             },
209
-            "time": "2013-03-11 00:25:48",
210
+            "time": "2013-04-11 23:14:04",
210
             "type": "library",
211
             "type": "library",
211
             "extra": {
212
             "extra": {
212
                 "branch-alias": {
213
                 "branch-alias": {
646
             "source": {
647
             "source": {
647
                 "type": "git",
648
                 "type": "git",
648
                 "url": "https://github.com/Gregwar/ImageBundle.git",
649
                 "url": "https://github.com/Gregwar/ImageBundle.git",
649
-                "reference": "55c372324c28c95f311d106ef75c01fb3b58cba3"
650
+                "reference": "9c76744f1715da673cf194a5c6baed1597b55f53"
650
             },
651
             },
651
             "dist": {
652
             "dist": {
652
                 "type": "zip",
653
                 "type": "zip",
653
-                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/55c372324c28c95f311d106ef75c01fb3b58cba3",
654
-                "reference": "55c372324c28c95f311d106ef75c01fb3b58cba3",
654
+                "url": "https://api.github.com/repos/Gregwar/ImageBundle/zipball/9c76744f1715da673cf194a5c6baed1597b55f53",
655
+                "reference": "9c76744f1715da673cf194a5c6baed1597b55f53",
655
                 "shasum": ""
656
                 "shasum": ""
656
             },
657
             },
657
             "require": {
658
             "require": {
658
                 "ext-gd": "*",
659
                 "ext-gd": "*",
659
                 "php": ">=5.3.0"
660
                 "php": ">=5.3.0"
660
             },
661
             },
661
-            "time": "2013-02-26 09:27:31",
662
+            "time": "2013-04-24 17:00:58",
662
             "type": "symfony-bundle",
663
             "type": "symfony-bundle",
663
             "autoload": {
664
             "autoload": {
664
                 "psr-0": {
665
                 "psr-0": {
764
                 {
765
                 {
765
                     "name": "Johannes M. Schmitt",
766
                     "name": "Johannes M. Schmitt",
766
                     "email": "schmittjoh@gmail.com",
767
                     "email": "schmittjoh@gmail.com",
767
-                    "homepage": "http://jmsyst.com",
768
+                    "homepage": "https://github.com/schmittjoh",
768
                     "role": "Developer of wrapped JMSSerializerBundle"
769
                     "role": "Developer of wrapped JMSSerializerBundle"
769
                 }
770
                 }
770
             ],
771
             ],
865
                 {
866
                 {
866
                     "name": "Johannes M. Schmitt",
867
                     "name": "Johannes M. Schmitt",
867
                     "email": "schmittjoh@gmail.com",
868
                     "email": "schmittjoh@gmail.com",
868
-                    "homepage": "http://jmsyst.com",
869
+                    "homepage": "https://github.com/schmittjoh",
869
                     "role": "Developer of wrapped JMSSerializerBundle"
870
                     "role": "Developer of wrapped JMSSerializerBundle"
870
                 }
871
                 }
871
             ],
872
             ],
908
                 {
909
                 {
909
                     "name": "Johannes M. Schmitt",
910
                     "name": "Johannes M. Schmitt",
910
                     "email": "schmittjoh@gmail.com",
911
                     "email": "schmittjoh@gmail.com",
911
-                    "homepage": "http://jmsyst.com",
912
+                    "homepage": "https://github.com/schmittjoh",
912
                     "role": "Developer of wrapped JMSSerializerBundle"
913
                     "role": "Developer of wrapped JMSSerializerBundle"
913
                 }
914
                 }
914
             ],
915
             ],
971
                 {
972
                 {
972
                     "name": "Johannes M. Schmitt",
973
                     "name": "Johannes M. Schmitt",
973
                     "email": "schmittjoh@gmail.com",
974
                     "email": "schmittjoh@gmail.com",
974
-                    "homepage": "http://jmsyst.com",
975
+                    "homepage": "https://github.com/schmittjoh",
975
                     "role": "Developer of wrapped JMSSerializerBundle"
976
                     "role": "Developer of wrapped JMSSerializerBundle"
976
                 }
977
                 }
977
             ],
978
             ],
1231
             "source": {
1232
             "source": {
1232
                 "type": "git",
1233
                 "type": "git",
1233
                 "url": "https://github.com/whiteoctober/Pagerfanta.git",
1234
                 "url": "https://github.com/whiteoctober/Pagerfanta.git",
1234
-                "reference": "4fded9adde16a4133b4db9f14815efadbbd268d1"
1235
+                "reference": "65c24acf84410837aa873801f5a09b4039a5735b"
1235
             },
1236
             },
1236
             "dist": {
1237
             "dist": {
1237
                 "type": "zip",
1238
                 "type": "zip",
1238
-                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/4fded9adde16a4133b4db9f14815efadbbd268d1",
1239
-                "reference": "4fded9adde16a4133b4db9f14815efadbbd268d1",
1239
+                "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/65c24acf84410837aa873801f5a09b4039a5735b",
1240
+                "reference": "65c24acf84410837aa873801f5a09b4039a5735b",
1240
                 "shasum": ""
1241
                 "shasum": ""
1241
             },
1242
             },
1242
             "require": {
1243
             "require": {
1256
                 "propel/propel1": "To use the PropelAdapter",
1257
                 "propel/propel1": "To use the PropelAdapter",
1257
                 "solarium/solarium": "To use the SolariumAdapter."
1258
                 "solarium/solarium": "To use the SolariumAdapter."
1258
             },
1259
             },
1259
-            "time": "2013-04-04 17:07:12",
1260
+            "time": "2013-04-24 11:37:27",
1260
             "type": "library",
1261
             "type": "library",
1261
             "extra": {
1262
             "extra": {
1262
                 "branch-alias": {
1263
                 "branch-alias": {
1282
             "description": "Pagination for PHP 5.3",
1283
             "description": "Pagination for PHP 5.3",
1283
             "keywords": [
1284
             "keywords": [
1284
                 "page",
1285
                 "page",
1286
+                "pagination",
1287
+                "paginator",
1285
                 "paging"
1288
                 "paging"
1286
             ]
1289
             ]
1287
         },
1290
         },
1480
             "source": {
1483
             "source": {
1481
                 "type": "git",
1484
                 "type": "git",
1482
                 "url": "https://github.com/sonata-project/SonataAdminBundle.git",
1485
                 "url": "https://github.com/sonata-project/SonataAdminBundle.git",
1483
-                "reference": "839771a96dfcabf22d434e5dc6722b3bc88a6320"
1486
+                "reference": "041174991a1d3c6725e1603c389b5767261972c7"
1484
             },
1487
             },
1485
             "dist": {
1488
             "dist": {
1486
                 "type": "zip",
1489
                 "type": "zip",
1487
-                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/839771a96dfcabf22d434e5dc6722b3bc88a6320",
1488
-                "reference": "839771a96dfcabf22d434e5dc6722b3bc88a6320",
1490
+                "url": "https://api.github.com/repos/sonata-project/SonataAdminBundle/zipball/041174991a1d3c6725e1603c389b5767261972c7",
1491
+                "reference": "041174991a1d3c6725e1603c389b5767261972c7",
1489
                 "shasum": ""
1492
                 "shasum": ""
1490
             },
1493
             },
1491
             "require": {
1494
             "require": {
1512
                 "sonata-project/doctrine-orm-admin-bundle": "2.1.*@dev",
1515
                 "sonata-project/doctrine-orm-admin-bundle": "2.1.*@dev",
1513
                 "sonata-project/intl-bundle": "2.1.*"
1516
                 "sonata-project/intl-bundle": "2.1.*"
1514
             },
1517
             },
1515
-            "time": "2013-04-05 09:00:56",
1518
+            "time": "2013-04-11 21:38:12",
1516
             "type": "symfony-bundle",
1519
             "type": "symfony-bundle",
1517
             "extra": {
1520
             "extra": {
1518
                 "branch-alias": {
1521
                 "branch-alias": {

+ 0 - 0
src/Muzich/CoreBundle/Factory/Elements/Spotifycom.php View File


+ 1 - 1
src/Muzich/CoreBundle/Resources/config/security.yml View File

5
 security:
5
 security:
6
     providers:
6
     providers:
7
         fos_userbundle:
7
         fos_userbundle:
8
-            id: fos_user.user_manager
8
+            id: fos_user.user_provider.username_email
9
     encoders:
9
     encoders:
10
         "FOS\UserBundle\Model\UserInterface":
10
         "FOS\UserBundle\Model\UserInterface":
11
             algorithm: sha512
11
             algorithm: sha512