From 28a2cec58201e1c214fd20c204422ed1ed13aa36 Mon Sep 17 00:00:00 2001
From: Andrey Helldar <helldar@dragon-code.pro>
Date: Wed, 13 Mar 2024 10:54:57 +0300
Subject: [PATCH 1/2] Added Laravel 11 support

---
 .github/workflows/phpunit.yml | 21 ++++++++++++++++++---
 composer.json                 |  6 +++---
 phpunit.xml                   |  4 ++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index af65629..c9a14df 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -9,8 +9,8 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [ "7.4", "8.0", "8.1", "8.2" ]
-                laravel: [ "7.0", "8.0", "9.0", "10.0" ]
+                php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ]
+                laravel: [ "7.0", "8.0", "9.0", "10.0", "11.0" ]
                 exclude:
                     -   laravel: "7.0"
                         php: "8.1"
@@ -18,15 +18,30 @@ jobs:
                     -   laravel: "7.0"
                         php: "8.2"
 
+                    -   laravel: "7.0"
+                        php: "8.3"
+
                     -   laravel: "9.0"
                         php: "7.4"
 
+                    -   laravel: "9.0"
+                        php: "8.3"
+
                     -   laravel: "10.0"
                         php: "7.4"
 
                     -   laravel: "10.0"
                         php: "8.0"
 
+                    -   laravel: "11.0"
+                        php: "7.4"
+
+                    -   laravel: "11.0"
+                        php: "8.0"
+
+                    -   laravel: "11.0"
+                        php: "8.1"
+
         name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 
         steps:
@@ -38,7 +53,7 @@ jobs:
                 with:
                     php-version: ${{ matrix.php }}
                     extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv
-                    coverage: none
+                    coverage: xdebug
 
             -   name: Install dependencies
                 run: composer require --dev laravel/framework:^${{ matrix.laravel }}
diff --git a/composer.json b/composer.json
index 8554712..6d435db 100644
--- a/composer.json
+++ b/composer.json
@@ -38,12 +38,12 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "fig/http-message-util": "^1.1",
-        "illuminate/routing": "^7.0 || ^8.0 || ^9.0 || ^10.0"
+        "illuminate/routing": "^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0"
     },
     "require-dev": {
         "dragon-code/extended-routes": "^3.2",
-        "orchestra/testbench": "^5.0 || ^6.0 || ^7.0 || ^8.0",
-        "phpunit/phpunit": "^9.6"
+        "orchestra/testbench": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.6 || ^10.0"
     },
     "minimum-stability": "stable",
     "prefer-stable": true,
diff --git a/phpunit.xml b/phpunit.xml
index b3e0d42..f855540 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -6,8 +6,8 @@
         bootstrap="phpunit.php"
         colors="true"
         convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
+        convertNoticesToExceptions="false"
+        convertWarningsToExceptions="false"
         processIsolation="false"
         stopOnError="false"
         stopOnFailure="false"

From 2403aa9b73d695e126d8a717787b174e47de0ae4 Mon Sep 17 00:00:00 2001
From: Andrey Helldar <helldar@dragon-code.pro>
Date: Wed, 13 Mar 2024 10:57:11 +0300
Subject: [PATCH 2/2] Fixed dependencies

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6d435db..cfca506 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
         "illuminate/routing": "^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0"
     },
     "require-dev": {
-        "dragon-code/extended-routes": "^3.2",
+        "dragon-code/extended-routes": "^3.2 || ^4.0",
         "orchestra/testbench": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
         "phpunit/phpunit": "^9.6 || ^10.0"
     },