Merge branch 'master' into develop

qirolab · Feb 11, 2022 · c292462 · c292462
2 parents 90de689 + e0149fd
commit c292462
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,19 +9,35 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [7.2, 7.3, 7.4, 8.0]
-        laravel: [7.*, 8.*]
+        php: [7.2, 7.3, 7.4, 8.0, 8.1]
+        laravel: [7.*, 8.*, 9.*]
         stability: [prefer-lowest, prefer-stable]
         exclude:
           - laravel: 7.*
             stability: prefer-lowest
           - laravel: 8.*
+            stability: prefer-lowest
+          - laravel: 9.*
+            stability: prefer-lowest
+          - laravel: 6.*
+            php: 8.1
+          - laravel: 7.*
+            php: 8.1
+          - laravel: 8.*
+            php: 7.2
+          - laravel: 9.*
             php: 7.2
+          - laravel: 9.*
+            php: 7.3
+          - laravel: 9.*
+            php: 7.4
         include:
           - laravel: 7.*
             testbench: 5.*
           - laravel: 8.*
             testbench: 6.*
+          - laravel: 9.*
+            testbench: 7.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache
diff --git a/composer.json b/composer.json
@@ -20,11 +20,10 @@
     "require": {
         "php": ">=7.1.0",
         "facade/ignition-contracts": "^1.0",
-        "illuminate/support": "^7.0|^8.0"
+        "illuminate/support": "^7.0|^8.0|^9.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.16",
-        "orchestra/testbench": "^5.0|^6.0",
+        "orchestra/testbench": "^5.0|^6.0|^7.0",
         "phpunit/phpunit": "^8.3|^9.0",
         "vimeo/psalm": "^4.0"
     },