Merge branch 'master' into v5

# Conflicts: # .github/workflows/tests.yml # composer.json # composer.lock
sourcetoad · Mar 14, 2022 · dc01ad2 · dc01ad2
2 parents 69c623f + 5ec1441
commit dc01ad2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,8 +8,16 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.0, 8.1]
+        laravel: [8.0, 9.0]
         stability: [prefer-lowest, prefer-stable]
-    name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
+        include:
+          - laravel: 8.0
+            collision: 5.0
+            testbench: 6.0
+          - laravel: 9.0
+            collision: 6.0
+            testbench: 7.0
+    name: PHP ${{ matrix.php }} - Laravel v${{ matrix.laravel }} - ${{ matrix.stability }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -37,5 +45,8 @@ jobs:
       - name: Install dependencies
         run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
+      - name: Require specific versions of packages
+        run: composer update laravel/framework:^${{ matrix.laravel }} nunomaduro/collision:^${{ matrix.collision }} orchestra/testbench:^${{ matrix.testbench }} -W
+
       - name: Execute tests
         run: vendor/bin/phpunit --verbose
diff --git a/composer.json b/composer.json
@@ -26,6 +26,6 @@
     "require-dev": {
         "nunomaduro/collision": "^5.10|^6.0",
         "orchestra/testbench": "^6.22|^7.0",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^9.5"
     }
 }