PHP 8.1 and Laravel 9

Author: DKravtsov

.editorconfig

@@ -11,7 +11,7 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2
 
 [{composer.json,Makefile}]

.env.dev

@@ -5,6 +5,7 @@ APP_DEBUG=true
 APP_URL=http://localhost
 
 LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
 DB_CONNECTION=mysql
@@ -16,7 +17,7 @@ DB_PASSWORD=secret
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
-FILESYSTEM_DRIVER=local
+FILESYSTEM_DISK=local
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
@@ -33,7 +34,7 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
+MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=

.php-cs-fixer.dist.php

@@ -19,16 +19,19 @@
         'blank_line_before_statement' => ['statements' => ['continue', 'declare', 'return', 'throw', 'try']],
         'single_blank_line_before_namespace' => true,
         'blank_line_after_namespace' => true,
-        'blank_line_after_opening_tag' => true,
+        'phpdoc_align' => ['align' => 'left'],
+        'types_spaces' => 'single',
 
         // skip list (see ecs.php)
         'no_multiline_whitespace_around_double_arrow' => false,
         'phpdoc_no_package' => false,
         'phpdoc_summary' => false,
         'phpdoc_separation' => false,
+        'blank_line_after_opening_tag' => false,
         'class_attributes_separation' => false,
         'no_blank_lines_before_namespace' => false,
         'not_operator_with_successor_space' => false,
         'single_line_throw' => false,
-
-    ])->setFinder($finder);
+        'no_extra_blank_lines' => ['tokens' => ['break']],
+    ])
+    ->setFinder($finder);

.styleci.yml

@@ -1,12 +1,10 @@
 php:
   preset: laravel
-  version: 8
   disabled:
     - no_unused_imports
   finder:
     not-name:
       - index.php
-      - server.php
 js:
   finder:
     not-name:

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-apache
+FROM php:8.1-apache
 
 # set main params
 ARG BUILD_ARGUMENT_DEBUG_ENABLED=false

app/Exceptions/Handler.php

@@ -9,6 +9,13 @@
 
 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.
      *

app/Http/Kernel.php

@@ -18,7 +18,7 @@ class Kernel extends HttpKernel
     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,
@@ -35,7 +35,6 @@ class Kernel extends HttpKernel
             \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,
@@ -58,6 +57,7 @@ class Kernel extends HttpKernel
     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,

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -14,8 +14,9 @@ class RedirectIfAuthenticated
     /**
      * Handle an incoming request.
      *
+     * @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/TrustHosts.php

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

app/Providers/EventServiceProvider.php

@@ -29,4 +29,12 @@ class EventServiceProvider extends ServiceProvider
     public function boot(): void
     {
     }
+
+    /**
+     * Determine if events and listeners should be automatically discovered.
+     */
+    public function shouldDiscoverEvents(): bool
+    {
+        return false;
+    }
 }

app/Providers/RouteServiceProvider.php

@@ -19,15 +19,6 @@ class RouteServiceProvider extends ServiceProvider
      */
     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.
      */
@@ -36,13 +27,11 @@ public function boot(): void
         $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'));
         });
     }
@@ -53,7 +42,7 @@ public function boot(): void
     protected function configureRateLimiting(): void
     {
         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());
         });
     }
 }

composer.json

@@ -21,36 +21,35 @@
 		}
 	],
 	"require": {
-		"php": "^8.0",
+		"php": "^8.1",
 		"ext-ctype": "*",
 		"ext-iconv": "*",
 		"ext-json": "*",
 		"ext-mbstring": "*",
 		"ext-pdo": "*",
 		"ext-pdo_mysql": "*",
-		"fruitcake/laravel-cors": "^2.0",
 		"guzzlehttp/guzzle": "^7.4",
 		"jaybizzle/laravel-migrations-organiser": "^6.1",
-		"laravel/framework": "^8.76",
-		"laravel/sanctum": "^2.13",
-		"laravel/tinker": "^2.6"
+		"laravel/framework": "^9.2",
+		"laravel/sanctum": "^2.14",
+		"laravel/tinker": "^2.7"
 	},
 	"require-dev": {
-		"bamarni/composer-bin-plugin": "^1.4",
+		"bamarni/composer-bin-plugin": "^1.5",
 		"barryvdh/laravel-ide-helper": "^2.10",
-		"ergebnis/composer-normalize": "^2.18",
-		"facade/ignition": "^2.5",
+		"ergebnis/composer-normalize": "^2.22",
 		"fakerphp/faker": "^1.9",
 		"laravel/sail": "^1.0",
 		"mockery/mockery": "^1.4",
 		"neronmoon/scriptsdev": "^0.1",
-		"nunomaduro/collision": "^5.0",
+		"nunomaduro/collision": "^6.1",
+		"spatie/laravel-ignition": "^1.0",
 		"roave/security-advisories": "dev-latest"
 	},
 	"config": {
 		"optimize-autoloader": true,
 		"platform": {
-			"php": "8.0.0"
+			"php": "8.1.0"
 		},
 		"preferred-install": "dist",
 		"sort-packages": true,
@@ -63,6 +62,8 @@
 	},
 	"extra": {
 		"bamarni-bin": {
+			"bin-links": true,
+			"forward-command": true,
 			"target-directory": "tools"
 		},
 		"laravel": {