From 4bbc4fee7673ca69070878987bd2f0b279a5f4f4 Mon Sep 17 00:00:00 2001
From: Arthur Kirkosa <arthur.kirkosa@me.com>
Date: Fri, 16 Oct 2020 14:16:16 +0300
Subject: [PATCH] Allow Laravel 8

---
 .github/workflows/psalm.yml     | 33 ---------------------------------
 .github/workflows/run-tests.yml |  8 +++++---
 composer.json                   |  8 +++-----
 3 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 .github/workflows/psalm.yml

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
deleted file mode 100644
index 4dbe3f2..0000000
--- a/.github/workflows/psalm.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Psalm
-
-on:
-    push:
-        paths:
-            - '**.php'
-            - 'psalm.xml'
-
-jobs:
-    psalm:
-        name: psalm
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v1
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: '7.4'
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
-                  coverage: none
-
-            - name: Cache composer dependencies
-              uses: actions/cache@v1
-              with:
-                  path: vendor
-                  key: composer-${{ hashFiles('composer.lock') }}
-
-            - name: Run composer install
-              run: composer install -n --prefer-dist
-
-            - name: Run psalm
-              run: ./vendor/bin/psalm -c psalm.xml
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index e759f29..91d666b 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -10,11 +10,13 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         php: [7.4]
-        laravel: [7.*]
+        laravel: [^7.0, ^8.0]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 7.*
-            testbench: 5.*
+          - laravel: ^7.0
+            testbench: ^5.2
+          - laravel: ^8.0
+            testbench: ^6.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
diff --git a/composer.json b/composer.json
index af51bcd..5558924 100644
--- a/composer.json
+++ b/composer.json
@@ -27,10 +27,9 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.16",
-        "orchestra/testbench": "^5.0",
-        "phpunit/phpunit": "^9.0",
-        "psalm/plugin-laravel": "^1.2",
-        "vimeo/psalm": "^3.11"
+        "laravel/legacy-factories": "^1.0",
+        "orchestra/testbench": "^5.2|^6.0",
+        "phpunit/phpunit": "^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -46,7 +45,6 @@
         }
     },
     "scripts": {
-        "psalm": "vendor/bin/psalm",
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage",
         "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"