From da395cf25d46d49f6b44085a6bd9dad960f7044a Mon Sep 17 00:00:00 2001
From: Alexandr Chernyaev <bliz48rus@gmail.com>
Date: Tue, 19 Mar 2024 05:19:50 +0300
Subject: [PATCH] Support Laravel 11.x (#2814)

---
 .github/workflows/phpunit.yml     | 15 +++++++++++----
 composer.json                     | 12 ++++++------
 src/Support/Facades/Dashboard.php |  4 ++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 86599ba5a..e816c73b7 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -8,13 +8,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.1]
+        php: [8.3, 8.2, 8.1]
         os: [ubuntu-latest, windows-latest]
-        laravel: [10.*]
+        laravel: ["11.*", "10.*",]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
+          - laravel: 11.*
+            testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
+        exclude:
+          - laravel: 10.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - ${{ matrix.os }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
@@ -59,13 +66,13 @@ jobs:
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
       - name: Make SQLite database
-        run: vendor/orchestra/testbench-dusk/create-sqlite-db
+        run: vendor/bin/testbench-dusk workbench:create-sqlite-db
 
       - name: Update Dusk Chromedriver
         run: vendor/bin/dusk-updater detect --auto-update
 
       - name: Execute Unit Tests
-        run: vendor/bin/phpunit --testsuite=Browser  --no-coverage --disable-coverage-ignore
+        run: vendor/bin/phpunit --testsuite=Browser --no-coverage --disable-coverage-ignore
         env:
           RUNNING_IN_CI: true
 
diff --git a/composer.json b/composer.json
index 5329145e0..273b5b01e 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         "ext-json": "*",
         "orchid/blade-icons": "^4.0",
         "tabuna/breadcrumbs": "^4.0",
-        "laravel/framework": "^10.0",
+        "laravel/framework": "^10.0||^11.0",
         "laravel/scout": "^9.0 || ^10.0",
         "watson/active": "^7.0",
         "twbs/bootstrap-icons": "^1.10"
@@ -47,11 +47,11 @@
     "require-dev": {
         "doctrine/dbal": "^2.10 || ^3.0",
         "fakerphp/faker": "^1.9.1",
-        "laravel/pint": "^1.2",
-        "orchestra/testbench-core": "^8.0",
-        "orchestra/testbench-dusk": "^8.0",
-        "phpunit/php-code-coverage": "^10.0",
-        "phpunit/phpunit": "^10.0",
+        "laravel/pint": "^1.14",
+        "orchestra/testbench-core": "^8.0 || ^9.0",
+        "orchestra/testbench-dusk": "^8.0 || ^9.0",
+        "phpunit/php-code-coverage": "^10.0 || ^11.0",
+        "phpunit/phpunit": "^10.0 || ^11.0",
         "vimeo/psalm": "^5.0"
     },
     "conflict": {
diff --git a/src/Support/Facades/Dashboard.php b/src/Support/Facades/Dashboard.php
index 0081f124b..60a59dc1c 100644
--- a/src/Support/Facades/Dashboard.php
+++ b/src/Support/Facades/Dashboard.php
@@ -19,11 +19,11 @@
  * @method static string      prefix(string $path = '')
  * @method        static      configure(array $options)
  * @method        static      option(string $key, ?string $default = null)
- * @method        static      modelClass(string $key, string $default = null)
+ * @method static mixed       modelClass(string $key, string $default = null)
  * @method        static      model(string $key, string $default = null)
  * @method        static      useModel(string $key, string $custom)
  * @method static bool        checkUpdate()
- * @method        static      setCurrentScreen(Screen $screen, bool $partialRequest = false)
+ * @method static self        setCurrentScreen(Screen $screen, bool $partialRequest = false)
  * @method static Screen|null getCurrentScreen()
  * @method static bool        isPartialRequest()
  */