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:
Miguel Nogueira 2022-02-22 19:46:18 +00:00
parent b6213bc66f
commit f61a287c78
65 changed files with 1634 additions and 1773 deletions

View File

@ -25,6 +25,7 @@ use Illuminate\Support\Facades\Facade;
class ContextAwareValidation extends Facade
{
// FIXME: Change to a binding key for L9
protected static function getFacadeAccessor()
{
return 'contextAwareValidator';

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',
];
}
}

View File

@ -10,37 +10,35 @@
"require": {
"php": "^8.0",
"ext-json": "*",
"arcanedev/log-viewer": "^8.1.0",
"dingo/api": "^3.0",
"arcanedev/log-viewer": "^9.0.0",
"doctrine/dbal": "^2.10",
"fideloper/proxy": "^4.2",
"fruitcake/laravel-cors": "^1.0",
"geo-sot/laravel-env-editor": "^0.9.9",
"graham-campbell/markdown": "^13.1",
"fruitcake/laravel-cors": "^2.1",
"geo-sot/laravel-env-editor": "^1.1.0",
"graham-campbell/markdown": "14.0.x-dev",
"guzzlehttp/guzzle": "^7.0.1",
"jeroennoten/laravel-adminlte": "^3.2",
"laravel-notification-channels/discord": "^1.3",
"laravel-notification-channels/pusher-push-notifications": "^3.0",
"laravel/framework": "^8.0",
"laravel/framework": "^9.0",
"laravel/slack-notification-channel": "^2.0",
"laravel/socialite": "^5.2",
"laravel/tinker": "^2.0",
"laravel/ui": "^3.0",
"mcamara/laravel-localization": "^1.5",
"mpociot/teamwork": "^6.1",
"mcamara/laravel-localization": "^1.7",
"mpociot/teamwork": "^7.0",
"pragmarx/google2fa-laravel": "^1.3",
"sentry/sentry-laravel": "2.9.0",
"sentry/sentry-laravel": "2.11.*",
"socialiteproviders/discord": "^4.1",
"spatie/laravel-permission": "^3.13",
"ext-xdebug": "*"
"spatie/laravel-permission": "^5.5"
},
"require-dev": {
"ext-xdebug": "*",
"barryvdh/laravel-debugbar": "^3.3",
"facade/ignition": "^2.3.6",
"fzaninotto/faker": "^1.9.1",
"fakerphp/faker": "^1.19",
"mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.3"
"nunomaduro/collision": "^6.1",
"phpunit/phpunit": "^9.3",
"spatie/laravel-ignition": "^1.0"
},
"config": {
"optimize-autoloader": true,

3238
composer.lock generated Executable file → Normal file

File diff suppressed because it is too large Load Diff

112
config/markdown.php Executable file → Normal file
View File

@ -3,22 +3,12 @@
declare(strict_types=1);
/*
* Copyright © 2020 Miguel Nogueira
* This file is part of Laravel Markdown.
*
* This file is part of Raspberry Staff Manager.
* (c) Graham Campbell <hello@gjcampbell.co.uk>
*
* Raspberry Staff Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Raspberry Staff Manager is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Raspberry Staff Manager. If not, see <https://www.gnu.org/licenses/>.
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
return [
@ -47,11 +37,17 @@ return [
| This option specifies what extensions will be automatically enabled.
| Simply provide your extension class names here.
|
| Default: []
| Default: [
| League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension::class,
| League\CommonMark\Extension\Table\TableExtension::class,
| ]
|
*/
'extensions' => [],
'extensions' => [
League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension::class,
League\CommonMark\Extension\Table\TableExtension::class,
],
/*
|--------------------------------------------------------------------------
@ -76,55 +72,28 @@ return [
/*
|--------------------------------------------------------------------------
| Enable Em Tag Parsing
| Commonmark Configuration
|--------------------------------------------------------------------------
|
| This option specifies if `<em>` parsing is enabled.
| This option specifies an array of options for commonmark.
|
| Default: true
| Default: [
| 'enable_em' => true,
| 'enable_strong' => true,
| 'use_asterisk' => true,
| 'use_underscore' => true,
| 'unordered_list_markers' => ['-', '+', '*'],
| ]
|
*/
'enable_em' => true,
/*
|--------------------------------------------------------------------------
| Enable Strong Tag Parsing
|--------------------------------------------------------------------------
|
| This option specifies if `<strong>` parsing is enabled.
|
| Default: true
|
*/
'enable_strong' => true,
/*
|--------------------------------------------------------------------------
| Enable Asterisk Parsing
|--------------------------------------------------------------------------
|
| This option specifies if `*` should be parsed for emphasis.
|
| Default: true
|
*/
'use_asterisk' => true,
/*
|--------------------------------------------------------------------------
| Enable Underscore Parsing
|--------------------------------------------------------------------------
|
| This option specifies if `_` should be parsed for emphasis.
|
| Default: true
|
*/
'use_underscore' => true,
'commonmark' => [
'enable_em' => true,
'enable_strong' => true,
'use_asterisk' => true,
'use_underscore' => true,
'unordered_list_markers' => ['-', '+', '*'],
],
/*
|--------------------------------------------------------------------------
@ -150,7 +119,7 @@ return [
|
*/
'allow_unsafe_links' => false,
'allow_unsafe_links' => true,
/*
|--------------------------------------------------------------------------
@ -159,10 +128,29 @@ return [
|
| This option specifies the maximum permitted block nesting level.
|
| Default: INF
| Default: PHP_INT_MAX
|
*/
'max_nesting_level' => INF,
'max_nesting_level' => PHP_INT_MAX,
/*
|--------------------------------------------------------------------------
| Slug Normalizer
|--------------------------------------------------------------------------
|
| This option specifies an array of options for slug normalization.
|
| Default: [
| 'max_length' => 255,
| 'unique' => 'document',
| ]
|
*/
'slug_normalizer' => [
'max_length' => 255,
'unique' => 'document',
],
];

View File

@ -85,7 +85,7 @@
@endswitch
</td>
<td>{{ $absence->created_at }}</td>
<td><button class="btn btn-warning btn-sm"><i class="fas fa-search"></i> Review</button></td>
<td><a href="{{ route('absences.show', ['absence' => $absence->id]) }}" class="btn btn-warning btn-sm"><i class="fas fa-search"></i> {{ __('Review') }}</a></td>
</tr>
@endforeach
</tbody>