1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00

Updated to Laravel 5.8

This commit is contained in:
Dan Brown
2019-09-13 23:58:40 +01:00
parent 58f5508b05
commit 140298bd96
65 changed files with 282 additions and 767 deletions

View File

@ -19,6 +19,7 @@ use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
use Laravel\Socialite\Contracts\User as SocialUser;
use Validator;
@ -78,7 +79,7 @@ class RegisterController extends Controller
return Validator::make($data, [
'name' => 'required|min:2|max:255',
'email' => 'required|email|max:255|unique:users',
'password' => 'required|min:6',
'password' => 'required|min:8',
]);
}
@ -262,7 +263,7 @@ class RegisterController extends Controller
$userData = [
'name' => $socialUser->getName(),
'email' => $socialUser->getEmail(),
'password' => str_random(30)
'password' => Str::random(30)
];
return $this->registerUser($userData, $socialAccount, $emailVerified);
}

View File

@ -62,7 +62,7 @@ class UserInviteController extends Controller
public function setPassword(string $token, Request $request)
{
$this->validate($request, [
'password' => 'required|min:6'
'password' => 'required|min:8'
]);
try {