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.

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

View File

@@ -24,7 +24,7 @@ class Tests_Embed_Template extends WP_UnitTestCase {
$this->assertQueryTrue( 'is_single', 'is_singular', 'is_embed' );
ob_start();
include( ABSPATH . WPINC . '/theme-compat/embed.php' );
require ABSPATH . WPINC . '/theme-compat/embed.php';
$actual = ob_get_clean();
$doc = new DOMDocument();
@@ -56,7 +56,7 @@ class Tests_Embed_Template extends WP_UnitTestCase {
$this->assertQueryTrue( 'is_single', 'is_singular', 'is_embed' );
ob_start();
include( ABSPATH . WPINC . '/theme-compat/embed.php' );
require ABSPATH . WPINC . '/theme-compat/embed.php';
$actual = ob_get_clean();
$doc = new DOMDocument();
@@ -73,7 +73,7 @@ class Tests_Embed_Template extends WP_UnitTestCase {
$this->assertQueryTrue( 'is_404', 'is_embed' );
ob_start();
include( ABSPATH . WPINC . '/theme-compat/embed.php' );
require ABSPATH . WPINC . '/theme-compat/embed.php';
$actual = ob_get_clean();
$doc = new DOMDocument();
@@ -100,7 +100,7 @@ class Tests_Embed_Template extends WP_UnitTestCase {
$this->assertQueryTrue( 'is_single', 'is_singular', 'is_attachment', 'is_embed' );
ob_start();
include( ABSPATH . WPINC . '/theme-compat/embed.php' );
require ABSPATH . WPINC . '/theme-compat/embed.php';
$actual = ob_get_clean();
$doc = new DOMDocument();
@@ -125,7 +125,7 @@ class Tests_Embed_Template extends WP_UnitTestCase {
$this->assertQueryTrue( 'is_404', 'is_embed' );
ob_start();
include( ABSPATH . WPINC . '/theme-compat/embed.php' );
require ABSPATH . WPINC . '/theme-compat/embed.php';
$actual = ob_get_clean();
$doc = new DOMDocument();
@@ -149,7 +149,7 @@ class Tests_Embed_Template extends WP_UnitTestCase {
$this->assertQueryTrue( 'is_404', 'is_embed' );
ob_start();
include( ABSPATH . WPINC . '/theme-compat/embed.php' );
require ABSPATH . WPINC . '/theme-compat/embed.php';
$actual = ob_get_clean();
$doc = new DOMDocument();
@@ -172,7 +172,7 @@ class Tests_Embed_Template extends WP_UnitTestCase {
$this->assertQueryTrue( 'is_404', 'is_embed' );
ob_start();
include( ABSPATH . WPINC . '/theme-compat/embed.php' );
require ABSPATH . WPINC . '/theme-compat/embed.php';
$actual = ob_get_clean();
$doc = new DOMDocument();
@@ -199,7 +199,7 @@ class Tests_Embed_Template extends WP_UnitTestCase {
$this->assertQueryTrue( 'is_single', 'is_singular', 'is_embed' );
ob_start();
include( ABSPATH . WPINC . '/theme-compat/embed.php' );
require ABSPATH . WPINC . '/theme-compat/embed.php';
$actual = ob_get_clean();
$doc = new DOMDocument();