Merge branch 'main' into documentation

AkrilliA · Mar 5, 2024 · 4a00fdb · 4a00fdb
2 parents 27098d4 + 436608a
commit 4a00fdb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,6 +9,12 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-14]
         php: ['8.2', '8.3']
+        laravel: [11.*, 10.*]
+        include:
+          - laravel: 11.*
+            testbench: 9.*
+          - laravel: 10.*
+            testbench: 8.*
 
     steps:
       - name: Checkout
@@ -22,8 +28,10 @@ jobs:
           tools: composer:v2
           coverage: none
 
-      - name: Install PHP dependencies
-        run: composer update --prefer-stable --no-interaction --no-progress --ansi
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --prefer-dist --no-interaction
 
       - name: Unit Tests
         run: vendor/bin/phpunit --colors=always
diff --git a/composer.json b/composer.json
@@ -29,9 +29,9 @@
     "require": {
         "php": "^8.2",
         "ext-fileinfo": "^8.2",
-        "illuminate/support": "^10.0",
-        "illuminate/console": "^10.0",
-        "illuminate/filesystem": "^10.0",
+        "illuminate/support": "^10.0|^11.0",
+        "illuminate/console": "^10.0|^11.0",
+        "illuminate/filesystem": "^10.0|^11.0",
         "laravel/prompts": "^0.1.13"
     },
     "extra": {
@@ -43,12 +43,12 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^10.3",
-        "orchestra/testbench": "^8.5",
-        "laravel/pint": "^1.10",
+        "orchestra/testbench": "^8.5|^9.0",
+        "laravel/pint": "^1.10|^2.0",
         "spatie/laravel-query-builder": "^5.2",
-        "spatie/laravel-data": "^3.7",
+        "spatie/laravel-data": "^3.7|^4.0",
         "spatie/laravel-queueable-action": "^2.14",
-        "phpstan/phpstan": "^1.10"
+        "phpstan/phpstan": "^1.10|^2.0"
     },
     "suggest": {
         "spatie/laravel-query-builder": "This package is required for Queries.",
@@ -65,5 +65,6 @@
         "pint": "vendor/bin/pint",
         "test": "vendor/bin/phpunit",
         "phpstan": "vendor/bin/phpstan"
-    }
+    },
+    "minimum-stability": "dev"
 }