add support for laravel 9

jrmajor · Jan 17, 2022 · a0bceac · a0bceac
1 parent 7068320
commit a0bceac
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/sca.yml b/.github/workflows/sca.yml
@@ -6,12 +6,13 @@ on:
 
 jobs:
   static-analysis:
-    name: PHP ${{ matrix.php }}, ${{ matrix.stability }}
+    name: PHP ${{ matrix.php }}, L ${{ matrix.laravel }}, ${{ matrix.stability }}
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
         php: ['8.0', '8.1']
+        laravel: ['8.*', '9.*']
         stability: [prefer-lowest, prefer-stable]
 
     steps:
@@ -36,7 +37,9 @@ jobs:
           restore-keys: composer-
 
       - name: Install Composer dependencies
-        run: composer update --${{ matrix.stability }} --no-progress --no-interaction
+        run: |
+          composer require laravel/framework:${{ matrix.laravel }} --no-progress --no-interaction --no-update
+          composer update --${{ matrix.stability }} --no-progress --no-interaction
 
       - name: Run PHPStan
         run: vendor/bin/phpstan analyse --no-progress --no-interaction
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,12 +6,13 @@ on:
 
 jobs:
   unit-tests:
-    name: PHP ${{ matrix.php }}, ${{ matrix.stability }}
+    name: PHP ${{ matrix.php }}, L ${{ matrix.laravel }}, ${{ matrix.stability }}
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
         php: ['8.0', '8.1']
+        laravel: ['8.*', '9.*']
         stability: [prefer-lowest, prefer-stable]
 
     steps:
@@ -36,7 +37,9 @@ jobs:
           restore-keys: composer-
 
       - name: Install Composer dependencies
-        run: composer update --${{ matrix.stability }} --no-progress --no-interaction
+        run: |
+          composer require laravel/framework:${{ matrix.laravel }} --no-progress --no-interaction --no-update
+          composer update --${{ matrix.stability }} --no-progress --no-interaction
 
       - name: Execute tests
         run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -26,11 +26,11 @@
     "require": {
         "php": "^8.0",
         "jrmajor/fluent": "v0.3.0",
-        "laravel/framework": "^8.0"
+        "laravel/framework": "^8.0 || ^9.0"
     },
     "require-dev": {
         "jrmajor/cs": "^0.3.3",
-        "orchestra/testbench": "^6.24",
+        "orchestra/testbench": "^6.24 || ^7.0",
         "phpstan/phpstan": "^1.4",
         "phpunit/phpunit": "^9.5"
     },

diff --git a/composer.lock b/composer.lock