Merge pull request #32 from TheDragonCode/2.x

Added Laravel 10 support
TheDragonCode · Feb 15, 2023 · 915fa29 · 915fa29
2 parents d70c1f2 + 51ac69b
commit 915fa29
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
@@ -9,23 +9,38 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                laravel: [ "6.0", "7.0", "8.0", "9.0" ]
-                php: [ "7.3", "7.4", "8.0", "8.1" ]
+                php: [ "7.3", "7.4", "8.0", "8.1", "8.2" ]
+                laravel: [ "6.0", "7.0", "8.0", "9.0", "10.0" ]
                 exclude:
                     -   laravel: "6.0"
                         php: "8.1"
 
+                    -   laravel: "6.0"
+                        php: "8.2"
+
                     -   laravel: "7.0"
                         php: "8.1"
 
+                    -   laravel: "7.0"
+                        php: "8.2"
+
                     -   laravel: "9.0"
                         php: "7.3"
 
                     -   laravel: "9.0"
                         php: "7.4"
 
+                    -   laravel: "10.0"
+                        php: "7.3"
+
+                    -   laravel: "10.0"
+                        php: "7.4"
+
+                    -   laravel: "10.0"
+                        php: "8.0"
+
 
-        name: ${{ matrix.laravel }}, PHP ${{ matrix.php }}
+        name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}
 
         steps:
             -   name: Checkout code

diff --git a/composer.json b/composer.json
@@ -43,15 +43,15 @@
     ],
     "require": {
         "php": "^7.3 || ^8.0",
-        "illuminate/contracts": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/http": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/contracts": ">=6.0 <11.0",
+        "illuminate/http": ">=6.0 <11.0",
+        "illuminate/support": ">=6.0 <11.0",
         "lmc/http-constants": "^1.2",
         "symfony/http-foundation": "^4.3 || ^5.0 || ^6.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "phpunit/phpunit": "^9.0"
+        "orchestra/testbench": ">=4.0 <9.0",
+        "phpunit/phpunit": "^9.6"
     },
     "conflict": {
         "andrey-helldar/laravel-json-response": "*"