Changeset 47198 for trunk/tests/phpunit/includes/bootstrap.php

Timestamp:

02/06/2020 06:31:22 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Replace dirname( __FILE__ ) calls with __DIR__ magic constant.

This avoids the performance overhead of the function call every time dirname( __FILE__ ) was used instead of __DIR__.

This commit also includes:

• Removing unnecessary parentheses from include/require statements. These are language constructs, not function calls.
• Replacing include statements for several files with require_once, for consistency:
  • wp-admin/admin-header.php
  • wp-admin/admin-footer.php
  • wp-includes/version.php

Props ayeshrajans, desrosj, valentinbora, jrf, joostdevalk, netweb.
Fixes #48082.

File:

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

trunk/tests/phpunit/includes/bootstrap.php

@@ -8 +8 @@
  */
 if ( class_exists( 'PHPUnit\Runner\Version' ) ) {
-    require_once dirname( __FILE__ ) . '/phpunit6/compat.php';
+    require_once __DIR__ . '/phpunit6/compat.php';
 }
 
@@ -14 +14 @@
     $config_file_path = WP_TESTS_CONFIG_FILE_PATH;
 } else {
-    $config_file_path = dirname( dirname( __FILE__ ) );
+    $config_file_path = dirname( __DIR__ );
     if ( ! file_exists( $config_file_path . '/wp-tests-config.php' ) ) {
         // Support the config file from the root of the develop repository.
@@ -36 +36 @@
 
 require_once $config_file_path;
-require_once dirname( __FILE__ ) . '/functions.php';
+require_once __DIR__ . '/functions.php';
 
 if ( version_compare( tests_get_phpunit_version(), '8.0', '>=' ) ) {
@@ -55 +55 @@
 
 define( 'WP_TESTS_TABLE_PREFIX', $table_prefix );
-define( 'DIR_TESTDATA', dirname( __FILE__ ) . '/../data' );
-define( 'DIR_TESTROOT', realpath( dirname( dirname( __FILE__ ) ) ) );
+define( 'DIR_TESTDATA', __DIR__ . '/../data' );
+define( 'DIR_TESTROOT', realpath( dirname( __DIR__ ) ) );
 
 define( 'WP_LANG_DIR', DIR_TESTDATA . '/languages' );
@@ -85 +85 @@
 
 // Override the PHPMailer.
-require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
+require_once __DIR__ . '/mock-mailer.php';
 $phpmailer = new MockPHPMailer( true );
 
@@ -98 +98 @@
 
 if ( '1' !== getenv( 'WP_TESTS_SKIP_INSTALL' ) ) {
-    system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite, $retval );
+    system( WP_PHP_BINARY . ' ' . escapeshellarg( __DIR__ . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite, $retval );
     if ( 0 !== $retval ) {
         exit( $retval );
@@ -140 +140 @@
 
 if ( version_compare( tests_get_phpunit_version(), '7.0', '>=' ) ) {
-    require dirname( __FILE__ ) . '/phpunit7/testcase.php';
+    require __DIR__ . '/phpunit7/testcase.php';
 } else {
-    require dirname( __FILE__ ) . '/testcase.php';
-}
-
-require dirname( __FILE__ ) . '/testcase-rest-api.php';
-require dirname( __FILE__ ) . '/testcase-rest-controller.php';
-require dirname( __FILE__ ) . '/testcase-rest-post-type-controller.php';
-require dirname( __FILE__ ) . '/testcase-xmlrpc.php';
-require dirname( __FILE__ ) . '/testcase-ajax.php';
-require dirname( __FILE__ ) . '/testcase-canonical.php';
-require dirname( __FILE__ ) . '/exceptions.php';
-require dirname( __FILE__ ) . '/utils.php';
-require dirname( __FILE__ ) . '/spy-rest-server.php';
-require dirname( __FILE__ ) . '/class-wp-rest-test-search-handler.php';
-require dirname( __FILE__ ) . '/class-wp-fake-block-type.php';
+    require __DIR__ . '/testcase.php';
+}
+
+require __DIR__ . '/testcase-rest-api.php';
+require __DIR__ . '/testcase-rest-controller.php';
+require __DIR__ . '/testcase-rest-post-type-controller.php';
+require __DIR__ . '/testcase-xmlrpc.php';
+require __DIR__ . '/testcase-ajax.php';
+require __DIR__ . '/testcase-canonical.php';
+require __DIR__ . '/exceptions.php';
+require __DIR__ . '/utils.php';
+require __DIR__ . '/spy-rest-server.php';
+require __DIR__ . '/class-wp-rest-test-search-handler.php';
+require __DIR__ . '/class-wp-fake-block-type.php';
 
 /**