vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +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

2
tests/phpunit/data/themedir1/camelCase/index.php
View File

@@ -2,4 +2,4 @@
// Dummy theme.
echo dirname(__FILE__).'/'.basename(__FILE__);
echo __DIR__ . '/' . basename(__FILE__);

2
tests/phpunit/data/themedir1/sandbox/functions.php
View File

@@ -2,6 +2,6 @@
// Dummy theme.
echo dirname(__FILE__).'/'.basename(__FILE__);
echo __DIR__ . '/' . basename(__FILE__);
?>

2
tests/phpunit/data/themedir1/sandbox/index.php
View File

@@ -2,6 +2,6 @@
// Dummy theme.
echo dirname(__FILE__).'/'.basename(__FILE__);
echo __DIR__ . '/' . basename(__FILE__);
?>

2
tests/phpunit/data/themedir1/theme1-dupe/functions.php
View File

@@ -2,6 +2,6 @@
// Dummy theme.
echo dirname(__FILE__).'/'.basename(__FILE__);
echo __DIR__ . '/' . basename(__FILE__);
?>

2
tests/phpunit/data/themedir1/theme1-dupe/index.php
View File

@@ -2,6 +2,6 @@
// Dummy theme.
echo dirname(__FILE__).'/'.basename(__FILE__);
echo __DIR__ . '/' . basename(__FILE__);
?>

2
tests/phpunit/data/themedir1/theme1/functions.php
View File

@@ -2,6 +2,6 @@
// Dummy theme.
echo dirname(__FILE__).'/'.basename(__FILE__);
echo __DIR__ . '/' . basename(__FILE__);
?>

2
tests/phpunit/data/themedir1/theme1/index.php
View File

@@ -2,6 +2,6 @@
// Dummy theme.
echo dirname(__FILE__).'/'.basename(__FILE__);
echo __DIR__ . '/' . basename(__FILE__);
?>

4
tests/phpunit/includes/abstract-testcase.php
View File

