vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@47198 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2020-02-06 06:31:22 +00:00
parent b02e49c2e8
commit e72fff9cef
304 changed files with 1068 additions and 1063 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/wp-mail-real-test.php
+6 -6
View File
@@ -10,11 +10,11 @@ $options = 'v:r:d';
if ( is_callable( 'getopt' ) ) {
$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 );
define( 'WP_DEBUG', array_key_exists( 'd', $opts ) );
@@ -31,10 +31,10 @@ if ( ! empty( $opts['r'] ) ) {
error_reporting( E_ALL & ~E_DEPRECATED );
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 ) . '/' );
// Install WP.
@@ -45,11 +45,11 @@ define( 'WP_USER_EMAIL', rand_str() . '@example.com' );
// Initialize WP.
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 );
// Make sure we're installed.