Merge pull request #160 from erikn69/patch-7

Laravel 12 Support
spatie · Feb 6, 2025 · 98f162b · 98f162b
2 parents a02cc40 + 6168162
commit 98f162b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -18,6 +18,6 @@ jobs:
           args: --config=.php-cs-fixer.dist.php --allow-risky=yes
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Fix styling
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,8 +9,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.0, 8.1, 8.2]
-        laravel: [11.*, 10.*, 9.*]
+        php: [8.0, 8.1, 8.2, 8.3, 8.4]
+        laravel: [12.*, 11.*, 10.*, 9.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 9.*
@@ -19,13 +19,19 @@ jobs:
             testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
+          - laravel: 12.*
+            testbench: 10.*
         exclude:
           - laravel: 10.*
             php: 8.0
           - laravel: 11.*
             php: 8.0
           - laravel: 11.*
             php: 8.1
+          - laravel: 12.*
+            php: 8.0
+          - laravel: 12.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -45,9 +51,14 @@ jobs:
           echo "::add-matcher::${{ runner.tool_cache }}/php.json"
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
+      - name: Fix dependencies
+        if: ${{ startsWith(matrix.laravel, '9') }}
+        run: |
+          composer require "nesbot/carbon:^2.72.6" --no-interaction --no-update
+
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:^2.72.2" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: Execute tests

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
@@ -21,7 +21,7 @@ jobs:
           release-notes: ${{ github.event.release.body }}
 
       - name: Commit updated CHANGELOG
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           branch: main
           commit_message: Update CHANGELOG

diff --git a/composer.json b/composer.json
@@ -16,13 +16,13 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/contracts": "^9.28|^10.0|^11.0"
+        "illuminate/contracts": "^9.28|^10.0|^11.0|^12.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.5",
-        "orchestra/testbench": "^7.7|^8.0|^9.0",
-        "pestphp/pest": "^1.22|^2",
-        "phpunit/phpunit": "^9.5.24|^10.5",
+        "orchestra/testbench": "^7.7|^8.0|^9.0|^10.0",
+        "pestphp/pest": "^1.23|^2.1|^3.1",
+        "phpunit/phpunit": "^9.5.24|^10.5|^11.5",
         "spatie/pest-plugin-test-time": "^1.1|^2.2"
     },
     "autoload": {