Skip to content

Commit 10ce391

Browse files
committed
Merge branch '7.4' into 8.0
* 7.4: use a compatible config file when running tests with PHPUnit 9.6
2 parents 179b307 + 8988172 commit 10ce391

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/Tests export-ignore
22
/phpunit.xml.dist export-ignore
3+
/phpunit-9.6.xml.dist export-ignore
34
/.git* export-ignore

phpunit-9.6.xml.dist

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
5+
backupGlobals="false"
6+
colors="true"
7+
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
10+
>
11+
<php>
12+
<ini name="error_reporting" value="-1" />
13+
</php>
14+
15+
<testsuites>
16+
<testsuite name="Symfony PHPUnit Bridge Test Suite">
17+
<directory>./Tests/</directory>
18+
<directory suffix=".phpt">./Tests/DeprecationErrorHandler/</directory>
19+
</testsuite>
20+
</testsuites>
21+
22+
<coverage>
23+
<include>
24+
<directory>./</directory>
25+
</include>
26+
<exclude>
27+
<directory>./Tests</directory>
28+
<directory>./vendor</directory>
29+
</exclude>
30+
</coverage>
31+
</phpunit>

0 commit comments

Comments
 (0)