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

Laravel 11.x Compatibility
spatie · Feb 29, 2024 · 521ba0e · 521ba0e
2 parents 11eae51 + 2210f1f
commit 521ba0e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 22 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,30 +1,25 @@
 name: Tests
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.0, 8.1, 8.2]
-        laravel: [10.*, 9.*, 8.*]
+        php: [8.2, 8.3]
+        laravel: ['10.*', '11.*']
         dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
-            phpunit: 9.6.*
-          - laravel: 9.*
-            testbench: 7.*
-            phpunit: 9.5.*
-          - laravel: 8.*
-            testbench: 6.*
-            phpunit: 9.4.*
-        exclude:
-          - laravel: 10.*
-            php: 8.0
+          - laravel: 11.*
+            testbench: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
@@ -39,13 +34,9 @@ jobs:
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
           coverage: none
 
-      - name: Configure for PHP 8.2
-        run: composer config platform.php 8.1.99
-        if: matrix.php == '8.2'
-
       - name: Install dependencies
         run: |
-          composer require "phpunit/phpunit:${{ matrix.phpunit }}" "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests

diff --git a/composer.json b/composer.json
@@ -17,12 +17,12 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/contracts": "^8.70|^9.0|^10.0",
-        "nesbot/carbon": "^2.63"
+        "illuminate/contracts": "^10.0|^11.0",
+        "nesbot/carbon": "^2.63|^3.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.25|^7.0|^8.0",
-        "phpunit/phpunit": "^9.5.10"
+        "orchestra/testbench": "^8.0|^9.0",
+        "phpunit/phpunit": "^9.5.10|^10.5"
     },
     "autoload": {
         "psr-4": {