Updated FOSUserBundle to dev-master

kreta · May 26, 2015 · df82378 · df82378
1 parent d20611e
commit df82378
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
 
         "friendsofsymfony/oauth-server-bundle":     "~1.4",
         "friendsofsymfony/rest-bundle":             "1.4.x",
-        "friendsofsymfony/user-bundle":             "2.0.*@alpha",
+        "friendsofsymfony/user-bundle":             "2.0.*@dev",
         "knplabs/knp-gaufrette-bundle":             "*@dev",
         "nelmio/cors-bundle":                       "1.3.x",
         "jms/serializer-bundle":                    "0.13.x",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Kreta/Bundle/UserBundle/Resources/views/Security/login.html.twig b/src/Kreta/Bundle/UserBundle/Resources/views/Security/login.html.twig
@@ -4,7 +4,7 @@
 
 {% block content %}
     {% if error %}
-        <div>{{ error|trans }}</div>
+        <div>{{ error.messageKey|trans(error.messageData, 'security') }}</div>
     {% endif %}
 
     <h1>Sign in to <strong>kreta.io</strong></h1>

diff --git a/src/Kreta/Bundle/WebBundle/Behat/Context/authentication.feature b/src/Kreta/Bundle/WebBundle/Behat/Context/authentication.feature
@@ -38,4 +38,4 @@ Feature: Manage authentication
       | username | invalid@kreta.com |
       | password | invalid           |
     And I press "Login"
-    Then I should see "Invalid username or password"
+    Then I should see "Invalid credentials."