#198 - Laravel 11 upgrade

blumilksoftware · Mar 20, 2024 · 2a7b97f · 2a7b97f
1 parent dfde2e0
commit 2a7b97f
Show file tree

Hide file tree

Showing 31 changed files with 770 additions and 1,154 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -4,12 +4,6 @@
 
 namespace Blumilk\Website\Http\Controllers;
 
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller as BaseController;
-
-class Controller extends BaseController
+abstract class Controller
 {
-    use AuthorizesRequests;
-    use ValidatesRequests;
 }
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
diff --git a/app/Http/Middleware/TrustHosts.php b/app/Http/Middleware/TrustHosts.php
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -2,18 +2,25 @@
 
 declare(strict_types=1);
 
-use Blumilk\Website\Console\Kernel as ConsoleKernel;
-use Blumilk\Website\Exceptions\Handler;
-use Blumilk\Website\Http\Kernel as HttpKernel;
-use Illuminate\Contracts\Console\Kernel as ConsoleKernelContract;
-use Illuminate\Contracts\Debug\ExceptionHandler;
-use Illuminate\Contracts\Http\Kernel as HttpKernelContract;
+use CodeZero\LocalizedRoutes\Controllers\FallbackController;
 use Illuminate\Foundation\Application;
+use Illuminate\Support\Facades\Route;
 
-$app = new Application($_ENV["APP_BASE_PATH"] ?? dirname(__DIR__));
+return Application::configure(basePath: dirname(__DIR__))
+    ->withRouting(
+        using: function (): void {
+            Route::middleware("web")
+                ->prefix("dashboard")
+                ->group(base_path("routes/dashboard.php"));
 
-$app->singleton(HttpKernelContract::class, HttpKernel::class);
-$app->singleton(ConsoleKernelContract::class, ConsoleKernel::class);
-$app->singleton(ExceptionHandler::class, Handler::class);
+            Route::localized(function (): void {
+                Route::middleware("web")
+                    ->group(base_path("routes/web.php"));
+            });
 
-return $app;
+            Route::fallback(FallbackController::class);
+        },
+    )
+    ->withMiddleware()
+    ->withExceptions()
+    ->create();
diff --git a/bootstrap/providers.php b/bootstrap/providers.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Blumilk\Website\Providers\AppServiceProvider;
+
+return [
+    AppServiceProvider::class,
+];
diff --git a/composer.json b/composer.json
@@ -5,22 +5,22 @@
     "keywords": ["framework", "laravel"],
     "license": "MIT",
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "ext-pdo": "*",
-        "codezero/laravel-localized-routes": "^3.1",
-        "guzzlehttp/guzzle": "^7.8.0",
-        "laravel/framework": "^10.32.1",
-        "laravel/sanctum": "^3.3.2",
-        "laravel/tinker": "^2.8.2"
+        "codezero/laravel-localized-routes": "^4.0",
+        "guzzlehttp/guzzle": "^7.8",
+        "laravel/framework": "^11.0",
+        "laravel/sanctum": "^4.0",
+        "laravel/tinker": "^2.9"
     },
     "require-dev": {
-        "blumilksoftware/codestyle": "^v2.8.0",
-        "fakerphp/faker": "^1.23.0",
-        "mockery/mockery": "^1.6.6",
-        "nunomaduro/collision": "^7.10.0",
-        "nunomaduro/larastan": "^2.6.4",
-        "phpunit/phpunit": "^10.4.2",
-        "spatie/laravel-ignition": "^2.3.1"
+        "blumilksoftware/codestyle": "^v2.8",
+        "fakerphp/faker": "^1.23",
+        "mockery/mockery": "^1.6",
+        "nunomaduro/collision": "^8.1",
+        "nunomaduro/larastan": "^2.9",
+        "phpunit/phpunit": "^10.5",
+        "spatie/laravel-ignition": "^2.4"
     },
     "autoload": {
         "psr-4": {