Merge pull request #61 from laravel-shift/l11-compatibility

Laravel 11.x Compatibility
saloonphp · Mar 13, 2024 · 15be0d5 · 15be0d5
2 parents 86aedca + 7aeb1a0
commit 15be0d5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,16 +16,22 @@ permissions:
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
         php: [8.1, 8.2, 8.3]
-        laravel: [10.*]
+        laravel: ['10.*', '11.*']
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -37,7 +43,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, bcmath, intl, exif, iconv, fileinfo
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, bcmath, intl, exif, iconv, fileinfo, sqlite, pdo_sqlite
           coverage: none
 
       - name: Setup problem matchers

diff --git a/composer.json b/composer.json
@@ -20,18 +20,19 @@
     "homepage": "https://github.com/saloonphp/laravel-plugin",
     "require": {
         "php": "^8.1",
-        "illuminate/console": "^10.0",
-        "illuminate/support": "^10.0",
+        "illuminate/console": "^10.0 || ^11.0",
+        "illuminate/support": "^10.0 || ^11.0",
         "saloonphp/saloon": "^3.5",
-        "symfony/finder": "^6.4"
+        "symfony/finder": "^6.4 || ^7.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.48",
-        "orchestra/testbench": "^8.21",
+        "orchestra/testbench": "^8.21 || ^9.0",
         "pestphp/pest": "^2.32",
         "phpstan/phpstan": "^1.10.56"
     },
     "minimum-stability": "stable",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Saloon\\Laravel\\": "src/"
@@ -65,11 +66,11 @@
         "fix-code": [
             "./vendor/bin/php-cs-fixer fix --allow-risky=yes"
         ],
-        "test": [
-            "./vendor/bin/pest"
-        ],
         "pstan": [
             "./vendor/bin/phpstan analyse"
+        ],
+        "test": [
+            "./vendor/bin/pest"
         ]
     }
 }