@@ -1,7 +1,7 @@
<?php
require_once dirname( __FILE__ ) . '/factory.php';
require_once dirname( __FILE__ ) . '/trac.php';
require_once __DIR__ . '/factory.php';
require_once __DIR__ . '/trac.php';
/**
* Defines a basic fixture to run multiple tests.

40
tests/phpunit/includes/bootstrap.php
View File

@@ -7,13 +7,13 @@
* Compatibility with PHPUnit 6+
*/
if ( class_exists( 'PHPUnit\Runner\Version' ) ) {
require_once dirname( __FILE__ ) . '/phpunit6/compat.php';
require_once __DIR__ . '/phpunit6/compat.php';
}
if ( defined( 'WP_TESTS_CONFIG_FILE_PATH' ) ) {
$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.
if ( basename( $config_file_path ) === 'phpunit' && basename( dirname( $config_file_path ) ) === 'tests' ) {
@@ -35,7 +35,7 @@ if ( ! is_readable( $config_file_path ) ) {
}
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', '>=' ) ) {
printf(
@@ -54,8 +54,8 @@ if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! is_dir( ABSPATH )
tests_reset__SERVER();
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' );
@@ -84,7 +84,7 @@ $multisite = $multisite || ( defined( 'WP_TESTS_MULTISITE' ) && WP_TESTS_MULTISI
$multisite = $multisite || ( defined( 'MULTISITE' ) && MULTISITE );
// Override the PHPMailer.
require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
require_once __DIR__ . '/mock-mailer.php';
$phpmailer = new MockPHPMailer( true );
if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
@@ -97,7 +97,7 @@ if ( file_exists( DIR_TESTDATA . '/themedir1' ) ) {
}
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 );
}
@@ -139,22 +139,22 @@ require_once ABSPATH . '/wp-settings.php';
_delete_all_posts();
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 __DIR__ . '/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-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';
/**
* A class to handle additional command line arguments passed to the script.

24
tests/phpunit/includes/factory.php
View File

@@ -1,14 +1,14 @@
<?php
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-thing.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-post.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-bookmark.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-attachment.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-user.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-comment.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-blog.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-network.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-term.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-generator-sequence.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-callback-after-create.php' );
require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory.php' );
require_once __DIR__ . '/factory/class-wp-unittest-factory-for-thing.php';
require_once __DIR__ . '/factory/class-wp-unittest-factory-for-post.php';
require_once __DIR__ . '/factory/class-wp-unittest-factory-for-bookmark.php';
require_once __DIR__ . '/factory/class-wp-unittest-factory-for-attachment.php';
require_once __DIR__ . '/factory/class-wp-unittest-factory-for-user.php';
require_once __DIR__ . '/factory/class-wp-unittest-factory-for-comment.php';
require_once __DIR__ . '/factory/class-wp-unittest-factory-for-blog.php';
require_once __DIR__ . '/factory/class-wp-unittest-factory-for-network.php';
require_once __DIR__ . '/factory/class-wp-unittest-factory-for-term.php';
require_once __DIR__ . '/factory/class-wp-unittest-generator-sequence.php';
require_once __DIR__ . '/factory/class-wp-unittest-factory-callback-after-create.php';
require_once __DIR__ . '/factory/class-wp-unittest-factory.php';

6
tests/phpunit/includes/install.php
View File

@@ -11,7 +11,7 @@ $multisite = ! empty( $argv[2] );
define( 'WP_INSTALLING', true );
require_once $config_file_path;
require_once dirname( __FILE__ ) . '/functions.php';
require_once __DIR__ . '/functions.php';
// Set the theme to our special empty theme, to avoid interference from the current Twenty* theme.
if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
@@ -33,10 +33,10 @@ require_once ABSPATH . '/wp-includes/wp-db.php';
// Override the PHPMailer.
global $phpmailer;
require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
require_once __DIR__ . '/mock-mailer.php';
$phpmailer = new MockPHPMailer();
register_theme_directory( dirname( __FILE__ ) . '/../data/themedir1' );
register_theme_directory( __DIR__ . '/../data/themedir1' );
/*
* default_storage_engine and storage_engine are the same option, but storage_engine

4
tests/phpunit/includes/listener-loader.php
View File

@@ -1,7 +1,7 @@
<?php
if ( version_compare( tests_get_phpunit_version(), '7.0', '>=' ) ) {
require dirname( __FILE__ ) . '/phpunit7/speed-trap-listener.php';
require __DIR__ . '/phpunit7/speed-trap-listener.php';
} else {
require dirname( __FILE__ ) . '/speed-trap-listener.php';
require __DIR__ . '/speed-trap-listener.php';
}

2
tests/phpunit/includes/mock-mailer.php
View File

@@ -1,5 +1,5 @@
<?php
require_once( ABSPATH . '/wp-includes/class-phpmailer.php' );
require_once ABSPATH . '/wp-includes/class-phpmailer.php';
class MockPHPMailer extends PHPMailer {
var $mock_sent = array();

2
tests/phpunit/includes/phpunit7/testcase.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( dirname( __FILE__ ) ) . '/abstract-testcase.php';
require_once dirname( __DIR__ ) . '/abstract-testcase.php';
/**
* Defines a basic fixture to run multiple tests.

6
tests/phpunit/includes/testcase-xmlrpc.php
View File

@@ -1,7 +1,7 @@
<?php
include_once( ABSPATH . 'wp-admin/includes/admin.php' );
include_once( ABSPATH . WPINC . '/class-IXR.php' );
include_once( ABSPATH . WPINC . '/class-wp-xmlrpc-server.php' );
require_once ABSPATH . 'wp-admin/includes/admin.php';
require_once ABSPATH . WPINC . '/class-IXR.php';
require_once ABSPATH . WPINC . '/class-wp-xmlrpc-server.php';
class WP_XMLRPC_UnitTestCase extends WP_UnitTestCase {
protected $myxmlrpcserver;

2
tests/phpunit/includes/testcase.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( __FILE__ ) . '/abstract-testcase.php';
require_once __DIR__ . '/abstract-testcase.php';
/**
* Defines a basic fixture to run multiple tests.

2
tests/phpunit/tests/admin/includesCommunityEvents.php
View File

@@ -34,7 +34,7 @@ class Test_WP_Community_Events extends WP_UnitTestCase {
public function setUp() {
parent::setUp();
require_once( ABSPATH . 'wp-admin/includes/class-wp-community-events.php' );
require_once ABSPATH . 'wp-admin/includes/class-wp-community-events.php';
$this->instance = new WP_Community_Events( 1, $this->get_user_location() );
}

2
tests/phpunit/tests/admin/includesSchema.php
View File

@@ -23,7 +23,7 @@ class Tests_Admin_Includes_Schema extends WP_UnitTestCase {
$blogmeta = self::$blogmeta;
$sitemeta = self::$sitemeta;
require_once( ABSPATH . 'wp-admin/includes/schema.php' );
require_once ABSPATH . 'wp-admin/includes/schema.php';
$charset_collate = $wpdb->get_charset_collate();
$max_index_length = 191;

2
tests/phpunit/tests/admin/includesUpdateCore.php
View File

@@ -8,7 +8,7 @@ class Tests_Admin_IncludesUpdateCore extends WP_UnitTestCase {
public function data_old_files() {
global $_old_files;
require_once( ABSPATH . 'wp-admin/includes/update-core.php' );
require_once ABSPATH . 'wp-admin/includes/update-core.php';
$files = $_old_files;

2
tests/phpunit/tests/adminbar.php
View File

@@ -15,7 +15,7 @@ class Tests_AdminBar extends WP_UnitTestCase {
protected static $user_ids = array();
public static function setUpBeforeClass() {
require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
require_once ABSPATH . WPINC . '/class-wp-admin-bar.php';
parent::setUpBeforeClass();
}

2
tests/phpunit/tests/ajax/AddMeta.php
View File

@@ -3,7 +3,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Add Meta AJAX functionality.

2
tests/phpunit/tests/ajax/Attachments.php
View File

@@ -2,7 +2,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax attachment handling.

2
tests/phpunit/tests/ajax/Autosave.php
View File

@@ -3,7 +3,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax save draft functionality.

2
tests/phpunit/tests/ajax/Compression.php
View File

@@ -3,7 +3,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax compression test functionality.

2
tests/phpunit/tests/ajax/DeleteComment.php
View File

@@ -3,7 +3,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax comment functionality.

2
tests/phpunit/tests/ajax/DeletePlugin.php
View File

@@ -2,7 +2,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax handler for deleting a plugin.

2
tests/phpunit/tests/ajax/DimComment.php
View File

@@ -3,7 +3,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax comment functionality

2
tests/phpunit/tests/ajax/EditComment.php
View File

@@ -3,7 +3,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax comment functionality.

2
tests/phpunit/tests/ajax/GetComments.php
View File

@@ -3,7 +3,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax comment functionality.

2
tests/phpunit/tests/ajax/ManageThemes.php
View File

@@ -2,7 +2,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax handler for instlaling, updating, and deleting themes.

6
tests/phpunit/tests/ajax/MediaEdit.php
View File

@@ -2,7 +2,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax media editing.
@@ -27,7 +27,7 @@ class Tests_Ajax_MediaEdit extends WP_Ajax_UnitTestCase {
* @ticket 22985
*/
public function testCropImageThumbnail() {
include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
require_once ABSPATH . 'wp-admin/includes/image-edit.php';
$filename = DIR_TESTDATA . '/images/canola.jpg';
$contents = file_get_contents( $filename );
@@ -58,7 +58,7 @@ class Tests_Ajax_MediaEdit extends WP_Ajax_UnitTestCase {
public function testImageEditOverwriteConstant() {
define( 'IMAGE_EDIT_OVERWRITE', true );
include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
require_once ABSPATH . 'wp-admin/includes/image-edit.php';
$filename = DIR_TESTDATA . '/images/canola.jpg';
$contents = file_get_contents( $filename );

2
tests/phpunit/tests/ajax/QuickEdit.php
View File

@@ -3,7 +3,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Quick Edit AJAX functionality.

2
tests/phpunit/tests/ajax/ReplytoComment.php
View File

@@ -3,7 +3,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax comment functionality.

2
tests/phpunit/tests/ajax/TagSearch.php
View File

@@ -3,7 +3,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax tag search functionality.

2
tests/phpunit/tests/ajax/UpdatePlugin.php
View File

@@ -2,7 +2,7 @@
/**
* Admin Ajax functions to be tested.
*/
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
/**
* Testing Ajax handler for updating a plugin.

2
tests/phpunit/tests/canonical/noRewrite.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( dirname( __FILE__ ) ) . '/canonical.php';
require_once dirname( __DIR__ ) . '/canonical.php';
/**
* @group canonical

2
tests/phpunit/tests/compat.php
View File

@@ -183,7 +183,7 @@ EOT;
* @expectedException PHPUnit_Framework_Error_Deprecated
*/
function test_json_encode_decode() {
require_once( ABSPATH . WPINC . '/class-json.php' );
require_once ABSPATH . WPINC . '/class-json.php';
$json = new Services_JSON();
// Super basic test to verify Services_JSON is intact and working.
$this->assertEquals( '["foo"]', $json->encodeUnsafe( array( 'foo' ) ) );

2
tests/phpunit/tests/customize/control.php
View File

@@ -27,7 +27,7 @@ class Test_WP_Customize_Control extends WP_UnitTestCase {
function setUp() {
parent::setUp();
wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
$GLOBALS['wp_customize'] = new WP_Customize_Manager();
$this->wp_customize = $GLOBALS['wp_customize'];
}

2
tests/phpunit/tests/customize/manager.php
View File

@@ -55,7 +55,7 @@ class Tests_WP_Customize_Manager extends WP_UnitTestCase {
*/
function setUp() {
parent::setUp();
require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
$this->manager = $this->instantiate();
$this->undefined = new stdClass();

2
tests/phpunit/tests/customize/panel.php
View File

@@ -14,7 +14,7 @@ class Tests_WP_Customize_Panel extends WP_UnitTestCase {
function setUp() {
parent::setUp();
require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
$GLOBALS['wp_customize'] = new WP_Customize_Manager();
$this->manager = $GLOBALS['wp_customize'];
$this->undefined = new stdClass();

2
tests/phpunit/tests/customize/partial.php
View File

@@ -31,7 +31,7 @@ class Test_WP_Customize_Partial extends WP_UnitTestCase {
*/
function setUp() {
parent::setUp();
require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
$GLOBALS['wp_customize'] = new WP_Customize_Manager();
$this->wp_customize = $GLOBALS['wp_customize'];
if ( isset( $this->wp_customize->selective_refresh ) ) {

2
tests/phpunit/tests/customize/section.php
View File

@@ -21,7 +21,7 @@ class Tests_WP_Customize_Section extends WP_UnitTestCase {
function setUp() {
parent::setUp();
require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
$GLOBALS['wp_customize'] = new WP_Customize_Manager();
$this->manager = $GLOBALS['wp_customize'];
$this->undefined = new stdClass();

2
tests/phpunit/tests/customize/selective-refresh-ajax.php
View File

@@ -41,7 +41,7 @@ class Test_WP_Customize_Selective_Refresh_Ajax extends WP_UnitTestCase {
add_filter( 'wp_doing_ajax', '__return_true' );
add_filter( 'wp_die_ajax_handler', array( $this, 'get_wp_die_handler' ), 1, 1 );
require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
$GLOBALS['wp_customize'] = new WP_Customize_Manager();
$this->wp_customize = $GLOBALS['wp_customize'];
if ( isset( $this->wp_customize->selective_refresh ) ) {

2
tests/phpunit/tests/customize/selective-refresh.php
View File

@@ -31,7 +31,7 @@ class Test_WP_Customize_Selective_Refresh extends WP_UnitTestCase {
*/
function setUp() {
parent::setUp();
require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
$GLOBALS['wp_customize'] = new WP_Customize_Manager();
$this->wp_customize = $GLOBALS['wp_customize'];
if ( isset( $this->wp_customize->selective_refresh ) ) {

2
tests/phpunit/tests/customize/setting.php
View File

@@ -19,7 +19,7 @@ class Tests_WP_Customize_Setting extends WP_UnitTestCase {
function setUp() {
parent::setUp();
require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
$GLOBALS['wp_customize'] = new WP_Customize_Manager();
$this->manager = $GLOBALS['wp_customize'];
$this->undefined = new stdClass();

2
tests/phpunit/tests/customize/widgets.php
View File

@@ -22,7 +22,7 @@ class Tests_WP_Customize_Widgets extends WP_UnitTestCase {
function setUp() {
parent::setUp();
require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
add_theme_support( 'customize-selective-refresh-widgets' );
$user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );

2
tests/phpunit/tests/db/charset.php
View File

@@ -25,7 +25,7 @@ class Tests_DB_Charset extends WP_UnitTestCase {
public static function setUpBeforeClass() {
parent::setUpBeforeClass();
require_once( dirname( dirname( __FILE__ ) ) . '/db.php' );
require_once dirname( __DIR__ ) . '/db.php';
self::$_wpdb = new WpdbExposedMethodsForTesting();

2
tests/phpunit/tests/dbdelta.php
View File

@@ -36,7 +36,7 @@ class Tests_dbDelta extends WP_UnitTestCase {
parent::setUpBeforeClass();
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
require_once ABSPATH . 'wp-admin/includes/upgrade.php';
}
/**

2
tests/phpunit/tests/feed/atom.php
View File

@@ -72,7 +72,7 @@ class Tests_Feeds_Atom extends WP_UnitTestCase {
global $post;
try {
// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
@require( ABSPATH . 'wp-includes/feed-atom.php' );
@require ABSPATH . 'wp-includes/feed-atom.php';
$out = ob_get_clean();
} catch ( Exception $e ) {
$out = ob_get_clean();

2
tests/phpunit/tests/feed/rss2.php
View File

@@ -84,7 +84,7 @@ class Tests_Feeds_RSS2 extends WP_UnitTestCase {
global $post;
try {
// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
@require( ABSPATH . 'wp-includes/feed-rss2.php' );
@require ABSPATH . 'wp-includes/feed-rss2.php';
$out = ob_get_clean();
} catch ( Exception $e ) {
$out = ob_get_clean();

2
tests/phpunit/tests/filesystem/base.php
View File

@@ -24,7 +24,7 @@ abstract class WP_Filesystem_UnitTestCase extends WP_UnitTestCase {
return 'MockFS';
}
function filter_abstraction_file( $file ) {
return dirname( dirname( dirname( __FILE__ ) ) ) . '/includes/mock-fs.php';
return dirname( dirname( __DIR__ ) ) . '/includes/mock-fs.php';
}
function test_is_MockFS_sane() {

2
tests/phpunit/tests/filesystem/findFolder.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( __FILE__ ) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* @group filesystem

2
tests/phpunit/tests/formatting/WPTexturize.php
View File

@@ -2107,7 +2107,7 @@ String with a number followed by a single quote !q1!Expendables 3!q1! vestibulum
}
function data_whole_posts() {
require_once( DIR_TESTDATA . '/formatting/whole-posts.php' );
require_once DIR_TESTDATA . '/formatting/whole-posts.php';
return data_whole_posts();
}
}

2
tests/phpunit/tests/formatting/WpHtmlSplit.php
View File

@@ -47,7 +47,7 @@ class Tests_Formatting_WpHtmlSplit extends WP_UnitTestCase {
}
function data_whole_posts() {
require_once( DIR_TESTDATA . '/formatting/whole-posts.php' );
require_once DIR_TESTDATA . '/formatting/whole-posts.php';
return data_whole_posts();
}
}

4
tests/phpunit/tests/functions/deprecated.php
View File

@@ -154,7 +154,7 @@ class Test_Functions_Deprecated extends WP_UnitTestCase {
}
// Call wp_save_image_file().
include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
include_once ABSPATH . 'wp-admin/includes/image-edit.php';
$file = wp_tempnam();
$img = imagecreatefromjpeg( DIR_TESTDATA . '/images/canola.jpg' );
wp_save_image_file( $file, $img, 'image/jpeg', 1 );
@@ -177,7 +177,7 @@ class Test_Functions_Deprecated extends WP_UnitTestCase {
}
// Call wp_save_image_file().
include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
include_once ABSPATH . 'wp-admin/includes/image-edit.php';
$file = wp_tempnam();
$img = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
wp_save_image_file( $file, $img, 'image/jpeg', 1 );

2
tests/phpunit/tests/general/template.php
View File

@@ -6,7 +6,7 @@
* @group site_icon
*/
require_once( ABSPATH . 'wp-admin/includes/class-wp-site-icon.php' );
require_once ABSPATH . 'wp-admin/includes/class-wp-site-icon.php';
class Tests_General_Template extends WP_UnitTestCase {
protected $wp_site_icon;

2
tests/phpunit/tests/http/curl.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( __FILE__ ) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* @group http

2
tests/phpunit/tests/http/streams.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( __FILE__ ) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* @group http

6
tests/phpunit/tests/image/editor.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( __FILE__ ) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* Test the WP_Image_Editor base class
@@ -15,9 +15,9 @@ class Tests_Image_Editor extends WP_Image_UnitTestCase {
* Setup test fixture
*/
public function setUp() {
require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' );
require_once DIR_TESTDATA . '/../includes/mock-image-editor.php';
parent::setUp();
}

6
tests/phpunit/tests/image/editorGd.php
View File

@@ -7,15 +7,15 @@
* @group media
* @group wp-image-editor-gd
*/
require_once( dirname( __FILE__ ) . '/base.php' );
require_once __DIR__ . '/base.php';
class Tests_Image_Editor_GD extends WP_Image_UnitTestCase {
public $editor_engine = 'WP_Image_Editor_GD';
public function setUp() {
require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
require_once( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' );
require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
parent::setUp();
}

6
tests/phpunit/tests/image/editorImagick.php
View File

@@ -7,15 +7,15 @@
* @group media
* @group wp-image-editor-imagick
*/
require_once( dirname( __FILE__ ) . '/base.php' );
require_once __DIR__ . '/base.php';
class Tests_Image_Editor_Imagick extends WP_Image_UnitTestCase {
public $editor_engine = 'WP_Image_Editor_Imagick';
public function setUp() {
require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
parent::setUp();
}

10
tests/phpunit/tests/image/functions.php
View File

@@ -13,11 +13,11 @@ class Tests_Image_Functions extends WP_UnitTestCase {
public function setUp() {
parent::setUp();
require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
require_once( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' );
require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' );
require_once DIR_TESTDATA . '/../includes/mock-image-editor.php';
// Ensure no legacy / failed tests detritus.
$folder = '/tmp/wordpress-gsoc-flyer*.{jpg,pdf}';
@@ -133,7 +133,7 @@ class Tests_Image_Functions extends WP_UnitTestCase {
$this->markTestSkipped( 'The fileinfo PHP extension is not loaded.' );
}
include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
require_once ABSPATH . 'wp-admin/includes/image-edit.php';
// Mime types.
$mime_types = array(

2
tests/phpunit/tests/image/header.php
View File

@@ -1,5 +1,5 @@
<?php
require_once( ABSPATH . 'wp-admin/includes/class-custom-image-header.php' );
require_once ABSPATH . 'wp-admin/includes/class-custom-image-header.php';
/**
* @group image

2
tests/phpunit/tests/image/resize.php
View File

@@ -6,7 +6,7 @@
* @group upload
* @group resize
*/
require_once( dirname( __FILE__ ) . '/base.php' );
require_once __DIR__ . '/base.php';
abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase {

6
tests/phpunit/tests/image/resizeGd.php
View File

@@ -6,7 +6,7 @@
* @group upload
* @group resize
*/
require_once( dirname( __FILE__ ) . '/resize.php' );
require_once __DIR__ . '/resize.php';
class Test_Image_Resize_GD extends WP_Tests_Image_Resize_UnitTestCase {
@@ -18,8 +18,8 @@ class Test_Image_Resize_GD extends WP_Tests_Image_Resize_UnitTestCase {
public $editor_engine = 'WP_Image_Editor_GD';
public function setUp() {
require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
require_once( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' );
require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
parent::setUp();
}

6
tests/phpunit/tests/image/resizeImagick.php
View File

@@ -6,7 +6,7 @@
* @group upload
* @group resize
*/
require_once( dirname( __FILE__ ) . '/resize.php' );
require_once __DIR__ . '/resize.php';
class Test_Image_Resize_Imagick extends WP_Tests_Image_Resize_UnitTestCase {
@@ -18,8 +18,8 @@ class Test_Image_Resize_Imagick extends WP_Tests_Image_Resize_UnitTestCase {
public $editor_engine = 'WP_Image_Editor_Imagick';
public function setUp() {
require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
parent::setUp();
}

2
tests/phpunit/tests/image/siteIcon.php
View File

@@ -5,7 +5,7 @@
* @group site_icon
*/
require_once( ABSPATH . 'wp-admin/includes/class-wp-site-icon.php' );
require_once ABSPATH . 'wp-admin/includes/class-wp-site-icon.php';
class Tests_WP_Site_Icon extends WP_UnitTestCase {
protected $wp_site_icon;

2
tests/phpunit/tests/import/import.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( __FILE__ ) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* @group import

2
tests/phpunit/tests/import/parser.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( __FILE__ ) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* @group import

2
tests/phpunit/tests/import/postmeta.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( __FILE__ ) . '/base.php';
require_once __DIR__ . '/base.php';
/**
* @group import

2
tests/phpunit/tests/menu/walker-nav-menu-edit.php
View File

@@ -13,7 +13,7 @@ class Tests_Menu_Walker_Nav_Menu_Edit extends WP_UnitTestCase {
parent::setUp();
/** Walker_Nav_Menu_Edit class */
require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );
require_once ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php';
$this->walker = new Walker_Nav_Menu_Edit();

6
tests/phpunit/tests/menu/wpExpandNavMenuPostData.php
View File

@@ -6,7 +6,7 @@
*/
class Tests_Menu_WpExpandNavMenuPostData extends WP_UnitTestCase {
public function test_unnested_data_should_expand() {
include_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
if ( empty( $_POST ) ) {
$_POST = array();
@@ -29,7 +29,7 @@ class Tests_Menu_WpExpandNavMenuPostData extends WP_UnitTestCase {
}
public function test_multidimensional_nested_array_should_expand() {
include_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
if ( empty( $_POST ) ) {
$_POST = array();
@@ -59,7 +59,7 @@ class Tests_Menu_WpExpandNavMenuPostData extends WP_UnitTestCase {
}
public function test_multidimensional_nested_array_should_expand_and_merge() {
include_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
if ( empty( $_POST ) ) {
$_POST = array();

16
tests/phpunit/tests/oembed/template.php
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();

2
tests/phpunit/tests/pomo/pluralForms.php
View File

@@ -78,7 +78,7 @@ class PluralFormsTest extends WP_UnitTestCase {
$this->markTestSkipped( 'Lambda functions are deprecated in PHP 7.2' );
}
require_once dirname( dirname( dirname( __FILE__ ) ) ) . '/includes/plural-form-function.php';
require_once dirname( dirname( __DIR__ ) ) . '/includes/plural-form-function.php';
$parenthesized = self::parenthesize_plural_expression( $expression );
$old_style = tests_make_plural_form_function( $nplurals, $parenthesized );

2
tests/phpunit/tests/post.php
View File

@@ -1010,7 +1010,7 @@ class Tests_Post extends WP_UnitTestCase {
$this->markTestSkipped( 'This test is only useful with the utf8 character set' );
}
require_once( ABSPATH . '/wp-admin/includes/post.php' );
require_once ABSPATH . '/wp-admin/includes/post.php';
$post_id = self::factory()->post->create();

2
tests/phpunit/tests/query/verboseRewriteRules.php
View File

@@ -1,6 +1,6 @@
<?php
require_once dirname( __FILE__ ) . '/conditionals.php';
require_once __DIR__ . '/conditionals.php';
/**
* @group query

2
tests/phpunit/tests/shortcode.php
View File

@@ -740,7 +740,7 @@ EOF;
}
function data_whole_posts() {
require_once( DIR_TESTDATA . '/formatting/whole-posts.php' );
require_once DIR_TESTDATA . '/formatting/whole-posts.php';
return data_whole_posts();
}

2
tests/phpunit/tests/site-health.php
View File

@@ -6,7 +6,7 @@
class Tests_Site_Health extends WP_UnitTestCase {
public static function wpSetUpBeforeClass() {
// Include the `WP_Site_Health` file.
include_once( ABSPATH . 'wp-admin/includes/class-wp-site-health.php' );
require_once ABSPATH . 'wp-admin/includes/class-wp-site-health.php';
}
/**

2
tests/phpunit/tests/theme/customHeader.php
View File

@@ -22,7 +22,7 @@ class Tests_Theme_Custom_Header extends WP_UnitTestCase {
function setUp() {
parent::setUp();
require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );
require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
$GLOBALS['wp_customize'] = new WP_Customize_Manager();
$this->customize_manager = $GLOBALS['wp_customize'];

12
tests/phpunit/wp-mail-real-test.php
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.