From ef850830e74b287b73fe2c8afe5b83451742275d Mon Sep 17 00:00:00 2001 From: freek Date: Tue, 8 Sep 2020 23:02:39 +0200 Subject: [PATCH] wip --- .github/workflows/run-tests.yml | 4 ++-- composer.json | 9 ++++----- psalm.xml | 4 ---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 56480cd..69aa7eb 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -23,13 +23,13 @@ jobs: uses: actions/checkout@v2 - name: Cache dependencies - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: ~/.composer/cache/files key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - name: Setup PHP - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick diff --git a/composer.json b/composer.json index 3ee72a5..3c1e829 100644 --- a/composer.json +++ b/composer.json @@ -17,18 +17,17 @@ ], "require": { "php" : "^7.4", - "illuminate/support": "^7.21" + "illuminate/support": "^7.21|^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.16", "phpunit/phpunit": "^9.0", - "psalm/plugin-laravel": "^1.2", - "orchestra/testbench":"^5.3", + "orchestra/testbench":"^5.3|^6.0", "mockery/mockery": "^1.0", "spatie/test-time": "^1.2", "vimeo/psalm": "^3.11", - "pestphp/pest": "^0.2.3", - "pestphp/pest-plugin-laravel": "^0.2.0" + "pestphp/pest": "^0.3.0", + "pestphp/pest-plugin-laravel": "^0.3.0" }, "autoload": { "psr-4": { diff --git a/psalm.xml b/psalm.xml index 648624f..c53b41e 100644 --- a/psalm.xml +++ b/psalm.xml @@ -18,8 +18,4 @@ - - - -