Skip to content

Commit

Permalink
chore: Use the latest PHPUnit wherever possible, use PHP 8.0 for PHPCS
Browse files Browse the repository at this point in the history
  • Loading branch information
Kocal authored and ondrejmirtes committed May 15, 2021
1 parent 3cb8c8a commit 0208ab7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
21 changes: 10 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"require-dev": {
"php-parallel-lint/php-parallel-lint": "^1.2",
"phpstan/phpstan-phpunit": "^0.12.16",
"phpunit/phpunit": "^7.5.20"
"phpunit/phpunit": "^9.5"
},
"config": {
"platform": {
Expand Down

0 comments on commit 0208ab7

Please sign in to comment.