PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-26 14:58:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updates after 6.0 shift

Browse source
This commit is contained in:
Adam Lavin 2021-02-14 18:53:00 +00:00
parent 0c6c81bdc6
commit 301e6478cb
No known key found for this signature in database
GPG key ID: 9C4C68AFA9CA6461
5 changed files with 1573 additions and 850 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/Http/Kernel.php
View file

@ -30,7 +30,11 @@ class Kernel extends HttpKernel
* @var array
*/
protected $middleware = [
\App\Http\Middleware\TrustProxies::class,
\App\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
];
protected $middlewareGroups = [
@ -39,8 +43,8 @@ class Kernel extends HttpKernel
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\App\Http\Middleware\DisabledAccountCheck::class,
],
];
@ -52,14 +56,18 @@ class Kernel extends HttpKernel
*/
protected $routeMiddleware = [
'auth' => \App\Http\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'auth.oauth' => \App\Http\Middleware\AuthenticateOAuth::class,
'can' => \App\Http\Middleware\Authorize::class,
'json-exceptions' => \App\Http\Middleware\JsonExceptions::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'cors' => \Barryvdh\Cors\HandleCors::class,
'auth.oauth' => \App\Http\Middleware\AuthenticateOAuth::class,
'json-exceptions' => \App\Http\Middleware\JsonExceptions::class,
];
/**
* The priority-sorted list of middleware.
@ -72,6 +80,7 @@ class Kernel extends HttpKernel
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\Authenticate::class,
\Illuminate\Routing\Middleware\ThrottleRequests::class,
\Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\Illuminate\Auth\Middleware\Authorize::class,

4
app/Http/Middleware/RedirectIfAuthenticated.php
View file

@ -20,8 +20,8 @@
namespace App\Http\Middleware;
use App\Providers\RouteServiceProvider;
use Closure;
use Illuminate\Auth\AuthManager;
use Illuminate\Support\Facades\Auth;
class RedirectIfAuthenticated
@ -37,7 +37,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
return redirect('/home');
return redirect(RouteServiceProvider::HOME);
}
return $next($request);

16
composer.json
View file

@ -15,10 +15,10 @@
"codescale/ffmpeg-php": "2.7.0",
"barryvdh/laravel-ide-helper": "^2.8",
"guzzlehttp/guzzle": "~6.0",
"doctrine/dbal": "^3.0",
"doctrine/dbal": "^2.12",
"venturecraft/revisionable": "^1.36",
"pda/pheanstalk": "^4.0",
"cviebrock/laravel-elasticsearch": "4.0.0",
"cviebrock/laravel-elasticsearch": "^4.0",
"barryvdh/laravel-debugbar": "^3.5",
"predis/predis": "^1.1",
"ksubileau/color-thief-php": "^1.3",
@ -28,17 +28,17 @@
"poniverse/api": "dev-rewrite",
"fruitcake/laravel-cors": "2.0.1",
"laravel/tinker": "^2.5",
"doctrine/collections": "v1.4.*",
"doctrine/annotations": "v1.4.*",
"doctrine/cache": "v1.6.*",
"doctrine/instantiator": "^1.1",
"doctrine/collections": "^1.6",
"doctrine/annotations": "^1.11",
"doctrine/cache": "^1.8",
"doctrine/instantiator": "^1.4",
"fideloper/proxy": "^4.4"
},
"require-dev": {
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^8.5.8|^9.3.3",
"symfony/dom-crawler": "^5.2",
"symfony/css-selector": "^5.2",
"symfony/dom-crawler": "^4.2",
"symfony/css-selector": "^4.2",
"laravel/browser-kit-testing": "^5.2",
"nategood/httpful": "^0.2.20",
"nunomaduro/collision": "^3.0",

2383
composer.lock generated
View file

File diff suppressed because it is too large Load diff

5
resources/lang/en/validation.php
View file

@ -40,7 +40,7 @@ return [
'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
'email' => 'The :attribute must be a valid email address.',
'ends_with' => 'The :attribute must end with one of the following: :values',
'ends_with' => 'The :attribute must end with one of the following: :values.',
'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.',
'filled' => 'The :attribute field must have a value.',
@ -93,6 +93,7 @@ return [
'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute format is invalid.',
'numeric' => 'The :attribute must be a number.',
'password' => 'The password is incorrect.',
'present' => 'The :attribute field must be present.',
'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.',
@ -109,7 +110,7 @@ return [
'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.',
],
'starts_with' => 'The :attribute must start with one of the following: :values',
'starts_with' => 'The :attribute must start with one of the following: :values.',
'string' => 'The :attribute must be a string.',
'timezone' => 'The :attribute must be a valid zone.',
'unique' => 'The :attribute has already been taken.',