Merge pull request #12 from plank/add-support-for-laravel-9

Support Laravel 9
plank · Mar 21, 2022 · 92b0aaf · 92b0aaf
2 parents d1dff52 + 7c1694c
commit 92b0aaf
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -1,10 +1,7 @@
 name: Psalm
 
 on:
-  push:
-    paths:
-      - '**.php'
-      - 'psalm.xml'
+  workflow_dispatch
 
 jobs:
   psalm:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,10 +19,30 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [7.4, 8.0]
-        laravel: [6.*, 7.*, 8.*]
+        php: [7.4, 8.0, 8.1]
+        dbal: [^2.6, ^3.3]
+        laravel: [6.*, 7.*, 8.*, 9.*]
         stability: [prefer-stable]
+        exclude:
+          - laravel: 9.*
+            php: 7.4
+          - laravel: 9.*
+            dbal: ^2.6
+          - laravel: 8.*
+            php: 8.1
+          - laravel: 8.*
+            dbal: ^2.6
+          - laravel: 7.*
+            php: 8.1
+          - laravel: 7.*
+            dbal: ^3.3
+          - laravel: 6.*
+            php: 8.1
+          - laravel: 6.*
+            dbal: ^3.3
         include:
+          - laravel: 9.*
+            testbench: 7.*
           - laravel: 8.*
             testbench: 6.*
           - laravel: 7.*
@@ -54,10 +74,11 @@ jobs:
           path: ~/.composer/cache/files
           key: dependencies-php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-stability-${{ matrix.stability }}-composer-${{ hashFiles('composer.json') }}
 
-      - name: Install dependencies
-        run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.stability }} --no-interaction
+      - name: Install framework and testbench
+        run: composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "doctrine/dbal:${{ matrix.dbal }}" --no-interaction --no-update
+
+      - name: Install other dependencies
+        run: composer update --${{ matrix.stability }} --no-interaction
 
       - name: Install Legacy Factories Package
         run: composer require "laravel/legacy-factories" --no-interaction --no-update

diff --git a/composer.json b/composer.json
@@ -27,14 +27,13 @@
     "require": {
         "php": "^7.1.3|^8.0",
         "ext-json": "*",
-        "illuminate/support": "5.8.*|^6.0|^7.0|^8.0"
+        "illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0"
     },
     "require-dev": {
+        "doctrine/dbal": "^2.6|^3.3",
         "laravel/legacy-factories": "^1.0.4",
-        "orchestra/testbench": "^4.8 || ^5.2 || ^6.0",
-        "phpunit/phpunit": "^9.5",
-        "psalm/plugin-laravel": "^1.4",
-        "vimeo/psalm": "^4.10"
+        "orchestra/testbench": "^4.8 || ^5.2 || ^6.0 || ^7.2",
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {