Skip to content

Commit 6d86370

Browse files
Build/Test Tools: Reorder <file> and <exclude> rules in phpunit.xml.dist to avoid warnings in PHPUnit 7.2+.
Remove deprecated `logIncompleteSkipped` option that does not exist in PHPUnit 6.0+. See #43218. git-svn-id: https://develop.svn.wordpress.org/trunk@44702 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 001c649 commit 6d86370

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

phpunit.xml.dist

+13-13
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
<!-- Default test suite to run all tests -->
99
<testsuite name="default">
1010
<directory suffix=".php">tests/phpunit/tests</directory>
11+
<file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
12+
<file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
13+
<file phpVersion="5.3.0">tests/phpunit/tests/image/editorGd.php</file>
14+
<file phpVersion="5.3.0">tests/phpunit/tests/image/editorImagick.php</file>
15+
<file phpVersion="5.3.0">tests/phpunit/tests/oembed/headers.php</file>
1116
<exclude>tests/phpunit/tests/actions/closures.php</exclude>
1217
<exclude>tests/phpunit/tests/image/editor.php</exclude>
1318
<exclude>tests/phpunit/tests/image/editorGd.php</exclude>
1419
<exclude>tests/phpunit/tests/image/editorImagick.php</exclude>
1520
<exclude>tests/phpunit/tests/oembed/headers.php</exclude>
1621
<exclude>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</exclude>
17-
<file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
18-
<file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
19-
<file phpVersion="5.3.0">tests/phpunit/tests/image/editorGd.php</file>
20-
<file phpVersion="5.3.0">tests/phpunit/tests/image/editorImagick.php</file>
21-
<file phpVersion="5.3.0">tests/phpunit/tests/oembed/headers.php</file>
2222
</testsuite>
2323
<!-- Sets the DOING_AUTOSAVE constant, so needs to be run last -->
2424
<testsuite name="restapi-autosave">
@@ -34,7 +34,7 @@
3434
</exclude>
3535
</groups>
3636
<logging>
37-
<log type="junit" target="tests/phpunit/build/logs/junit.xml" logIncompleteSkipped="false"/>
37+
<log type="junit" target="tests/phpunit/build/logs/junit.xml" />
3838
</logging>
3939
<php>
4040
<const name="WP_RUN_CORE_TESTS" value="1" />
@@ -55,6 +55,13 @@
5555
<directory suffix=".php">src</directory>
5656
<exclude>
5757
<!-- Third party library exclusions -->
58+
<directory suffix=".php">src/wp-includes/ID3</directory>
59+
<directory suffix=".php">src/wp-includes/IXR</directory>
60+
<directory suffix=".php">src/wp-includes/random_compat</directory>
61+
<directory suffix=".php">src/wp-includes/Requests</directory>
62+
<directory suffix=".php">src/wp-includes/SimplePie</directory>
63+
<directory suffix=".php">src/wp-includes/Text</directory>
64+
5865
<file>src/wp-admin/includes/class-ftp*</file>
5966
<file>src/wp-admin/includes/class-pclzip.php</file>
6067
<file>src/wp-admin/includes/deprecated.php</file>
@@ -74,13 +81,6 @@
7481
<file>src/wp-includes/ms-deprecated.php</file>
7582
<file>src/wp-includes/pluggable-deprecated.php</file>
7683
<file>src/wp-includes/rss.php</file>
77-
78-
<directory suffix=".php">src/wp-includes/ID3</directory>
79-
<directory suffix=".php">src/wp-includes/IXR</directory>
80-
<directory suffix=".php">src/wp-includes/random_compat</directory>
81-
<directory suffix=".php">src/wp-includes/Requests</directory>
82-
<directory suffix=".php">src/wp-includes/SimplePie</directory>
83-
<directory suffix=".php">src/wp-includes/Text</directory>
8484
</exclude>
8585
</whitelist>
8686
</filter>

0 commit comments

Comments
 (0)