Changeset 47198 for trunk/tests/phpunit/wp-mail-real-test.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/wp-mail-real-test.php (modified) (3 diffs)

trunk/tests/phpunit/wp-mail-real-test.php

@@ -11 +11 @@
     $opts = getopt( $options );
 } else {
-    include( dirname( __FILE__ ) . '/wp-testlib/getopt.php' );
+    require __DIR__ . '/wp-testlib/getopt.php';
     $opts = getoptParser::getopt( $options );
 }
 
-define( 'DIR_TESTROOT', realpath( dirname( __FILE__ ) ) );
+define( 'DIR_TESTROOT', realpath( __DIR__ ) );
 
 define( 'TEST_WP', true );
@@ -32 +32 @@
 ini_set( 'display_errors', true );
 
-require_once( DIR_TESTROOT . '/wp-testlib/utils.php' );
+require_once DIR_TESTROOT . '/wp-testlib/utils.php';
 
 // Configure WP.
-require_once( DIR_TESTROOT . '/wp-config.php' );
+require_once DIR_TESTROOT . '/wp-config.php';
 define( 'ABSPATH', realpath( DIR_WP ) . '/' );
 
@@ -46 +46 @@
 define( 'WP_INSTALLING', 1 );
 $_SERVER['PATH_INFO'] = $_SERVER['SCRIPT_NAME']; // Prevent a warning from some sloppy code in wp-settings.php.
-require_once( ABSPATH . 'wp-settings.php' );
+require_once ABSPATH . 'wp-settings.php';
 
 drop_tables();
 
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 wp_install( WP_BLOG_TITLE, WP_USER_NAME, WP_USER_EMAIL, true );