jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Squashed commit of the following:

Browse source 
commit 7daedd241246bd11f371a8c93394796f8f5ec4cb
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Fri Aug 11 21:01:17 2017 +0100

    Bring in the latest changes from upstream repo laravel/laravel
This commit is contained in:
Jonny Barnes 2017-08-11 21:02:03 +01:00
parent b695b5be8c
commit 2b5e17ab4e
27 changed files with 132 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Auth/LoginController.php
View file

@ -21,7 +21,7 @@ class LoginController extends Controller
use AuthenticatesUsers;
/**
* Where to redirect users after login / registration.
* Where to redirect users after login.
*
* @var string
*/
@ -34,6 +34,6 @@ class LoginController extends Controller
*/
public function __construct()
{
$this->middleware('guest', ['except' => 'logout']);
$this->middleware('guest')->except('logout');
}
}

8
app/Http/Controllers/Auth/RegisterController.php
View file

@ -23,7 +23,7 @@ class RegisterController extends Controller
use RegistersUsers;
/**
* Where to redirect users after login / registration.
* Where to redirect users after registration.
*
* @var string
*/
@ -48,9 +48,9 @@ class RegisterController extends Controller
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|max:255',
'email' => 'required|email|max:255|unique:users',
'password' => 'required|min:6|confirmed',
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
]);
}