Cleaning #1
| @@ -1,5 +1,7 @@ | |||||||
| <?php | <?php | ||||||
|  |  | ||||||
|  | declare(strict_types=1); | ||||||
|  |  | ||||||
| namespace App\Http; | namespace App\Http; | ||||||
|  |  | ||||||
| use App\Http\Middleware\Core; | use App\Http\Middleware\Core; | ||||||
| @@ -7,54 +9,33 @@ use Illuminate\Foundation\Http\Kernel as HttpKernel; | |||||||
|  |  | ||||||
| class Kernel extends HttpKernel | class Kernel extends HttpKernel | ||||||
| { | { | ||||||
|     /** |  | ||||||
|      * The application's global HTTP middleware stack. |  | ||||||
|      * |  | ||||||
|      * These middleware are run during every request to your application. |  | ||||||
|      * |  | ||||||
|      * @var array<int, class-string|string> |  | ||||||
|      */ |  | ||||||
|     protected $middleware = [ |     protected $middleware = [ | ||||||
|         // \App\Http\Middleware\TrustHosts::class, |  | ||||||
|         \App\Http\Middleware\TrustProxies::class, |         \App\Http\Middleware\TrustProxies::class, | ||||||
|         \Fruitcake\Cors\HandleCors::class, |         \Fruitcake\Cors\HandleCors::class, | ||||||
|         \App\Http\Middleware\PreventRequestsDuringMaintenance::class, |         \Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class, | ||||||
|         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, |         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, | ||||||
|         \App\Http\Middleware\TrimStrings::class, |         \App\Http\Middleware\TrimStrings::class, | ||||||
|         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, |         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, | ||||||
|         Core::class |         Core::class | ||||||
|     ]; |     ]; | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * The application's route middleware groups. |  | ||||||
|      * |  | ||||||
|      * @var array<string, array<int, class-string|string>> |  | ||||||
|      */ |  | ||||||
|     protected $middlewareGroups = [ |     protected $middlewareGroups = [ | ||||||
|         'web' => [ |         'web' => [ | ||||||
|             \App\Http\Middleware\EncryptCookies::class, |             \Illuminate\Cookie\Middleware\EncryptCookies::class, | ||||||
|             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, |             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, | ||||||
|             \Illuminate\Session\Middleware\StartSession::class, |             \Illuminate\Session\Middleware\StartSession::class, | ||||||
|             // \Illuminate\Session\Middleware\AuthenticateSession::class, |  | ||||||
|             \Illuminate\View\Middleware\ShareErrorsFromSession::class, |             \Illuminate\View\Middleware\ShareErrorsFromSession::class, | ||||||
|             \App\Http\Middleware\VerifyCsrfToken::class, |             \Illuminate\Foundation\Http\Middleware\VerifyCsrfToken::class, | ||||||
|             \Illuminate\Routing\Middleware\SubstituteBindings::class, |             \Illuminate\Routing\Middleware\SubstituteBindings::class, | ||||||
|         ], |         ], | ||||||
|  |  | ||||||
|         'api' => [ |         'api' => [ | ||||||
|             // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, |  | ||||||
|             'throttle:api', |             'throttle:api', | ||||||
|             \Illuminate\Routing\Middleware\SubstituteBindings::class, |             \Illuminate\Routing\Middleware\SubstituteBindings::class, | ||||||
|         ], |         ], | ||||||
|     ]; |     ]; | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * The application's route middleware. |  | ||||||
|      * |  | ||||||
|      * These middleware may be assigned to groups or used individually. |  | ||||||
|      * |  | ||||||
|      * @var array<string, class-string|string> |  | ||||||
|      */ |  | ||||||
|     protected $routeMiddleware = [ |     protected $routeMiddleware = [ | ||||||
|         'auth' => \App\Http\Middleware\Authenticate::class, |         'auth' => \App\Http\Middleware\Authenticate::class, | ||||||
|         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, |         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, | ||||||
| @@ -66,4 +47,5 @@ class Kernel extends HttpKernel | |||||||
|         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, |         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, | ||||||
|         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, |         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, | ||||||
|     ]; |     ]; | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,16 +6,14 @@ use Illuminate\Auth\Middleware\Authenticate as Middleware; | |||||||
|  |  | ||||||
| class Authenticate extends Middleware | class Authenticate extends Middleware | ||||||
| { | { | ||||||
|     /** |  | ||||||
|      * Get the path the user should be redirected to when they are not authenticated. |     protected function redirectTo($request): ?string | ||||||
|      * |  | ||||||
|      * @param  \Illuminate\Http\Request  $request |  | ||||||
|      * @return string|null |  | ||||||
|      */ |  | ||||||
|     protected function redirectTo($request) |  | ||||||
|     { |     { | ||||||
|         if (! $request->expectsJson()) { |         if (! $request->expectsJson()) { | ||||||
|             return route('admin.auth.login'); |             return route('admin.auth.login'); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         return null; | ||||||
|     } |     } | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,24 +1,23 @@ | |||||||
| <?php | <?php | ||||||
|  |  | ||||||
|  | declare(strict_types=1); | ||||||
|  |  | ||||||
| namespace App\Http\Middleware; | namespace App\Http\Middleware; | ||||||
|  |  | ||||||
| use Closure; | use Closure; | ||||||
|  | use Illuminate\Http\RedirectResponse; | ||||||
| use Illuminate\Http\Request; | use Illuminate\Http\Request; | ||||||
|  | use Illuminate\Http\Response; | ||||||
|  |  | ||||||
| class Core | class Core | ||||||
| { | { | ||||||
|     /** |  | ||||||
|      * Handle an incoming request. |     public function handle(Request $request, Closure $next): Response|RedirectResponse | ||||||
|      * |  | ||||||
|      * @param  \Illuminate\Http\Request  $request |  | ||||||
|      * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next |  | ||||||
|      * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse |  | ||||||
|      */ |  | ||||||
|     public function handle(Request $request, Closure $next) |  | ||||||
|     { |     { | ||||||
|         return $next($request) |         return $next($request) | ||||||
|             ->header('Access-Control-Allow-Origin', '*') |             ->header('Access-Control-Allow-Origin', '*') | ||||||
|             ->header('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE, OPTIONS') |             ->header('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE, OPTIONS') | ||||||
|             ->header('Access-Control-Allow-Headers', 'Content-Type, Authorizations'); |             ->header('Access-Control-Allow-Headers', 'Content-Type, Authorizations'); | ||||||
|     } |     } | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,17 +0,0 @@ | |||||||
| <?php |  | ||||||
|  |  | ||||||
| namespace App\Http\Middleware; |  | ||||||
|  |  | ||||||
| use Illuminate\Cookie\Middleware\EncryptCookies as Middleware; |  | ||||||
|  |  | ||||||
| class EncryptCookies extends Middleware |  | ||||||
| { |  | ||||||
|     /** |  | ||||||
|      * The names of the cookies that should not be encrypted. |  | ||||||
|      * |  | ||||||
|      * @var array<int, string> |  | ||||||
|      */ |  | ||||||
|     protected $except = [ |  | ||||||
|         // |  | ||||||
|     ]; |  | ||||||
| } |  | ||||||
| @@ -1,17 +0,0 @@ | |||||||
| <?php |  | ||||||
|  |  | ||||||
| namespace App\Http\Middleware; |  | ||||||
|  |  | ||||||
| use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware; |  | ||||||
|  |  | ||||||
| class PreventRequestsDuringMaintenance extends Middleware |  | ||||||
| { |  | ||||||
|     /** |  | ||||||
|      * The URIs that should be reachable while maintenance mode is enabled. |  | ||||||
|      * |  | ||||||
|      * @var array<int, string> |  | ||||||
|      */ |  | ||||||
|     protected $except = [ |  | ||||||
|         // |  | ||||||
|     ]; |  | ||||||
| } |  | ||||||
| @@ -1,23 +1,20 @@ | |||||||
| <?php | <?php | ||||||
|  |  | ||||||
|  | declare(strict_types=1); | ||||||
|  |  | ||||||
| namespace App\Http\Middleware; | namespace App\Http\Middleware; | ||||||
|  |  | ||||||
| use App\Providers\RouteServiceProvider; | use App\Providers\RouteServiceProvider; | ||||||
| use Closure; | use Closure; | ||||||
|  | use Illuminate\Http\RedirectResponse; | ||||||
| use Illuminate\Http\Request; | use Illuminate\Http\Request; | ||||||
|  | use Illuminate\Http\Response; | ||||||
| use Illuminate\Support\Facades\Auth; | use Illuminate\Support\Facades\Auth; | ||||||
|  |  | ||||||
| class RedirectIfAuthenticated | class RedirectIfAuthenticated | ||||||
| { | { | ||||||
|     /** |  | ||||||
|      * Handle an incoming request. |     public function handle(Request $request, Closure $next, ...$guards): Response|RedirectResponse | ||||||
|      * |  | ||||||
|      * @param  \Illuminate\Http\Request  $request |  | ||||||
|      * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next |  | ||||||
|      * @param  string|null  ...$guards |  | ||||||
|      * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse |  | ||||||
|      */ |  | ||||||
|     public function handle(Request $request, Closure $next, ...$guards) |  | ||||||
|     { |     { | ||||||
|         $guards = empty($guards) ? [null] : $guards; |         $guards = empty($guards) ? [null] : $guards; | ||||||
|  |  | ||||||
| @@ -29,4 +26,5 @@ class RedirectIfAuthenticated | |||||||
|  |  | ||||||
|         return $next($request); |         return $next($request); | ||||||
|     } |     } | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,19 +1,18 @@ | |||||||
| <?php | <?php | ||||||
|  |  | ||||||
|  | declare(strict_types=1); | ||||||
|  |  | ||||||
| namespace App\Http\Middleware; | namespace App\Http\Middleware; | ||||||
|  |  | ||||||
| use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware; | use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware; | ||||||
|  |  | ||||||
| class TrimStrings extends Middleware | class TrimStrings extends Middleware | ||||||
| { | { | ||||||
|     /** |  | ||||||
|      * The names of the attributes that should not be trimmed. |  | ||||||
|      * |  | ||||||
|      * @var array<int, string> |  | ||||||
|      */ |  | ||||||
|     protected $except = [ |     protected $except = [ | ||||||
|         'current_password', |         'current_password', | ||||||
|         'password', |         'password', | ||||||
|         'password_confirmation', |         'password_confirmation', | ||||||
|     ]; |     ]; | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,20 +1,19 @@ | |||||||
| <?php | <?php | ||||||
|  |  | ||||||
|  | declare(strict_types=1); | ||||||
|  |  | ||||||
| namespace App\Http\Middleware; | namespace App\Http\Middleware; | ||||||
|  |  | ||||||
| use Illuminate\Http\Middleware\TrustHosts as Middleware; | use Illuminate\Http\Middleware\TrustHosts as Middleware; | ||||||
|  |  | ||||||
| class TrustHosts extends Middleware | class TrustHosts extends Middleware | ||||||
| { | { | ||||||
|     /** |  | ||||||
|      * Get the host patterns that should be trusted. |     public function hosts(): array | ||||||
|      * |  | ||||||
|      * @return array<int, string|null> |  | ||||||
|      */ |  | ||||||
|     public function hosts() |  | ||||||
|     { |     { | ||||||
|         return [ |         return [ | ||||||
|             $this->allSubdomainsOfApplicationUrl(), |             $this->allSubdomainsOfApplicationUrl(), | ||||||
|         ]; |         ]; | ||||||
|     } |     } | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -7,22 +7,13 @@ use Illuminate\Http\Request; | |||||||
|  |  | ||||||
| class TrustProxies extends Middleware | class TrustProxies extends Middleware | ||||||
| { | { | ||||||
|     /** |  | ||||||
|      * The trusted proxies for this application. |  | ||||||
|      * |  | ||||||
|      * @var array<int, string>|string|null |  | ||||||
|      */ |  | ||||||
|     protected $proxies; |  | ||||||
|  |  | ||||||
|     /** |     protected $proxies; | ||||||
|      * The headers that should be used to detect proxies. |  | ||||||
|      * |  | ||||||
|      * @var int |  | ||||||
|      */ |  | ||||||
|     protected $headers = |     protected $headers = | ||||||
|         Request::HEADER_X_FORWARDED_FOR | |         Request::HEADER_X_FORWARDED_FOR | | ||||||
|         Request::HEADER_X_FORWARDED_HOST | |         Request::HEADER_X_FORWARDED_HOST | | ||||||
|         Request::HEADER_X_FORWARDED_PORT | |         Request::HEADER_X_FORWARDED_PORT | | ||||||
|         Request::HEADER_X_FORWARDED_PROTO | |         Request::HEADER_X_FORWARDED_PROTO | | ||||||
|         Request::HEADER_X_FORWARDED_AWS_ELB; |         Request::HEADER_X_FORWARDED_AWS_ELB; | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,17 +0,0 @@ | |||||||
| <?php |  | ||||||
|  |  | ||||||
| namespace App\Http\Middleware; |  | ||||||
|  |  | ||||||
| use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware; |  | ||||||
|  |  | ||||||
| class VerifyCsrfToken extends Middleware |  | ||||||
| { |  | ||||||
|     /** |  | ||||||
|      * The URIs that should be excluded from CSRF verification. |  | ||||||
|      * |  | ||||||
|      * @var array<int, string> |  | ||||||
|      */ |  | ||||||
|     protected $except = [ |  | ||||||
|         // |  | ||||||
|     ]; |  | ||||||
| } |  | ||||||
		Reference in New Issue
	
	Block a user