laravel-11: update composer.json

deligoez · Jul 23, 2024 · a387c79 · a387c79
1 parent be1b307
commit a387c79
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -28,10 +28,12 @@ jobs:
         laravel: ['10.*', '11.*']
         dependency-version: [prefer-lowest, prefer-stable]
         include:
-          -   laravel: 10.*
-              testbench: 8.*
-          -   laravel: 11.*
-              testbench: 9.*
+          - laravel: 10.*
+            testbench: 8.*
+            phpunit: 10.*
+          - laravel: 11.*
+            testbench: 9.*
+            phpunit: 11.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -54,7 +56,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --dev
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "phpunit/phpunit:${{ matrix.phpunit }}" --no-interaction --dev
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: Validate composer.json and composer.lock

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -29,8 +29,10 @@ jobs:
         include:
           - laravel: 10.*
             testbench: 8.*
+            phpunit: 10.*
           - laravel: 11.*
             testbench: 9.*
+            phpunit: 11.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -53,7 +55,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --dev
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "phpunit/phpunit:${{ matrix.phpunit }}" --no-interaction --dev
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: Validate composer.json and composer.lock

diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "phpstan/extension-installer": "^1.2",
         "phpstan/phpstan-deprecation-rules": "^1.1.1",
         "phpstan/phpstan-phpunit": "^1.3.3",
-        "phpunit/phpunit": "^11.0"
+        "phpunit/phpunit": "^10.0|^11.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,