ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Taylor Otwell
2018-12-18 09:06:40 -06:00
parent b1763fe180 70532dd8ae
commit 4070dc98d4
30 changed files with 338 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -49,9 +49,9 @@ class RegisterController extends Controller
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:8|confirmed',
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:8', 'confirmed'],
]);
}

4
app/Http/Controllers/Auth/VerificationController.php
View File

@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Auth;
use Illuminate\Routing\Controller;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\VerifiesEmails;
class VerificationController extends Controller
@@ -14,7 +14,7 @@ class VerificationController extends Controller
|
| This controller is responsible for handling email verification for any
| user that recently registered with the application. Emails may also
| be resent if the user did not receive the original email message.
| be re-sent if the user didn't receive the original email message.
|
*/