Changeset 44702 for trunk/phpunit.xml.dist

Timestamp:

01/28/2019 03:54:47 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/phpunit.xml.dist (modified) (5 diffs)

trunk/phpunit.xml.dist

@@ -9 +9 @@
         <testsuite name="default">
             <directory suffix=".php">tests/phpunit/tests</directory>
+            <file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/image/editorGd.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/image/editorImagick.php</file>
+            <file phpVersion="5.3.0">tests/phpunit/tests/oembed/headers.php</file>
             <exclude>tests/phpunit/tests/actions/closures.php</exclude>
             <exclude>tests/phpunit/tests/image/editor.php</exclude>
@@ -15 +20 @@
             <exclude>tests/phpunit/tests/oembed/headers.php</exclude>
             <exclude>tests/phpunit/tests/rest-api/rest-autosaves-controller.php</exclude>
-            <file phpVersion="5.3.0">tests/phpunit/tests/actions/closures.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editor.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editorGd.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/image/editorImagick.php</file>
-            <file phpVersion="5.3.0">tests/phpunit/tests/oembed/headers.php</file>
         </testsuite>
         <!-- Sets the DOING_AUTOSAVE constant, so needs to be run last -->
@@ -35 +35 @@
     </groups>
     <logging>
-        <log type="junit" target="tests/phpunit/build/logs/junit.xml" logIncompleteSkipped="false"/>
+        <log type="junit" target="tests/phpunit/build/logs/junit.xml" />
     </logging>
     <php>
@@ -56 +56 @@
             <exclude>
                 <!-- Third party library exclusions -->
+                <directory suffix=".php">src/wp-includes/ID3</directory>
+                <directory suffix=".php">src/wp-includes/IXR</directory>
+                <directory suffix=".php">src/wp-includes/random_compat</directory>
+                <directory suffix=".php">src/wp-includes/Requests</directory>
+                <directory suffix=".php">src/wp-includes/SimplePie</directory>
+                <directory suffix=".php">src/wp-includes/Text</directory>
+
                 <file>src/wp-admin/includes/class-ftp*</file>
                 <file>src/wp-admin/includes/class-pclzip.php</file>
@@ -75 +82 @@
                 <file>src/wp-includes/pluggable-deprecated.php</file>
                 <file>src/wp-includes/rss.php</file>
-
-                <directory suffix=".php">src/wp-includes/ID3</directory>
-                <directory suffix=".php">src/wp-includes/IXR</directory>
-                <directory suffix=".php">src/wp-includes/random_compat</directory>
-                <directory suffix=".php">src/wp-includes/Requests</directory>
-                <directory suffix=".php">src/wp-includes/SimplePie</directory>
-                <directory suffix=".php">src/wp-includes/Text</directory>
             </exclude>
         </whitelist>