Skip to content

Commit 168fefe

Browse files
committed
Update PHPUnit configuration schema for PHPUnit 9.3
1 parent 059a362 commit 168fefe

File tree

5 files changed

+32
-11
lines changed

5 files changed

+32
-11
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
/.gitignore export-ignore
33
/.travis.yml export-ignore
44
/phpunit.xml.dist export-ignore
5+
/phpunit.xml.legacy export-ignore
56
/tests export-ignore

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ install:
2121
- composer install
2222

2323
script:
24-
- ./vendor/bin/phpunit -v --coverage-text --coverage-clover=./build/logs/clover.xml
24+
- if [[ "$TRAVIS_PHP_VERSION" > "7.2" ]]; then vendor/bin/phpunit --coverage-text --coverage-clover=./build/logs/clover.xml; fi
25+
- if [[ "$TRAVIS_PHP_VERSION" < "7.3" ]]; then vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy --coverage-clover=./build/logs/clover.xml; fi
2526

2627
after_script:
2728
- if [ -f ./build/logs/clover.xml ]; then travis_retry composer require satooshi/php-coveralls --no-interaction --update-with-dependencies; fi

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"php": ">=5.4.0"
1010
},
1111
"require-dev": {
12-
"phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.36"
12+
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36"
1313
},
1414
"autoload": {
1515
"psr-4": {

phpunit.xml.dist

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<phpunit bootstrap="vendor/autoload.php" colors="true">
3+
<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
4+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
6+
bootstrap="vendor/autoload.php"
7+
colors="true"
8+
cacheResult="false">
49
<testsuites>
510
<testsuite name="Promise Test Suite">
611
<directory>./tests/</directory>
712
</testsuite>
813
</testsuites>
9-
10-
<filter>
11-
<whitelist>
14+
<coverage>
15+
<include>
1216
<directory>./src/</directory>
13-
<exclude>
14-
<file>./src/functions_include.php</file>
15-
</exclude>
16-
</whitelist>
17-
</filter>
17+
</include>
18+
</coverage>
1819
</phpunit>

phpunit.xml.legacy

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
4+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
6+
bootstrap="vendor/autoload.php"
7+
colors="true">
8+
<testsuites>
9+
<testsuite name="Promise Test Suite">
10+
<directory>./tests/</directory>
11+
</testsuite>
12+
</testsuites>
13+
<filter>
14+
<whitelist>
15+
<directory>./src/</directory>
16+
</whitelist>
17+
</filter>
18+
</phpunit>

0 commit comments

Comments
 (0)