Index: src/wp-admin/includes/admin.php =================================================================== --- src/wp-admin/includes/admin.php (revision 38395) +++ src/wp-admin/includes/admin.php (working copy) @@ -50,7 +50,6 @@ require_once(ABSPATH . 'wp-admin/includes/post.php'); /** WordPress Administration Screen API */ -require_once(ABSPATH . 'wp-admin/includes/class-wp-screen.php'); require_once(ABSPATH . 'wp-admin/includes/screen.php'); /** WordPress Taxonomy Administration API */ @@ -60,8 +59,6 @@ require_once(ABSPATH . 'wp-admin/includes/template.php'); /** WordPress List Table Administration API and base class */ -require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php'); -require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table-compat.php'); require_once(ABSPATH . 'wp-admin/includes/list-table.php'); /** WordPress Theme Administration API */ @@ -70,9 +67,6 @@ /** WordPress User Administration API */ require_once(ABSPATH . 'wp-admin/includes/user.php'); -/** WordPress Site Icon API */ -require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php'); - /** WordPress Update Administration API */ require_once(ABSPATH . 'wp-admin/includes/update.php'); Index: src/wp-admin/includes/ajax-actions.php =================================================================== --- src/wp-admin/includes/ajax-actions.php (revision 38397) +++ src/wp-admin/includes/ajax-actions.php (working copy) @@ -1507,7 +1507,6 @@ $args['pagenum'] = ! empty( $_POST['page'] ) ? absint( $_POST['page'] ) : 1; - require(ABSPATH . WPINC . '/class-wp-editor.php'); $results = _WP_Editors::wp_link_query( $args ); if ( ! isset( $results ) ) @@ -3137,7 +3136,6 @@ */ function wp_ajax_press_this_save_post() { if ( empty( $GLOBALS['wp_press_this'] ) ) { - include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' ); $GLOBALS['wp_press_this'] = new WP_Press_This(); } @@ -3153,7 +3151,6 @@ */ function wp_ajax_press_this_add_category() { if ( empty( $GLOBALS['wp_press_this'] ) ) { - include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' ); $GLOBALS['wp_press_this'] = new WP_Press_This(); } @@ -3183,7 +3180,6 @@ switch ( $context ) { case 'site-icon': - require_once ABSPATH . '/wp-admin/includes/class-wp-site-icon.php'; $wp_site_icon = new WP_Site_Icon(); // Skip creating a new attachment if the attachment is a Site Icon. @@ -3332,7 +3328,6 @@ wp_send_json_error( $status ); } - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); include_once( ABSPATH . 'wp-admin/includes/theme.php' ); $api = themes_api( 'theme_information', array( @@ -3439,8 +3434,6 @@ wp_send_json_error( $status ); } - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); - $current = get_site_transient( 'update_themes' ); if ( empty( $current ) ) { wp_update_themes(); @@ -3590,7 +3583,6 @@ wp_send_json_error( $status ); } - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); $api = plugins_api( 'plugin_information', array( @@ -3698,8 +3690,6 @@ $status['oldVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] ); } - include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; - wp_update_plugins(); $skin = new WP_Ajax_Upgrader_Skin(); Index: src/wp-admin/includes/class-ftp.php =================================================================== --- src/wp-admin/includes/class-ftp.php (revision 38395) +++ src/wp-admin/includes/class-ftp.php (working copy) @@ -903,8 +903,6 @@ $mod_sockets = extension_loaded( 'sockets' ); } -require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php"; - if ( $mod_sockets ) { class ftp extends ftp_sockets {} } else { Index: src/wp-admin/includes/class-wp-filesystem-ftpsockets.php =================================================================== --- src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (revision 38395) +++ src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (working copy) @@ -30,10 +30,6 @@ $this->method = 'ftpsockets'; $this->errors = new WP_Error(); - // Check if possible to use ftp functions. - if ( ! @include_once( ABSPATH . 'wp-admin/includes/class-ftp.php' ) ) { - return; - } $this->ftp = new ftp(); if ( empty($opt['port']) ) Index: src/wp-admin/includes/class-wp-upgrader.php =================================================================== --- src/wp-admin/includes/class-wp-upgrader.php (revision 38395) +++ src/wp-admin/includes/class-wp-upgrader.php (working copy) @@ -9,39 +9,6 @@ * @since 2.8.0 */ -/** WP_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader-skin.php'; - -/** Plugin_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-plugin-upgrader-skin.php'; - -/** Theme_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-theme-upgrader-skin.php'; - -/** Bulk_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-bulk-upgrader-skin.php'; - -/** Bulk_Plugin_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-bulk-plugin-upgrader-skin.php'; - -/** Bulk_Theme_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-bulk-theme-upgrader-skin.php'; - -/** Plugin_Installer_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-plugin-installer-skin.php'; - -/** Theme_Installer_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-theme-installer-skin.php'; - -/** Language_Pack_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-language-pack-upgrader-skin.php'; - -/** Automatic_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-automatic-upgrader-skin.php'; - -/** WP_Ajax_Upgrader_Skin class */ -require_once ABSPATH . 'wp-admin/includes/class-wp-ajax-upgrader-skin.php'; - /** * Core class used for upgrading/installing a local set of files via * the Filesystem Abstraction classes from a Zip file. @@ -887,21 +854,3 @@ } } - -/** Plugin_Upgrader class */ -require_once ABSPATH . 'wp-admin/includes/class-plugin-upgrader.php'; - -/** Theme_Upgrader class */ -require_once ABSPATH . 'wp-admin/includes/class-theme-upgrader.php'; - -/** Language_Pack_Upgrader class */ -require_once ABSPATH . 'wp-admin/includes/class-language-pack-upgrader.php'; - -/** Core_Upgrader class */ -require_once ABSPATH . 'wp-admin/includes/class-core-upgrader.php'; - -/** File_Upload_Upgrader class */ -require_once ABSPATH . 'wp-admin/includes/class-file-upload-upgrader.php'; - -/** WP_Automatic_Updater class */ -require_once ABSPATH . 'wp-admin/includes/class-wp-automatic-updater.php'; Index: src/wp-admin/includes/deprecated.php =================================================================== --- src/wp-admin/includes/deprecated.php (revision 38395) +++ src/wp-admin/includes/deprecated.php (working copy) @@ -749,9 +749,6 @@ static $num = 1; - if ( ! class_exists( '_WP_Editors', false ) ) - require_once( ABSPATH . WPINC . '/class-wp-editor.php' ); - $editor_id = 'content' . $num++; $set = array( @@ -1144,7 +1141,6 @@ if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); $upgrader = new Core_Upgrader(); return $upgrader->upgrade($current); @@ -1167,7 +1163,6 @@ if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); $upgrader = new Plugin_Upgrader(); return $upgrader->upgrade($plugin); } @@ -1189,7 +1184,6 @@ if ( !empty($feedback) ) add_filter('update_feedback', $feedback); - include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); $upgrader = new Theme_Upgrader(); return $upgrader->upgrade($theme); } Index: src/wp-admin/includes/file.php =================================================================== --- src/wp-admin/includes/file.php (revision 38395) +++ src/wp-admin/includes/file.php (working copy) @@ -737,8 +737,6 @@ mbstring_binary_safe_encoding(); - require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php'); - $archive = new PclZip($file); $archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING); @@ -886,15 +884,23 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) { global $wp_filesystem; - require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php'); - $method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership ); if ( ! $method ) return false; - if ( ! class_exists( "WP_Filesystem_$method" ) ) { + $map = array( + 'base' => 'WP_Filesystem_Base', + 'direct' => 'WP_Filesystem_Direct', + 'ftpext' => 'WP_Filesystem_FTPext', + 'ftpsockets' => 'WP_Filesystem_ftpsockets', + 'ssh2' => 'WP_Filesystem_SSH2', + ); + $classname = $map[ strtolower( $method ) ]; + + if ( ! class_exists( $classname ) ) { + /** * Filters the path for a specific filesystem method class file. * @@ -907,14 +913,12 @@ */ $abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method ); - if ( ! file_exists($abstraction_file) ) + if ( ! file_exists( $abstraction_file ) ) { return; - - require_once($abstraction_file); + } } - $method = "WP_Filesystem_$method"; - $wp_filesystem = new $method($args); + $wp_filesystem = new $classname( $args ); //Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default. if ( ! defined('FS_CONNECT_TIMEOUT') ) Index: src/wp-admin/includes/list-table.php =================================================================== --- src/wp-admin/includes/list-table.php (revision 38395) +++ src/wp-admin/includes/list-table.php (working copy) @@ -40,9 +40,6 @@ ); if ( isset( $core_classes[ $class ] ) ) { - foreach ( (array) $core_classes[ $class ] as $required ) - require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' ); - if ( isset( $args['screen'] ) ) $args['screen'] = convert_to_screen( $args['screen'] ); elseif ( isset( $GLOBALS['hook_suffix'] ) ) Index: src/wp-admin/includes/nav-menu.php =================================================================== --- src/wp-admin/includes/nav-menu.php (revision 38395) +++ src/wp-admin/includes/nav-menu.php (working copy) @@ -7,12 +7,6 @@ * @since 3.0.0 */ -/** Walker_Nav_Menu_Edit class */ -require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' ); - -/** Walker_Nav_Menu_Checklist class */ -require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' ); - /** * Prints the appropriate response to a menu quick search. * Index: src/wp-admin/includes/template.php =================================================================== --- src/wp-admin/includes/template.php (revision 38395) +++ src/wp-admin/includes/template.php (working copy) @@ -8,12 +8,6 @@ * @subpackage Administration */ -/** Walker_Category_Checklist class */ -require_once( ABSPATH . 'wp-admin/includes/class-walker-category-checklist.php' ); - -/** WP_Internal_Pointers class */ -require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' ); - // // Category Checklists // Index: src/wp-admin/includes/translation-install.php =================================================================== --- src/wp-admin/includes/translation-install.php (revision 38395) +++ src/wp-admin/includes/translation-install.php (working copy) @@ -202,7 +202,6 @@ } $translation = (object) $translation; - require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; $skin = new Automatic_Upgrader_Skin; $upgrader = new Language_Pack_Upgrader( $skin ); $translation->type = 'core'; @@ -228,7 +227,6 @@ return false; } - require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; $skin = new Automatic_Upgrader_Skin; $upgrader = new Language_Pack_Upgrader( $skin ); $upgrader->init(); Index: src/wp-admin/includes/update.php =================================================================== --- src/wp-admin/includes/update.php (revision 38395) +++ src/wp-admin/includes/update.php (working copy) @@ -74,8 +74,6 @@ if ( ! $updates || empty( $updates->updates ) ) return false; - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); - $auto_update = false; $upgrader = new WP_Automatic_Updater; foreach ( $updates->updates as $update ) { Index: src/wp-admin/install.php =================================================================== --- src/wp-admin/install.php (revision 38395) +++ src/wp-admin/install.php (working copy) @@ -41,9 +41,6 @@ /** Load WordPress Translation Install API */ require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); -/** Load wpdb */ -require_once( ABSPATH . WPINC . '/wp-db.php' ); - nocache_headers(); $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; Index: src/wp-admin/press-this.php =================================================================== --- src/wp-admin/press-this.php (revision 38397) +++ src/wp-admin/press-this.php (working copy) @@ -23,7 +23,6 @@ * @global WP_Press_This $wp_press_this */ if ( empty( $GLOBALS['wp_press_this'] ) ) { - include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' ); $GLOBALS['wp_press_this'] = new WP_Press_This(); } Index: src/wp-admin/update-core.php =================================================================== --- src/wp-admin/update-core.php (revision 38395) +++ src/wp-admin/update-core.php (working copy) @@ -163,7 +163,6 @@ _e('You have the latest version of WordPress.'); if ( wp_http_supports( array( 'ssl' ) ) ) { - require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; $upgrader = new WP_Automatic_Updater; $future_minor_update = (object) array( 'current' => $wp_version . '.1.next.minor', @@ -187,7 +186,6 @@ } if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) { - require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; $upgrader = new WP_Automatic_Updater; if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) { echo '

