From 5d4485b184107f0f9dbcdf485591590cdeddd1c8 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 27 Aug 2016 05:39:31 +0000 Subject: [PATCH] Bootstrap: exclude more files from the `autoloader.classmap` in `composer.json`. See #36335. git-svn-id: https://develop.svn.wordpress.org/trunk@38395 602fd350-edb4-49c9-b593-d223f7449a82 --- composer.json | 11 ++++++++--- src/wp-vendor/autoload_52.php | 2 +- src/wp-vendor/composer/autoload_classmap.php | 19 ------------------- src/wp-vendor/composer/autoload_real_52.php | 6 +++--- 4 files changed, 12 insertions(+), 26 deletions(-) diff --git a/composer.json b/composer.json index 5fe4556c45..71cdf20fbe 100644 --- a/composer.json +++ b/composer.json @@ -44,16 +44,21 @@ "src/wp-admin/includes/deprecated.php", "src/wp-includes/atomlib.php", "src/wp-includes/cache.php", + "src/wp-includes/class-json.php", + "src/wp-includes/class-phpmailer.php", + "src/wp-includes/class-requests.php", + "src/wp-includes/class-simplepie.php", + "src/wp-includes/class-snoopy.php", "src/wp-includes/compat.php", "src/wp-includes/pluggable-deprecated.php", "src/wp-includes/rss.php", - "src/wp-includes/class-snoopy.php", - "src/wp-includes/pomo/", "src/wp-includes/ID3/", + "src/wp-includes/pomo/", "src/wp-includes/random_compat/error_polyfill.php", "src/wp-includes/Requests/", "src/wp-includes/SimplePie/", - "src/wp-includes/Text/" + "src/wp-includes/Text/", + "src/wp-includes/widgets/" ] }, "config": { diff --git a/src/wp-vendor/autoload_52.php b/src/wp-vendor/autoload_52.php index ceb45ae8ee..56bbdc1eda 100644 --- a/src/wp-vendor/autoload_52.php +++ b/src/wp-vendor/autoload_52.php @@ -4,4 +4,4 @@ require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php'; -return ComposerAutoloaderInit5759bae7e770c5001f6b93d9ea09c420::getLoader(); +return ComposerAutoloaderInit472dba0eaffdca839125d11fca021b8d::getLoader(); diff --git a/src/wp-vendor/composer/autoload_classmap.php b/src/wp-vendor/composer/autoload_classmap.php index 20a789eff3..b3d245b05b 100644 --- a/src/wp-vendor/composer/autoload_classmap.php +++ b/src/wp-vendor/composer/autoload_classmap.php @@ -26,18 +26,13 @@ return array( 'IXR_Value' => $baseDir . '/src/wp-includes/IXR/class-IXR-value.php', 'Language_Pack_Upgrader' => $baseDir . '/src/wp-admin/includes/class-language-pack-upgrader.php', 'Language_Pack_Upgrader_Skin' => $baseDir . '/src/wp-admin/includes/class-language-pack-upgrader-skin.php', - 'PHPMailer' => $baseDir . '/src/wp-includes/class-phpmailer.php', 'POP3' => $baseDir . '/src/wp-includes/class-pop3.php', 'PasswordHash' => $baseDir . '/src/wp-includes/class-phpass.php', 'PclZip' => $baseDir . '/src/wp-admin/includes/class-pclzip.php', 'Plugin_Installer_Skin' => $baseDir . '/src/wp-admin/includes/class-plugin-installer-skin.php', 'Plugin_Upgrader' => $baseDir . '/src/wp-admin/includes/class-plugin-upgrader.php', 'Plugin_Upgrader_Skin' => $baseDir . '/src/wp-admin/includes/class-plugin-upgrader-skin.php', - 'Requests' => $baseDir . '/src/wp-includes/class-requests.php', 'SMTP' => $baseDir . '/src/wp-includes/class-smtp.php', - 'Services_JSON' => $baseDir . '/src/wp-includes/class-json.php', - 'Services_JSON_Error' => $baseDir . '/src/wp-includes/class-json.php', - 'SimplePie' => $baseDir . '/src/wp-includes/class-simplepie.php', 'Theme_Installer_Skin' => $baseDir . '/src/wp-admin/includes/class-theme-installer-skin.php', 'Theme_Upgrader' => $baseDir . '/src/wp-admin/includes/class-theme-upgrader.php', 'Theme_Upgrader_Skin' => $baseDir . '/src/wp-admin/includes/class-theme-upgrader-skin.php', @@ -119,7 +114,6 @@ return array( 'WP_Media_List_Table' => $baseDir . '/src/wp-admin/includes/class-wp-media-list-table.php', 'WP_Meta_Query' => $baseDir . '/src/wp-includes/class-wp-meta-query.php', 'WP_Metadata_Lazyloader' => $baseDir . '/src/wp-includes/class-wp-metadata-lazyloader.php', - 'WP_Nav_Menu_Widget' => $baseDir . '/src/wp-includes/widgets/class-wp-nav-menu-widget.php', 'WP_Network' => $baseDir . '/src/wp-includes/class-wp-network.php', 'WP_Network_Query' => $baseDir . '/src/wp-includes/class-wp-network-query.php', 'WP_Plugin_Install_List_Table' => $baseDir . '/src/wp-admin/includes/class-wp-plugin-install-list-table.php', @@ -161,21 +155,9 @@ return array( 'WP_User_Query' => $baseDir . '/src/wp-includes/class-wp-user-query.php', 'WP_Users_List_Table' => $baseDir . '/src/wp-admin/includes/class-wp-users-list-table.php', 'WP_Widget' => $baseDir . '/src/wp-includes/class-wp-widget.php', - 'WP_Widget_Archives' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-archives.php', 'WP_Widget_Area_Customize_Control' => $baseDir . '/src/wp-includes/customize/class-wp-widget-area-customize-control.php', - 'WP_Widget_Calendar' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-calendar.php', - 'WP_Widget_Categories' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-categories.php', 'WP_Widget_Factory' => $baseDir . '/src/wp-includes/class-wp-widget-factory.php', 'WP_Widget_Form_Customize_Control' => $baseDir . '/src/wp-includes/customize/class-wp-widget-form-customize-control.php', - 'WP_Widget_Links' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-links.php', - 'WP_Widget_Meta' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-meta.php', - 'WP_Widget_Pages' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-pages.php', - 'WP_Widget_RSS' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-rss.php', - 'WP_Widget_Recent_Comments' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-recent-comments.php', - 'WP_Widget_Recent_Posts' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-recent-posts.php', - 'WP_Widget_Search' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-search.php', - 'WP_Widget_Tag_Cloud' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-tag-cloud.php', - 'WP_Widget_Text' => $baseDir . '/src/wp-includes/widgets/class-wp-widget-text.php', 'WP_oEmbed' => $baseDir . '/src/wp-includes/class-oembed.php', 'WP_oEmbed_Controller' => $baseDir . '/src/wp-includes/class-wp-oembed-controller.php', 'Walker' => $baseDir . '/src/wp-includes/class-wp-walker.php', @@ -195,7 +177,6 @@ return array( 'ftp_base' => $baseDir . '/src/wp-admin/includes/class-ftp.php', 'ftp_pure' => $baseDir . '/src/wp-admin/includes/class-ftp-pure.php', 'ftp_sockets' => $baseDir . '/src/wp-admin/includes/class-ftp-sockets.php', - 'phpmailerException' => $baseDir . '/src/wp-includes/class-phpmailer.php', 'wp_xmlrpc_server' => $baseDir . '/src/wp-includes/class-wp-xmlrpc-server.php', 'wpdb' => $baseDir . '/src/wp-includes/wp-db.php', ); diff --git a/src/wp-vendor/composer/autoload_real_52.php b/src/wp-vendor/composer/autoload_real_52.php index 0b03806186..055478c034 100644 --- a/src/wp-vendor/composer/autoload_real_52.php +++ b/src/wp-vendor/composer/autoload_real_52.php @@ -2,7 +2,7 @@ // autoload_real_52.php generated by xrstf/composer-php52 -class ComposerAutoloaderInit5759bae7e770c5001f6b93d9ea09c420 { +class ComposerAutoloaderInit472dba0eaffdca839125d11fca021b8d { private static $loader; public static function loadClassLoader($class) { @@ -19,9 +19,9 @@ class ComposerAutoloaderInit5759bae7e770c5001f6b93d9ea09c420 { return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit5759bae7e770c5001f6b93d9ea09c420', 'loadClassLoader'), true /*, true */); + spl_autoload_register(array('ComposerAutoloaderInit472dba0eaffdca839125d11fca021b8d', 'loadClassLoader'), true /*, true */); self::$loader = $loader = new xrstf_Composer52_ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit5759bae7e770c5001f6b93d9ea09c420', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit472dba0eaffdca839125d11fca021b8d', 'loadClassLoader')); $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname($vendorDir));