⬆️ Support to latest laravel

app/Console/Kernel.php

@@ -7,15 +7,6 @@
 
 class Kernel extends ConsoleKernel
 {
- /**
- * The Artisan commands provided by your application.
- *
- * @var array
- */
- protected $commands = [
- //
- ];
-
  /**
  * Define the application's command schedule.
  *
@@ -35,7 +26,7 @@ protected function schedule(Schedule $schedule)
  */
  protected function commands()
  {
- $this->load(__DIR__ . '/Commands');
+ $this->load(__DIR__.'/Commands');
 
  require base_path('routes/console.php');
  }

app/Exceptions/Handler.php

@@ -7,19 +7,28 @@
 
 class Handler extends ExceptionHandler
 {
+ /**
+ * A list of exception types with their corresponding custom log levels.
+ *
+ * @var array<class-string<\Throwable>, \Psr\Log\LogLevel::*>
+ */
+ protected $levels = [
+ //
+ ];
+
  /**
  * A list of the exception types that are not reported.
  *
- * @var array
+ * @var array<int, class-string<\Throwable>>
  */
  protected $dontReport = [
  //
  ];
 
  /**
- * A list of the inputs that are never flashed for validation exceptions.
+ * A list of the inputs that are never flashed to the session on validation exceptions.
  *
- * @var array
+ * @var array<int, string>
  */
  protected $dontFlash = [
  'current_password',

app/Http/Controllers/Controller.php

@@ -9,7 +9,5 @@
 
 class Controller extends BaseController
 {
- use AuthorizesRequests;
- use DispatchesJobs;
- use ValidatesRequests;
+ use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 }

app/Http/Kernel.php

@@ -11,12 +11,12 @@ class Kernel extends HttpKernel
  *
  * These middleware are run during every request to your application.
  *
- * @var array
+ * @var array<int, class-string|string>
  */
  protected $middleware = [
  // \App\Http\Middleware\TrustHosts::class,
  \App\Http\Middleware\TrustProxies::class,
- \Fruitcake\Cors\HandleCors::class,
+ \Illuminate\Http\Middleware\HandleCors::class,
  \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
  \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
  \App\Http\Middleware\TrimStrings::class,
@@ -26,20 +26,20 @@ class Kernel extends HttpKernel
  /**
  * The application's route middleware groups.
  *
- * @var array
+ * @var array<string, array<int, class-string|string>>
  */
  protected $middlewareGroups = [
  'web' => [
  \App\Http\Middleware\EncryptCookies::class,
  \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
  \Illuminate\Session\Middleware\StartSession::class,
- // \Illuminate\Session\Middleware\AuthenticateSession::class,
  \Illuminate\View\Middleware\ShareErrorsFromSession::class,
  \App\Http\Middleware\VerifyCsrfToken::class,
  \Illuminate\Routing\Middleware\SubstituteBindings::class,
  ],
 
  'api' => [
+ // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
  'throttle:api',
  \Illuminate\Routing\Middleware\SubstituteBindings::class,
  ],
@@ -50,16 +50,17 @@ class Kernel extends HttpKernel
  *
  * These middleware may be assigned to groups or used individually.
  *
- * @var array
+ * @var array<string, class-string|string>
  */
  protected $routeMiddleware = [
  'auth' => \App\Http\Middleware\Authenticate::class,
  'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+ 'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
  'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::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,
+ 'signed' => \App\Http\Middleware\ValidateSignature::class,
  'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
  'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
  ];

app/Http/Middleware/EncryptCookies.php

@@ -9,7 +9,7 @@ class EncryptCookies extends Middleware
  /**
  * The names of the cookies that should not be encrypted.
  *
- * @var array
+ * @var array<int, string>
  */
  protected $except = [
  //

app/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -9,7 +9,7 @@ class PreventRequestsDuringMaintenance extends Middleware
  /**
  * The URIs that should be reachable while maintenance mode is enabled.
  *
- * @var array
+ * @var array<int, string>
  */
  protected $except = [
  //

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -13,9 +13,9 @@ class RedirectIfAuthenticated
  * Handle an incoming request.
  *
  * @param \Illuminate\Http\Request $request
- * @param \Closure $next
+ * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
  * @param string|null ...$guards
- * @return mixed
+ * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
  */
  public function handle(Request $request, Closure $next, ...$guards)
  {

app/Http/Middleware/TrimStrings.php

@@ -9,7 +9,7 @@ class TrimStrings extends Middleware
  /**
  * The names of the attributes that should not be trimmed.
  *
- * @var array
+ * @var array<int, string>
  */
  protected $except = [
  'current_password',

app/Http/Middleware/TrustHosts.php

@@ -9,7 +9,7 @@ class TrustHosts extends Middleware
  /**
  * Get the host patterns that should be trusted.
  *
- * @return array
+ * @return array<int, string|null>
  */
  public function hosts()
  {

app/Http/Middleware/TrustProxies.php

@@ -2,15 +2,15 @@
 
 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
 {
  /**
  * The trusted proxies for this application.
  *
- * @var array|string|null
+ * @var array<int, string>|string|null
  */
  protected $proxies;
 
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
  *
  * @var int
  */
- 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;
+ 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;
 }

app/Http/Middleware/ValidateSignature.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Routing\Middleware\ValidateSignature as Middleware;
+
+class ValidateSignature extends Middleware
+{
+ /**
+ * The names of the query string parameters that should be ignored.
+ *
+ * @var array<int, string>
+ */
+ protected $except = [
+ // 'fbclid',
+ // 'utm_campaign',
+ // 'utm_content',
+ // 'utm_medium',
+ // 'utm_source',
+ // 'utm_term',
+ ];
+}

app/Http/Middleware/VerifyCsrfToken.php

@@ -9,7 +9,7 @@ class VerifyCsrfToken extends Middleware
  /**
  * The URIs that should be excluded from CSRF verification.
  *
- * @var array
+ * @var array<int, string>
  */
  protected $except = [
  //

app/Models/User.php

@@ -2,23 +2,22 @@
 
 namespace App\Models;
 
+// use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Lab404\Impersonate\Models\Impersonate;
 use Laravel\Passport\HasApiTokens;
 
 class User extends \TCG\Voyager\Models\User
 {
- use HasApiTokens;
- use HasFactory;
- use Notifiable;
- use Impersonate;
+ use HasApiTokens, HasFactory, Notifiable, Impersonate;
 
  /**
  * The attributes that are mass assignable.
  *
- * @var array
+ * @var array<int, string>
  */
  protected $fillable = [
  'name',
@@ -27,19 +26,19 @@ class User extends \TCG\Voyager\Models\User
  ];
 
  /**
- * The attributes that should be hidden for arrays.
+ * The attributes that should be hidden for serialization.
  *
- * @var array
+ * @var array<int, string>
  */
  protected $hidden = [
  'password',
  'remember_token',
  ];
 
  /**
- * The attributes that should be cast to native types.
+ * The attributes that should be cast.
  *
- * @var array
+ * @var array<string, string>
  */
  protected $casts = [
  'email_verified_at' => 'datetime',

app/Providers/AuthServiceProvider.php

@@ -2,15 +2,16 @@
 
 namespace App\Providers;
 
+// use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Laravel\Passport\Passport;
 
 class AuthServiceProvider extends ServiceProvider
 {
  /**
- * The policy mappings for the application.
+ * The model to policy mappings for the application.
  *
- * @var array
+ * @var array<class-string, class-string>
  */
  protected $policies = [
  // 'App\Models\Model' => 'App\Policies\ModelPolicy',

app/Providers/EventServiceProvider.php

@@ -10,9 +10,9 @@
 class EventServiceProvider extends ServiceProvider
 {
  /**
- * The event listener mappings for the application.
+ * The event to listener mappings for the application.
  *
- * @var array
+ * @var array<class-string, array<int, class-string>>
  */
  protected $listen = [
  Registered::class => [
@@ -29,4 +29,14 @@ public function boot()
  {
  //
  }
+
+ /**
+ * Determine if events and listeners should be automatically discovered.
+ *
+ * @return bool
+ */
+ public function shouldDiscoverEvents()
+ {
+ return false;
+ }
 }

app/Providers/RouteServiceProvider.php

@@ -13,23 +13,14 @@ class RouteServiceProvider extends ServiceProvider
  /**
  * The path to the "home" route for your application.
  *
- * This is used by Laravel authentication to redirect users after login.
+ * Typically, users are redirected here after authentication.
  *
  * @var string
  */
  public const HOME = '/home';
 
  /**
- * The controller namespace for the application.
- *
- * When present, controller route declarations will automatically be prefixed with this namespace.
- *
- * @var string|null
- */
- // protected $namespace = 'App\\Http\\Controllers';
-
- /**
- * Define your route model bindings, pattern filters, etc.
+ * Define your route model bindings, pattern filters, and other route configuration.
  *
  * @return void
  */
@@ -38,13 +29,11 @@ public function boot()
  $this->configureRateLimiting();
 
  $this->routes(function () {
- Route::prefix('api')
- ->middleware('api')
- ->namespace($this->namespace)
+ Route::middleware('api')
+ ->prefix('api')
  ->group(base_path('routes/api.php'));
 
  Route::middleware('web')
- ->namespace($this->namespace)
  ->group(base_path('routes/web.php'));
  });
  }
@@ -57,7 +46,7 @@ public function boot()
  protected function configureRateLimiting()
  {
  RateLimiter::for('api', function (Request $request) {
- return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
+ return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
  });
  }
 }