From 1af870a66985beb85ab294983231e7d4a1d1b558 Mon Sep 17 00:00:00 2001 From: rgrigga Date: Thu, 2 Oct 2014 22:08:08 -0400 Subject: [PATCH 1/3] Update UserValidator.php update to password_confirmation --- src/Confide/UserValidator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Confide/UserValidator.php b/src/Confide/UserValidator.php index 9f77633..a036e32 100644 --- a/src/Confide/UserValidator.php +++ b/src/Confide/UserValidator.php @@ -93,7 +93,7 @@ public function validatePassword(ConfideUserInterface $user) } else { $this->attachErrorMsg( $user, - 'confide::confide.alerts.wrong_confirmation', + 'confide::confide.alerts.password_confirmation', 'password_confirmation' ); return false; From ace240b1951e9fd0465b496bffe627e08cc0e31c Mon Sep 17 00:00:00 2001 From: rgrigga Date: Thu, 2 Oct 2014 22:11:02 -0400 Subject: [PATCH 2/3] Update confide.php password confirmation --- src/lang/en/confide.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lang/en/confide.php b/src/lang/en/confide.php index a1d9dd5..edacf2c 100644 --- a/src/lang/en/confide.php +++ b/src/lang/en/confide.php @@ -35,6 +35,7 @@ 'wrong_credentials' => 'Incorrect username, email or password.', 'not_confirmed' => 'Your account may not be confirmed. Check your email for the confirmation link', 'confirmation' => 'Your account has been confirmed! You may now login.', + 'password_confirmation' => 'The passwords did not match.', 'wrong_confirmation' => 'Wrong confirmation code.', 'password_forgot' => 'The information regarding password reset was sent to your email.', 'wrong_password_forgot' => 'User not found.', From a4036f1e5304bbd3bf1f841513646b1af7425650 Mon Sep 17 00:00:00 2001 From: Zizaco Date: Sat, 25 Oct 2014 17:26:01 -0200 Subject: [PATCH 3/3] Fixed tests of UserValidator::validatePassword --- tests/Confide/UserValidatorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Confide/UserValidatorTest.php b/tests/Confide/UserValidatorTest.php index 5ebde47..392765d 100644 --- a/tests/Confide/UserValidatorTest.php +++ b/tests/Confide/UserValidatorTest.php @@ -109,7 +109,7 @@ public function testShouldValidatePassword() ->atLeast(1) ->with( m::any(), - 'confide::confide.alerts.wrong_confirmation', + 'confide::confide.alerts.password_confirmation', 'password_confirmation' );