chore: upgrade to L9

BREAKING CHANGE: This commit updates the Laravel framework to version 9. Additionally, it also updates outdated and abandoned dependencies in the composer.json file.

The resources/lang directory has also been moved to the repository's root directory.
This commit is contained in:
2022-02-22 19:46:18 +00:00
parent b6213bc66f
commit f61a287c78
65 changed files with 1634 additions and 1773 deletions

View File

@@ -74,6 +74,7 @@ class UserController extends Controller
return view('dashboard.administration.players')
->with([
'users' => $matchingUsers,
'numUsers' => count(User::all()),
'bannedUserCount' => Ban::all()->count(),
]);
} else {

View File

@@ -21,9 +21,10 @@
namespace App\Http\Middleware;
use Fideloper\Proxy\TrustProxies as Middleware;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request;
class TrustProxies extends Middleware
{
/**
@@ -38,5 +39,11 @@ class TrustProxies extends Middleware
*
* @var int
*/
protected $headers = Request::HEADER_X_FORWARDED_AWS_ELB;
protected $headers =
Request::HEADER_X_FORWARDED_FOR |
Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO |
Request::HEADER_X_FORWARDED_AWS_ELB;
}

View File

@@ -43,7 +43,7 @@ class ChangeEmailRequest extends FormRequest
public function rules()
{
return [
'currentPassword' => 'required|password',
'currentPassword' => 'required|current_password',
'newEmail' => 'required|email|unique:users,email',
];
}

View File

@@ -44,7 +44,7 @@ class ChangePasswordRequest extends FormRequest
{
return [
'newPassword' => 'required|string|confirmed',
'oldPassword' => 'required|string|password',
'oldPassword' => 'required|string|current_password',
];
}
}

View File

@@ -43,7 +43,7 @@ class FlushSessionsRequest extends FormRequest
public function rules()
{
return [
'currentPasswordFlush' => 'required|password',
'currentPasswordFlush' => 'required|current_password',
];
}
}

View File

@@ -43,7 +43,7 @@ class Remove2FASecretRequest extends FormRequest
public function rules()
{
return [
'currentPassword' => 'required|password',
'currentPassword' => 'required|current_password',
'consent' => 'required|accepted',
];
}

View File

@@ -45,13 +45,13 @@ class UserDeleteRequest extends FormRequest
{
if (Auth::user()->has2FA()) {
return [
'currentPassword' => 'required|password:web',
'currentPassword' => 'required|current_password:web',
'otp' => 'required|integer|max:6',
];
}
return [
'currentPassword' => 'required|password:web',
'currentPassword' => 'required|current_password:web',
];
}
}