From d5c66ba23d0531adacf0af78ba85603ef8006d7a Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Sun, 16 May 2021 08:01:42 +0200 Subject: [PATCH] chore: Use the latest PHPUnit wherever possible, use PHP 8.0 for PHPCS See https://github.com/phpstan/phpstan-symfony/pull/162 --- .github/workflows/build.yml | 21 ++++++++++----------- composer.json | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3cf185e..b693c05 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,10 +38,9 @@ jobs: - name: "Install dependencies" run: "composer install --no-interaction --no-progress --no-suggest" - - name: "Update PHPUnit" - if: matrix.php-version == '7.4' || matrix.php-version == '8.0' - run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies" - + - name: "Downgrade PHPUnit" + if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3' + run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies" - name: "Lint" run: "make lint" @@ -59,7 +58,7 @@ jobs: uses: "shivammathur/setup-php@v2" with: coverage: "none" - php-version: "7.4" + php-version: "8.0" - name: "Validate Composer" run: "composer validate" @@ -108,9 +107,9 @@ jobs: if: ${{ matrix.dependencies == 'highest' }} run: "composer update --no-interaction --no-progress --no-suggest" - - name: "Update PHPUnit" - if: matrix.php-version == '7.4' || matrix.php-version == '8.0' - run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies" + - name: "Downgrade PHPUnit" + if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3' + run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies" - name: "Tests" run: "make tests" @@ -152,9 +151,9 @@ jobs: if: ${{ matrix.dependencies == 'highest' }} run: "composer update --no-interaction --no-progress --no-suggest" - - name: "Update PHPUnit" - if: matrix.php-version == '7.4' || matrix.php-version == '8.0' - run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies" + - name: "Downgrade PHPUnit" + if: matrix.php-version == '7.1' || matrix.php-version == '7.2' || matrix.php-version == '7.3' + run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies" - name: "PHPStan" run: "make phpstan" diff --git a/composer.json b/composer.json index a1382dc..2939cb5 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpstan/phpstan-php-parser": "^0.12.2", "phpstan/phpstan-phpunit": "^0.12.16", "phpstan/phpstan-strict-rules": "^0.12.5", - "phpunit/phpunit": "^7.5.20" + "phpunit/phpunit": "^9.5" }, "config": { "platform": {