Skip to content

Commit 25fb45f

Browse files
authored
Allow PHPUnit 10 (#880)
1 parent 0da0983 commit 25fb45f

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
- os: ubuntu-latest
4343
description: 'with calculating code coverage'
4444
calculate-coverage: true
45+
phpunit-flags: '--coverage-clover=./build/logs/clover.xml'
4546
php-version: '8.2'
4647
- os: ubuntu-latest
4748
description: 'with PHP CS Fixer from master'
@@ -94,7 +95,7 @@ jobs:
9495
run: composer require friendsofphp/php-cs-fixer:dev-master --no-update
9596
- run: composer update --no-progress ${{ matrix.composer-flags }}
9697
- run: composer show | grep php-cs-fixer
97-
- run: composer test -- --coverage-clover=./build/logs/clover.xml
98+
- run: ./vendor/bin/phpunit ${{ matrix.phpunit-flags }}
9899
- if: ${{ matrix.calculate-coverage }}
99100
run: |
100101
composer require --dev php-coveralls/php-coveralls --quiet --with-all-dependencies

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"friendsofphp/php-cs-fixer": "^3.6.0"
1717
},
1818
"require-dev": {
19-
"phpunit/phpunit": "^9.5.20"
19+
"phpunit/phpunit": "^9.6.4 || ^10.0.14"
2020
},
2121
"autoload": {
2222
"psr-4": {

phpunit.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
bootstrap='./tests/autoload.php'
66
cacheResult='false'
77
colors='true'
8-
executionOrder='default'
8+
displayDetailsOnTestsThatTriggerDeprecations='true'
99
failOnEmptyTestSuite='true'
1010
failOnIncomplete='true'
1111
failOnRisky='true'
1212
failOnWarning='true'
13-
forceCoversAnnotation='true'
14-
verbose='true'
13+
requireCoverageMetadata='true'
1514
>
1615

1716
<php>
@@ -31,9 +30,6 @@
3130
<include>
3231
<directory>./src</directory>
3332
</include>
34-
<report>
35-
<text outputFile='php://stdout' showOnlySummary='true' />
36-
</report>
3733
</coverage>
3834

3935
</phpunit>

0 commit comments

Comments
 (0)