From 6a367d0ed7e14fe538e7dd796909746d6779a49b Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Sat, 15 May 2021 09:25:55 +0200 Subject: [PATCH] chore: Use the latest PHPUnit wherever possible Related to https://github.com/phpstan/phpstan-mockery/pull/30#issuecomment-841182105 --- .github/workflows/build.yml | 19 +++++++++---------- composer.json | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18898d7a..05fb9cb6 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" @@ -111,9 +110,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" @@ -155,9 +154,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 6372b6cc..e9d076d1 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/phpstan-phpunit": "^0.12.16", "phpstan/phpstan-strict-rules": "^0.12.5", - "phpunit/phpunit": "^7.5.20", + "phpunit/phpunit": "^9.5", "symfony/config": "^4.2 || ^5.0", "symfony/console": "^4.0 || ^5.0", "symfony/framework-bundle": "^4.4 || ^5.0",