'; @@ -438,8 +436,6 @@ function do_core_upgrade( $reinstall = false ) { global $wp_filesystem; - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); - if ( $reinstall ) $url = 'update-core.php?action=do-core-reinstall'; else @@ -710,7 +706,6 @@ check_admin_referer( 'upgrade-translations' ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); $url = 'update-core.php?action=do-translation-upgrade'; $nonce = 'upgrade-translations'; Index: src/wp-admin/update.php =================================================================== --- src/wp-admin/update.php (revision 38395) +++ src/wp-admin/update.php (working copy) @@ -12,8 +12,6 @@ /** WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); - if ( isset($_GET['action']) ) { $plugin = isset($_REQUEST['plugin']) ? trim($_REQUEST['plugin']) : ''; $theme = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : ''; @@ -218,8 +216,6 @@ if ( ! current_user_can('install_themes') ) wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) ); - include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api.. - check_admin_referer( 'install-theme_' . $theme ); $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth. Index: src/wp-includes/admin-bar.php =================================================================== --- src/wp-includes/admin-bar.php (revision 38395) +++ src/wp-includes/admin-bar.php (working copy) @@ -23,12 +23,10 @@ function _wp_admin_bar_init() { global $wp_admin_bar; - if ( ! is_admin_bar_showing() ) + if ( ! is_admin_bar_showing() ) { return false; + } - /* Load the admin bar class code ready for instantiation */ - require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' ); - /* Instantiate the admin bar */ /** @@ -39,11 +37,11 @@ * @param string $wp_admin_bar_class Admin bar class to use. Default 'WP_Admin_Bar'. */ $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' ); - if ( class_exists( $admin_bar_class ) ) + if ( class_exists( $admin_bar_class ) ) { $wp_admin_bar = new $admin_bar_class; - else + } else { return false; - + } $wp_admin_bar->initialize(); $wp_admin_bar->add_menus(); @@ -294,10 +292,10 @@ } if ( is_network_admin() ) { - /* translators: %s: site name */ + /* translators: %s: site name */ $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) ); } elseif ( is_user_admin() ) { - /* translators: %s: site name */ + /* translators: %s: site name */ $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) ); } Index: src/wp-includes/class-IXR.php =================================================================== --- src/wp-includes/class-IXR.php (revision 38395) +++ src/wp-includes/class-IXR.php (working copy) @@ -38,23 +38,3 @@ * @link http://scripts.incutio.com/xmlrpc/ Site/manual * @license http://www.opensource.org/licenses/bsd-license.php BSD */ - -require_once( ABSPATH . WPINC . '/IXR/class-IXR-value.php' ); - -require_once( ABSPATH . WPINC . '/IXR/class-IXR-message.php' ); - -require_once( ABSPATH . WPINC . '/IXR/class-IXR-server.php' ); - -require_once( ABSPATH . WPINC . '/IXR/class-IXR-request.php' ); - -require_once( ABSPATH . WPINC . '/IXR/class-IXR-client.php' ); - -require_once( ABSPATH . WPINC . '/IXR/class-IXR-error.php' ); - -require_once( ABSPATH . WPINC . '/IXR/class-IXR-date.php' ); - -require_once( ABSPATH . WPINC . '/IXR/class-IXR-base64.php' ); - -require_once( ABSPATH . WPINC . '/IXR/class-IXR-introspectionserver.php' ); - -require_once( ABSPATH . WPINC . '/IXR/class-IXR-clientmulticall.php' ); \ No newline at end of file Index: src/wp-includes/class-http.php =================================================================== --- src/wp-includes/class-http.php (revision 38395) +++ src/wp-includes/class-http.php (working copy) @@ -7,7 +7,7 @@ * @since 2.7.0 */ -if ( ! class_exists( 'Requests' ) ) { +if ( ! class_exists( 'Requests', false ) ) { require( ABSPATH . WPINC . '/class-requests.php' ); Requests::register_autoloader(); Index: src/wp-includes/class-phpmailer.php =================================================================== --- src/wp-includes/class-phpmailer.php (revision 38395) +++ src/wp-includes/class-phpmailer.php (working copy) @@ -1385,7 +1385,6 @@ public function getSMTPInstance() { if (!is_object($this->smtp)) { - require_once( 'class-smtp.php' ); $this->smtp = new SMTP; } return $this->smtp; Index: src/wp-includes/class-wp-customize-control.php =================================================================== --- src/wp-includes/class-wp-customize-control.php (revision 38395) +++ src/wp-includes/class-wp-customize-control.php (working copy) @@ -598,54 +598,3 @@ protected function content_template() {} } - -/** WP_Customize_Color_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' ); - -/** WP_Customize_Media_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' ); - -/** WP_Customize_Upload_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' ); - -/** WP_Customize_Image_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' ); - -/** WP_Customize_Background_Image_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' ); - -/** WP_Customize_Cropped_Image_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' ); - -/** WP_Customize_Site_Icon_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' ); - -/** WP_Customize_Header_Image_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' ); - -/** WP_Customize_Theme_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' ); - -/** WP_Widget_Area_Customize_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' ); - -/** WP_Widget_Form_Customize_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' ); - -/** WP_Customize_Nav_Menu_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' ); - -/** WP_Customize_Nav_Menu_Item_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' ); - -/** WP_Customize_Nav_Menu_Location_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' ); - -/** WP_Customize_Nav_Menu_Name_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' ); - -/** WP_Customize_Nav_Menu_Auto_Add_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' ); - -/** WP_Customize_New_Menu_Control class */ -require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' ); Index: src/wp-includes/class-wp-customize-manager.php =================================================================== --- src/wp-includes/class-wp-customize-manager.php (revision 38395) +++ src/wp-includes/class-wp-customize-manager.php (working copy) @@ -205,42 +205,6 @@ * @since 3.4.0 */ public function __construct() { - require_once( ABSPATH . WPINC . '/class-wp-customize-setting.php' ); - require_once( ABSPATH . WPINC . '/class-wp-customize-panel.php' ); - require_once( ABSPATH . WPINC . '/class-wp-customize-section.php' ); - require_once( ABSPATH . WPINC . '/class-wp-customize-control.php' ); - - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' ); - - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' ); - - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' ); - - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' ); - /** * Filters the core Customizer components to load. * @@ -258,16 +222,13 @@ */ $components = apply_filters( 'customize_loaded_components', $this->components, $this ); - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-selective-refresh.php' ); $this->selective_refresh = new WP_Customize_Selective_Refresh( $this ); if ( in_array( 'widgets', $components, true ) ) { - require_once( ABSPATH . WPINC . '/class-wp-customize-widgets.php' ); $this->widgets = new WP_Customize_Widgets( $this ); } if ( in_array( 'nav_menus', $components, true ) ) { - require_once( ABSPATH . WPINC . '/class-wp-customize-nav-menus.php' ); $this->nav_menus = new WP_Customize_Nav_Menus( $this ); } Index: src/wp-includes/class-wp-customize-panel.php =================================================================== --- src/wp-includes/class-wp-customize-panel.php (revision 38395) +++ src/wp-includes/class-wp-customize-panel.php (working copy) @@ -384,6 +384,3 @@ manager = $manager; - require_once( ABSPATH . WPINC . '/customize/class-wp-customize-partial.php' ); add_action( 'customize_preview_init', array( $this, 'init_preview' ) ); } Index: src/wp-includes/feed.php =================================================================== --- src/wp-includes/feed.php (revision 38395) +++ src/wp-includes/feed.php (working copy) @@ -666,10 +666,6 @@ if ( ! class_exists( 'SimplePie', false ) ) { require_once( ABSPATH . WPINC . '/class-simplepie.php' ); } - require_once( ABSPATH . WPINC . '/class-wp-feed-cache.php' ); - require_once( ABSPATH . WPINC . '/class-wp-feed-cache-transient.php' ); - require_once( ABSPATH . WPINC . '/class-wp-simplepie-file.php' ); - require_once( ABSPATH . WPINC . '/class-wp-simplepie-sanitize-kses.php' ); $feed = new SimplePie(); Index: src/wp-includes/functions.php =================================================================== --- src/wp-includes/functions.php (revision 38395) +++ src/wp-includes/functions.php (working copy) @@ -561,8 +561,6 @@ global $wpdb; //TODO: Tidy this ghetto code up and make the debug code optional - include_once( ABSPATH . WPINC . '/class-IXR.php' ); - $post_links = array(); $pung = get_enclosed( $post_ID ); Index: src/wp-includes/general-template.php =================================================================== --- src/wp-includes/general-template.php (revision 38395) +++ src/wp-includes/general-template.php (working copy) @@ -2980,9 +2980,6 @@ * @param array $settings See _WP_Editors::editor(). */ function wp_editor( $content, $editor_id, $settings = array() ) { - if ( ! class_exists( '_WP_Editors', false ) ) - require( ABSPATH . WPINC . '/class-wp-editor.php' ); - _WP_Editors::editor($content, $editor_id, $settings); } Index: src/wp-includes/link-template.php =================================================================== --- src/wp-includes/link-template.php (revision 38397) +++ src/wp-includes/link-template.php (working copy) @@ -2909,7 +2909,6 @@ function get_shortcut_link() { global $is_IE, $wp_version; - include_once( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' ); $GLOBALS['wp_press_this'] = new WP_Press_This(); $bookmarklet_version = $GLOBALS['wp_press_this']->version; $link = ''; Index: src/wp-includes/load.php =================================================================== --- src/wp-includes/load.php (revision 38395) +++ src/wp-includes/load.php (working copy) @@ -394,12 +394,12 @@ function require_wp_db() { global $wpdb; - require_once( ABSPATH . WPINC . '/wp-db.php' ); if ( file_exists( WP_CONTENT_DIR . '/db.php' ) ) require_once( WP_CONTENT_DIR . '/db.php' ); - if ( isset( $wpdb ) ) + if ( isset( $wpdb ) ) { return; + } $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST ); } Index: src/wp-includes/media.php =================================================================== --- src/wp-includes/media.php (revision 38395) +++ src/wp-includes/media.php (working copy) @@ -2909,10 +2909,6 @@ * editor claims to support the request. */ function _wp_image_editor_choose( $args = array() ) { - 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'; - /** * Filters the list of image editing library classes. * Index: src/wp-includes/ms-settings.php =================================================================== --- src/wp-includes/ms-settings.php (revision 38395) +++ src/wp-includes/ms-settings.php (working copy) @@ -22,12 +22,6 @@ */ global $current_site, $current_blog; -/** WP_Network class */ -require_once( ABSPATH . WPINC . '/class-wp-network.php' ); - -/** WP_Site class */ -require_once( ABSPATH . WPINC . '/class-wp-site.php' ); - /** Multisite loader */ require_once( ABSPATH . WPINC . '/ms-load.php' ); Index: src/wp-includes/nav-menu-template.php =================================================================== --- src/wp-includes/nav-menu-template.php (revision 38395) +++ src/wp-includes/nav-menu-template.php (working copy) @@ -7,9 +7,6 @@ * @since 3.0.0 */ -/** Walker_Nav_Menu class */ -require_once ABSPATH . WPINC . '/class-walker-nav-menu.php'; - /** * Displays a navigation menu. * Index: src/wp-includes/pluggable.php =================================================================== --- src/wp-includes/pluggable.php (revision 38395) +++ src/wp-includes/pluggable.php (working copy) @@ -211,7 +211,6 @@ // (Re)create it, if it's gone missing if ( ! ( $phpmailer instanceof PHPMailer ) ) { require_once ABSPATH . WPINC . '/class-phpmailer.php'; - require_once ABSPATH . WPINC . '/class-smtp.php'; $phpmailer = new PHPMailer( true ); } Index: src/wp-includes/script-loader.php =================================================================== --- src/wp-includes/script-loader.php (revision 38395) +++ src/wp-includes/script-loader.php (working copy) @@ -16,21 +16,9 @@ * @package WordPress */ -/** WordPress Dependency Class */ -require( ABSPATH . WPINC . '/class-wp-dependency.php' ); - -/** WordPress Dependencies Class */ -require( ABSPATH . WPINC . '/class.wp-dependencies.php' ); - -/** WordPress Scripts Class */ -require( ABSPATH . WPINC . '/class.wp-scripts.php' ); - /** WordPress Scripts Functions */ require( ABSPATH . WPINC . '/functions.wp-scripts.php' ); -/** WordPress Styles Class */ -require( ABSPATH . WPINC . '/class.wp-styles.php' ); - /** WordPress Styles Functions */ require( ABSPATH . WPINC . '/functions.wp-styles.php' ); Index: src/wp-includes/theme.php =================================================================== --- src/wp-includes/theme.php (revision 38395) +++ src/wp-includes/theme.php (working copy) @@ -1756,7 +1756,6 @@ add_action( 'wp_head', $args[0]['wp-head-callback'] ); if ( is_admin() ) { - require_once( ABSPATH . 'wp-admin/custom-header.php' ); $custom_image_header = new Custom_Image_Header( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] ); } } @@ -1769,7 +1768,6 @@ add_action( 'wp_head', $args[0]['wp-head-callback'] ); if ( is_admin() ) { - require_once( ABSPATH . 'wp-admin/custom-background.php' ); $custom_background = new Custom_Background( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] ); } } @@ -2082,7 +2080,6 @@ return; } - require_once ABSPATH . WPINC . '/class-wp-customize-manager.php'; $GLOBALS['wp_customize'] = new WP_Customize_Manager(); } Index: src/wp-includes/update.php =================================================================== --- src/wp-includes/update.php (revision 38395) +++ src/wp-includes/update.php (working copy) @@ -505,7 +505,6 @@ */ function wp_maybe_auto_update() { include_once( ABSPATH . '/wp-admin/includes/admin.php' ); - include_once( ABSPATH . '/wp-admin/includes/class-wp-upgrader.php' ); $upgrader = new WP_Automatic_Updater; $upgrader->run(); Index: src/wp-includes/wp-diff.php =================================================================== --- src/wp-includes/wp-diff.php (revision 38395) +++ src/wp-includes/wp-diff.php (working copy) @@ -16,6 +16,3 @@ /** Text_Diff_Renderer_inline class */ require( ABSPATH . WPINC . '/Text/Diff/Renderer/inline.php' ); } - -require( ABSPATH . WPINC . '/class-wp-text-diff-renderer-table.php' ); -require( ABSPATH . WPINC . '/class-wp-text-diff-renderer-inline.php' ); \ No newline at end of file Index: src/wp-mail.php =================================================================== --- src/wp-mail.php (revision 38395) +++ src/wp-mail.php (working copy) @@ -21,9 +21,6 @@ */ do_action( 'wp-mail.php' ); -/** Get the POP3 class with which to access the mailbox. */ -require_once( ABSPATH . WPINC . '/class-pop3.php' ); - /** Only check at this interval for new messages. */ if ( !defined('WP_MAIL_INTERVAL') ) define('WP_MAIL_INTERVAL', 300); // 5 minutes Index: src/wp-settings.php =================================================================== --- src/wp-settings.php (revision 38395) +++ src/wp-settings.php (working copy) @@ -17,6 +17,8 @@ */ define( 'WPINC', 'wp-includes' ); +require_once( ABSPATH . 'wp-vendor/autoload_52.php' ); + // Include files required for initialization. require( ABSPATH . WPINC . '/load.php' ); require( ABSPATH . WPINC . '/default-constants.php' ); @@ -93,11 +95,7 @@ require( ABSPATH . WPINC . '/compat.php' ); require( ABSPATH . WPINC . '/option.php' ); require( ABSPATH . WPINC . '/functions.php' ); -require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' ); -require( ABSPATH . WPINC . '/class-wp.php' ); -require( ABSPATH . WPINC . '/class-wp-error.php' ); require( ABSPATH . WPINC . '/pomo/mo.php' ); -require( ABSPATH . WPINC . '/class-phpass.php' ); // Include the wpdb class and, if present, a db.php database drop-in. global $wpdb; @@ -115,8 +113,6 @@ // Initialize multisite if enabled. if ( is_multisite() ) { - require( ABSPATH . WPINC . '/class-wp-site-query.php' ); - require( ABSPATH . WPINC . '/class-wp-network-query.php' ); require( ABSPATH . WPINC . '/ms-blogs.php' ); require( ABSPATH . WPINC . '/ms-settings.php' ); } elseif ( ! defined( 'MULTISITE' ) ) { @@ -136,49 +132,26 @@ wp_not_installed(); // Load most of WordPress. -require( ABSPATH . WPINC . '/class-wp-walker.php' ); -require( ABSPATH . WPINC . '/class-wp-ajax-response.php' ); require( ABSPATH . WPINC . '/formatting.php' ); require( ABSPATH . WPINC . '/capabilities.php' ); -require( ABSPATH . WPINC . '/class-wp-roles.php' ); -require( ABSPATH . WPINC . '/class-wp-role.php' ); -require( ABSPATH . WPINC . '/class-wp-user.php' ); -require( ABSPATH . WPINC . '/class-wp-query.php' ); require( ABSPATH . WPINC . '/query.php' ); -require( ABSPATH . WPINC . '/date.php' ); require( ABSPATH . WPINC . '/theme.php' ); -require( ABSPATH . WPINC . '/class-wp-theme.php' ); require( ABSPATH . WPINC . '/template.php' ); require( ABSPATH . WPINC . '/user.php' ); -require( ABSPATH . WPINC . '/class-wp-user-query.php' ); -require( ABSPATH . WPINC . '/class-wp-session-tokens.php' ); -require( ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php' ); require( ABSPATH . WPINC . '/meta.php' ); -require( ABSPATH . WPINC . '/class-wp-meta-query.php' ); -require( ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php' ); require( ABSPATH . WPINC . '/general-template.php' ); require( ABSPATH . WPINC . '/link-template.php' ); require( ABSPATH . WPINC . '/author-template.php' ); require( ABSPATH . WPINC . '/post.php' ); -require( ABSPATH . WPINC . '/class-walker-page.php' ); -require( ABSPATH . WPINC . '/class-walker-page-dropdown.php' ); -require( ABSPATH . WPINC . '/class-wp-post-type.php' ); -require( ABSPATH . WPINC . '/class-wp-post.php' ); require( ABSPATH . WPINC . '/post-template.php' ); require( ABSPATH . WPINC . '/revision.php' ); require( ABSPATH . WPINC . '/post-formats.php' ); require( ABSPATH . WPINC . '/post-thumbnail-template.php' ); require( ABSPATH . WPINC . '/category.php' ); -require( ABSPATH . WPINC . '/class-walker-category.php' ); -require( ABSPATH . WPINC . '/class-walker-category-dropdown.php' ); require( ABSPATH . WPINC . '/category-template.php' ); require( ABSPATH . WPINC . '/comment.php' ); -require( ABSPATH . WPINC . '/class-wp-comment.php' ); -require( ABSPATH . WPINC . '/class-wp-comment-query.php' ); -require( ABSPATH . WPINC . '/class-walker-comment.php' ); require( ABSPATH . WPINC . '/comment-template.php' ); require( ABSPATH . WPINC . '/rewrite.php' ); -require( ABSPATH . WPINC . '/class-wp-rewrite.php' ); require( ABSPATH . WPINC . '/feed.php' ); require( ABSPATH . WPINC . '/bookmark.php' ); require( ABSPATH . WPINC . '/bookmark-template.php' ); @@ -187,37 +160,17 @@ require( ABSPATH . WPINC . '/deprecated.php' ); require( ABSPATH . WPINC . '/script-loader.php' ); require( ABSPATH . WPINC . '/taxonomy.php' ); -require( ABSPATH . WPINC . '/class-wp-term.php' ); -require( ABSPATH . WPINC . '/class-wp-term-query.php' ); -require( ABSPATH . WPINC . '/class-wp-tax-query.php' ); require( ABSPATH . WPINC . '/update.php' ); require( ABSPATH . WPINC . '/canonical.php' ); require( ABSPATH . WPINC . '/shortcodes.php' ); require( ABSPATH . WPINC . '/embed.php' ); -require( ABSPATH . WPINC . '/class-wp-embed.php' ); -require( ABSPATH . WPINC . '/class-oembed.php' ); -require( ABSPATH . WPINC . '/class-wp-oembed-controller.php' ); require( ABSPATH . WPINC . '/media.php' ); require( ABSPATH . WPINC . '/http.php' ); -require( ABSPATH . WPINC . '/class-http.php' ); -require( ABSPATH . WPINC . '/class-wp-http-streams.php' ); -require( ABSPATH . WPINC . '/class-wp-http-curl.php' ); -require( ABSPATH . WPINC . '/class-wp-http-proxy.php' ); -require( ABSPATH . WPINC . '/class-wp-http-cookie.php' ); -require( ABSPATH . WPINC . '/class-wp-http-encoding.php' ); -require( ABSPATH . WPINC . '/class-wp-http-response.php' ); -require( ABSPATH . WPINC . '/class-wp-http-requests-response.php' ); require( ABSPATH . WPINC . '/widgets.php' ); -require( ABSPATH . WPINC . '/class-wp-widget.php' ); -require( ABSPATH . WPINC . '/class-wp-widget-factory.php' ); require( ABSPATH . WPINC . '/nav-menu.php' ); require( ABSPATH . WPINC . '/nav-menu-template.php' ); require( ABSPATH . WPINC . '/admin-bar.php' ); require( ABSPATH . WPINC . '/rest-api.php' ); -require( ABSPATH . WPINC . '/rest-api/class-wp-rest-server.php' ); -require( ABSPATH . WPINC . '/rest-api/class-wp-rest-response.php' ); -require( ABSPATH . WPINC . '/rest-api/class-wp-rest-request.php' ); -require( ABSPATH . WPINC . '/class-wp-locale.php' ); $GLOBALS['wp_embed'] = new WP_Embed(); Index: src/xmlrpc.php =================================================================== --- src/xmlrpc.php (revision 38395) +++ src/xmlrpc.php (working copy) @@ -59,9 +59,7 @@ exit; } -include_once(ABSPATH . 'wp-admin/includes/admin.php'); -include_once(ABSPATH . WPINC . '/class-IXR.php'); -include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php'); +include_once( ABSPATH . 'wp-admin/includes/admin.php' ); /** * Posts submitted via the XML-RPC interface get that title Index: tests/phpunit/includes/install.php =================================================================== --- tests/phpunit/includes/install.php (revision 38395) +++ tests/phpunit/includes/install.php (working copy) @@ -20,7 +20,6 @@ require_once ABSPATH . '/wp-settings.php'; require_once ABSPATH . '/wp-admin/includes/upgrade.php'; -require_once ABSPATH . '/wp-includes/wp-db.php'; // Override the PHPMailer global $phpmailer; Index: tests/phpunit/includes/testcase-xmlrpc.php =================================================================== --- tests/phpunit/includes/testcase-xmlrpc.php (revision 38395) +++ tests/phpunit/includes/testcase-xmlrpc.php (working copy) @@ -1,7 +1,5 @@ user->create( array( 'role' => 'editor' ) ); self::$user_ids[] = self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) ); Index: tests/phpunit/tests/ajax/CustomizeMenus.php =================================================================== --- tests/phpunit/tests/ajax/CustomizeMenus.php (revision 38395) +++ tests/phpunit/tests/ajax/CustomizeMenus.php (working copy) @@ -21,7 +21,7 @@ */ public function setUp() { parent::setUp(); - require_once ABSPATH . WPINC . '/class-wp-customize-manager.php'; + wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) ); global $wp_customize; $this->wp_customize = new WP_Customize_Manager(); Index: tests/phpunit/tests/auth.php =================================================================== --- tests/phpunit/tests/auth.php (revision 38395) +++ tests/phpunit/tests/auth.php (working copy) @@ -22,7 +22,6 @@ self::$user_id = self::$_user->ID; - require_once( ABSPATH . WPINC . '/class-phpass.php' ); self::$wp_hasher = new PasswordHash( 8, true ); } Index: tests/phpunit/tests/comment-submission.php =================================================================== --- tests/phpunit/tests/comment-submission.php (revision 38395) +++ tests/phpunit/tests/comment-submission.php (working copy) @@ -7,11 +7,6 @@ protected $preprocess_comment_data = array(); - function setUp() { - parent::setUp(); - require_once ABSPATH . WPINC . '/class-phpass.php'; - } - public function test_submitting_comment_to_invalid_post_returns_error() { $error = 'comment_id_not_found'; Index: tests/phpunit/tests/compat.php =================================================================== --- tests/phpunit/tests/compat.php (revision 38395) +++ tests/phpunit/tests/compat.php (working copy) @@ -86,7 +86,7 @@ $this->assertEquals( 'DEF', _mb_substr($string_ascii, 3) ); $this->assertEquals( 'DEF', _mb_substr($string_ascii, 3, 5, 'ISO-8859-1') ); - // specific latin-1 as that is the default the core php test opporates under + // specific latin-1 as that is the default the core php test opporates under $this->assertEquals( 'peacrOiqng==' , base64_encode( _mb_substr($string_mb, 2, 7, 'latin-1' ) ) ); $this->assertEquals( '6Kqe44OG44Kt44K544OI44Gn44GZ', base64_encode( _mb_substr($string_mb, 2, 7, 'utf-8') ) ); @@ -98,7 +98,7 @@ $heredoc = <<manager = $this->instantiate(); $this->undefined = new stdClass(); } @@ -977,8 +977,6 @@ } } -require_once ABSPATH . WPINC . '/class-wp-customize-setting.php'; - /** * Class Test_Dynamic_Customize_Setting * Index: tests/phpunit/tests/customize/nav-menu-item-setting.php =================================================================== --- tests/phpunit/tests/customize/nav-menu-item-setting.php (revision 38395) +++ tests/phpunit/tests/customize/nav-menu-item-setting.php (working copy) @@ -20,7 +20,7 @@ */ function setUp() { parent::setUp(); - require_once ABSPATH . WPINC . '/class-wp-customize-manager.php'; + wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) ); global $wp_customize; Index: tests/phpunit/tests/customize/nav-menu-setting.php =================================================================== --- tests/phpunit/tests/customize/nav-menu-setting.php (revision 38395) +++ tests/phpunit/tests/customize/nav-menu-setting.php (working copy) @@ -21,7 +21,7 @@ */ function setUp() { parent::setUp(); - require_once ABSPATH . WPINC . '/class-wp-customize-manager.php'; + wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) ); global $wp_customize; Index: tests/phpunit/tests/customize/nav-menus.php =================================================================== --- tests/phpunit/tests/customize/nav-menus.php (revision 38395) +++ tests/phpunit/tests/customize/nav-menus.php (working copy) @@ -21,7 +21,7 @@ */ function setUp() { parent::setUp(); - require_once ABSPATH . WPINC . '/class-wp-customize-manager.php'; + wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) ); global $wp_customize; $this->wp_customize = new WP_Customize_Manager(); Index: tests/phpunit/tests/customize/panel.php =================================================================== --- tests/phpunit/tests/customize/panel.php (revision 38395) +++ tests/phpunit/tests/customize/panel.php (working copy) @@ -14,7 +14,7 @@ function setUp() { parent::setUp(); - 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(); @@ -211,7 +211,6 @@ } } -require_once ABSPATH . WPINC . '/class-wp-customize-panel.php'; class Custom_Panel_Test extends WP_Customize_Panel { public $type = 'titleless'; Index: tests/phpunit/tests/customize/partial.php =================================================================== --- tests/phpunit/tests/customize/partial.php (revision 38395) +++ tests/phpunit/tests/customize/partial.php (working copy) @@ -31,7 +31,7 @@ */ function setUp() { parent::setUp(); - require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' ); + // @codingStandardsIgnoreStart $GLOBALS['wp_customize'] = new WP_Customize_Manager(); // @codingStandardsIgnoreEnd Index: tests/phpunit/tests/customize/section.php =================================================================== --- tests/phpunit/tests/customize/section.php (revision 38395) +++ tests/phpunit/tests/customize/section.php (working copy) @@ -26,7 +26,7 @@ function setUp() { parent::setUp(); - 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(); @@ -224,7 +224,6 @@ } } -require_once ABSPATH . WPINC . '/class-wp-customize-section.php'; class Custom_Section_Test extends WP_Customize_Section { public $type = 'titleless'; Index: tests/phpunit/tests/customize/selective-refresh-ajax.php =================================================================== --- tests/phpunit/tests/customize/selective-refresh-ajax.php (revision 38395) +++ tests/phpunit/tests/customize/selective-refresh-ajax.php (working copy) @@ -43,7 +43,6 @@ } add_filter( 'wp_die_ajax_handler', array( $this, 'get_wp_die_handler' ), 1, 1 ); - require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' ); // @codingStandardsIgnoreStart $GLOBALS['wp_customize'] = new WP_Customize_Manager(); // @codingStandardsIgnoreEnd Index: tests/phpunit/tests/customize/selective-refresh.php =================================================================== --- tests/phpunit/tests/customize/selective-refresh.php (revision 38395) +++ tests/phpunit/tests/customize/selective-refresh.php (working copy) @@ -31,7 +31,7 @@ */ function setUp() { parent::setUp(); - require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' ); + // @codingStandardsIgnoreStart $GLOBALS['wp_customize'] = new WP_Customize_Manager(); // @codingStandardsIgnoreEnd @@ -256,8 +256,6 @@ } } -require_once ABSPATH . WPINC . '/customize/class-wp-customize-partial.php'; - /** * Class Tested_Custom_Partial */ Index: tests/phpunit/tests/customize/setting.php =================================================================== --- tests/phpunit/tests/customize/setting.php (revision 38395) +++ tests/phpunit/tests/customize/setting.php (working copy) @@ -19,7 +19,7 @@ function setUp() { parent::setUp(); - 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(); Index: tests/phpunit/tests/customize/widgets.php =================================================================== --- tests/phpunit/tests/customize/widgets.php (revision 38395) +++ tests/phpunit/tests/customize/widgets.php (working copy) @@ -22,7 +22,6 @@ function setUp() { parent::setUp(); - 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' ) ); Index: tests/phpunit/tests/general/template.php =================================================================== --- tests/phpunit/tests/general/template.php (revision 38395) +++ tests/phpunit/tests/general/template.php (working copy) @@ -6,8 +6,6 @@ * @group site_icon */ -require_once( ABSPATH . 'wp-admin/includes/class-wp-site-icon.php' ); - class Tests_General_Template extends WP_UnitTestCase { protected $wp_site_icon; public $site_icon_id; Index: tests/phpunit/tests/image/editor.php =================================================================== --- tests/phpunit/tests/image/editor.php (revision 38395) +++ tests/phpunit/tests/image/editor.php (working copy) @@ -14,8 +14,6 @@ * Setup test fixture */ public function setup() { - require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' ); - include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' ); parent::setUp(); Index: tests/phpunit/tests/image/editor_gd.php =================================================================== --- tests/phpunit/tests/image/editor_gd.php (revision 38395) +++ tests/phpunit/tests/image/editor_gd.php (working copy) @@ -12,13 +12,6 @@ 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' ); - - parent::setUp(); - } - public function tearDown() { $folder = DIR_TESTDATA . '/images/waffles-*.jpg'; Index: tests/phpunit/tests/image/editor_imagick.php =================================================================== --- tests/phpunit/tests/image/editor_imagick.php (revision 38395) +++ tests/phpunit/tests/image/editor_imagick.php (working copy) @@ -12,13 +12,6 @@ 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' ); - - parent::setUp(); - } - public function tearDown() { $folder = DIR_TESTDATA . '/images/waffles-*.jpg'; Index: tests/phpunit/tests/image/functions.php =================================================================== --- tests/phpunit/tests/image/functions.php (revision 38395) +++ tests/phpunit/tests/image/functions.php (working copy) @@ -13,10 +13,6 @@ 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' ); - include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' ); } Index: tests/phpunit/tests/image/resize_gd.php =================================================================== --- tests/phpunit/tests/image/resize_gd.php (revision 38395) +++ tests/phpunit/tests/image/resize_gd.php (working copy) @@ -16,13 +16,6 @@ */ 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' ); - - parent::setUp(); - } - /** * Try resizing a php file (bad image) * @ticket 6821 Index: tests/phpunit/tests/image/resize_imagick.php =================================================================== --- tests/phpunit/tests/image/resize_imagick.php (revision 38395) +++ tests/phpunit/tests/image/resize_imagick.php (working copy) @@ -15,11 +15,4 @@ * @var string */ 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' ); - - parent::setUp(); - } } \ No newline at end of file Index: tests/phpunit/tests/image/site_icon.php =================================================================== --- tests/phpunit/tests/image/site_icon.php (revision 38395) +++ tests/phpunit/tests/image/site_icon.php (working copy) @@ -5,8 +5,6 @@ * @group site_icon */ -require_once( ABSPATH . 'wp-admin/includes/class-wp-site-icon.php' ); - class Tests_WP_Site_Icon extends WP_UnitTestCase { protected $wp_site_icon; Index: tests/phpunit/tests/menu/walker-nav-menu-edit.php =================================================================== --- tests/phpunit/tests/menu/walker-nav-menu-edit.php (revision 38395) +++ tests/phpunit/tests/menu/walker-nav-menu-edit.php (working copy) @@ -12,9 +12,6 @@ parent::setUp(); - /** Walker_Nav_Menu_Edit class */ - require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' ); - $this->walker = new Walker_Nav_Menu_Edit(); $this->_wp_nav_menu_max_depth = $_wp_nav_menu_max_depth; Index: tests/phpunit/tests/oembed/wpOembed.php =================================================================== --- tests/phpunit/tests/oembed/wpOembed.php (revision 38395) +++ tests/phpunit/tests/oembed/wpOembed.php (working copy) @@ -14,7 +14,6 @@ public function setUp() { parent::setUp(); - require_once ABSPATH . WPINC . '/class-oembed.php'; $this->oembed = _wp_oembed_get_object(); $this->pre_oembed_result_filtered = false; Index: tests/phpunit/tests/widgets.php =================================================================== --- tests/phpunit/tests/widgets.php (revision 38395) +++ tests/phpunit/tests/widgets.php (working copy) @@ -509,7 +509,7 @@ $this->assertFalse( $widget->is_preview() ); wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) ); - require_once ABSPATH . WPINC . '/class-wp-customize-manager.php'; + $wp_customize = new WP_Customize_Manager(); $wp_customize->start_previewing_theme(); Index: tests/phpunit/tests/xmlrpc/basic.php =================================================================== --- tests/phpunit/tests/xmlrpc/basic.php (revision 38395) +++ tests/phpunit/tests/xmlrpc/basic.php (working copy) @@ -1,8 +1,5 @@