From 789c75c24ace662218d4656d3754fc343e34bac6 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Tue, 1 Mar 2016 17:15:58 +0000 Subject: [PATCH 1/2] Add language line for the in_array validation rule --- resources/lang/en/validation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 31792b6e..b1e61204 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -40,6 +40,7 @@ 'filled' => 'The :attribute field is required.', 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'The :attribute must be an integer.', 'ip' => 'The :attribute must be a valid IP address.', 'json' => 'The :attribute must be a valid JSON string.', From 590593e0af1924627c195e66e1428b3348e0fb36 Mon Sep 17 00:00:00 2001 From: Jad Joubran Date: Wed, 2 Mar 2016 20:48:02 +0100 Subject: [PATCH 2/2] Fixed order of password validation in registration --- app/Http/Controllers/Auth/AuthController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index d2056486..a100dd6e 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -51,7 +51,7 @@ protected function validator(array $data) return Validator::make($data, [ 'name' => 'required|max:255', 'email' => 'required|email|max:255|unique:users', - 'password' => 'required|confirmed|min:6', + 'password' => 'required|min:6|confirmed', ]); }