Changeset 51333 for trunk

Timestamp:

07/06/2021 11:33:27 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Move loading compatibility layers for PHPUnit 6+ and 7.5+ closer together.

Follow-up to [40536], [44701], [50986].

See #53363.

File:

• trunk/tests/phpunit/includes/bootstrap.php (modified) (2 diffs)

trunk/tests/phpunit/includes/bootstrap.php

@@ -3 +3 @@
  * Installs WordPress for running the tests and loads WordPress and the test libraries
  */
-
-/**
- * Compatibility with PHPUnit 6+
- */
-if ( class_exists( 'PHPUnit\Runner\Version' ) ) {
-    require_once __DIR__ . '/phpunit6/compat.php';
-}
 
 if ( defined( 'WP_TESTS_CONFIG_FILE_PATH' ) ) {
@@ -194 +187 @@
 _delete_all_posts();
 
+// Load class aliases for compatibility with PHPUnit 6+.
+if ( version_compare( tests_get_phpunit_version(), '6.0', '>=' ) ) {
+    require __DIR__ . '/phpunit6/compat.php';
+}
+
+// Load separate WP_UnitTestCase classes for PHPUnit 7.5+ and older versions.
 if ( version_compare( tests_get_phpunit_version(), '7.5', '>=' ) ) {
     require __DIR__ . '/phpunit7/testcase.php';