From 6d8637097a417003ad27639f4a8c5577bf7273a5 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 28 Jan 2019 15:54:47 +0000
Subject: [PATCH] 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
---
 phpunit.xml.dist | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e75016754a..780e8db51d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,17 +8,17 @@
         <!-- Default test suite to run all tests -->
         <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>
             <exclude>tests/phpunit/tests/image/editorGd.php</exclude>
             <exclude>tests/phpunit/tests/image/editorImagick.php</exclude>
             <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 -->
         <testsuite name="restapi-autosave">
@@ -34,7 +34,7 @@
         </exclude>
     </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>
         <const name="WP_RUN_CORE_TESTS" value="1" />
@@ -55,6 +55,13 @@
 			<directory suffix=".php">src</directory>
 			<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>
 				<file>src/wp-admin/includes/deprecated.php</file>
@@ -74,13 +81,6 @@
 				<file>src/wp-includes/ms-deprecated.php</file>
 				<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>
 	</filter>