Merge remote-tracking branch 'origin/master'

taylorotwell · taylorotwell · commit a282304f35dc · 2016-03-06T19:56:40.000-06:00
diff --git 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',
         ]);
     }
 
diff --git 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.',

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected function validator(array $data)`
`51`	`51`	`return Validator::make($data, [`
`52`	`52`	`'name' => 'required\|max:255',`
`53`	`53`	`'email' => 'required\|email\|max:255\|unique:users',`
`54`		`- 'password' => 'required\|confirmed\|min:6',`
	`54`	`+ 'password' => 'required\|min:6\|confirmed',`
`55`	`55`	`]);`
`56`	`56`	`}`
`57`	`57`