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

Laravel 11.x Compatibility
spatie · Mar 8, 2024 · a664474 · a664474
2 parents 3592417 + 149eda4
commit a664474
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,16 +1,19 @@
 name: run-tests
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
         php: [8.1, 8.2, 8.3]
-        laravel: [9.*, 8.*, 10.*]
+        laravel: ['8.*', '9.*', '10.*', '11.*']
         stability: [prefer-stable]
         include:
           - laravel: 10.*
@@ -19,6 +22,11 @@ jobs:
             testbench: 7.*
           - laravel: 8.*
             testbench: ^6.23
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -33,20 +41,13 @@ jobs:
         ports:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
       redis:
         image: redis
         ports:
           - 6379:6379
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+        options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-
-
       - name: Checkout code
         uses: actions/checkout@v3
 
@@ -74,4 +75,3 @@ jobs:
           DB_PASSWORD: secret
           DB_PORT: ${{ job.services.mysql.ports[3306] }}
           REDIS_PORT: 6379
-
diff --git a/composer.json b/composer.json
@@ -19,33 +19,33 @@
         "php": "^8.0",
         "dragonmantank/cron-expression": "^3.3.1",
         "guzzlehttp/guzzle": "^6.5|^7.4.5|^7.2",
-        "illuminate/console": "^8.75|^9.0|^10.0",
-        "illuminate/contracts": "^8.75|^9.0|^10.0",
-        "illuminate/database": "^8.75|^9.0|^10.0",
-        "illuminate/notifications": "^8.75|^9.0|^10.0",
-        "illuminate/support": "^8.75|^9.0|^10.0",
+        "illuminate/console": "^8.75|^9.0|^10.0|^11.0",
+        "illuminate/contracts": "^8.75|^9.0|^10.0|^11.0",
+        "illuminate/database": "^8.75|^9.0|^10.0|^11.0",
+        "illuminate/notifications": "^8.75|^9.0|^10.0|^11.0",
+        "illuminate/support": "^8.75|^9.0|^10.0|^11.0",
         "nunomaduro/termwind": "^1.0|^2.0",
         "spatie/enum": "^3.13",
         "spatie/laravel-package-tools": "^1.12.1",
         "spatie/regex": "^3.1.1|^3.1",
         "spatie/temporary-directory": "^2.2",
-        "symfony/process": "^5.4|^6.0"
+        "symfony/process": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
         "laravel/horizon": "^5.9.10",
-        "laravel/slack-notification-channel": "^2.4",
-        "nunomaduro/collision": "^5.10|^6.2.1|^6.1",
+        "laravel/slack-notification-channel": "^2.4|^3.2",
+        "nunomaduro/collision": "^5.10|^6.2.1|^6.1|^8.0",
         "larastan/larastan": "^1.0.3|^2.4",
-        "orchestra/testbench": "^6.23|^7.6|^8.0",
-        "pestphp/pest": "^1.21.3",
-        "pestphp/pest-plugin-laravel": "^1.2",
+        "orchestra/testbench": "^6.23|^7.6|^8.0|^9.0",
+        "pestphp/pest": "^1.21.3|^2.34",
+        "pestphp/pest-plugin-laravel": "^1.2|^2.3",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.1.1",
-        "phpunit/phpunit": "^9.5.21|^9.5.10",
+        "phpunit/phpunit": "^9.5.21|^9.5.10|^10.5",
         "spatie/laravel-ray": "^1.30",
-        "spatie/pest-plugin-snapshots": "^1.1",
-        "spatie/pest-plugin-test-time": "^1.1.1|^1.1",
+        "spatie/pest-plugin-snapshots": "^1.1|^2.1",
+        "spatie/pest-plugin-test-time": "^1.1.1|^1.1|^2.0",
         "spatie/test-time": "^1.3"
     },
     "autoload": {