Changeset 44704

Timestamp:

01/28/2019 05:19:14 PM (3 months ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Reorder <file> and <exclude> rules in multisite.xml to avoid warnings in PHPUnit 7.2+.

Missed in [44702].

See #43218.

File:

• trunk/tests/phpunit/multisite.xml (modified) (2 diffs)

trunk/tests/phpunit/multisite.xml

@@ -12 +12 @@
         <testsuite name="default">
             <directory suffix=".php">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>
             <exclude>tests/phpunit/tests/actions/closures.php</exclude>
             <exclude>tests/phpunit/tests/image/editor.php</exclude>
@@ -20 +24 @@
             <!-- Same path relative to the configuration file, for PHPUnit 4.0.0+ -->
             <exclude>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>
         </testsuite>
         <!-- Sets the DOING_AUTOSAVE constant, so needs to be run last -->