Skip to content

Commit

Permalink
Change timing of when to polyfill is_customize_preview() (#5314)
Browse files Browse the repository at this point in the history 
Change timing of when to polyfill `is_customize_preview()`
  • Loading branch information
@schlessera
schlessera committed Nov 12, 2019
2 parents 1b77e1a + 9e20758 commit 74c949c
Showing 1 changed file with 34 additions and 34 deletions.
68 changes: 34 additions & 34 deletions php/WP_CLI/Runner.php
View file
Expand Up @@ -132,7 +132,7 @@ public function get_project_config_path() {
$project_config_path = Utils\find_file_upward(
$config_files,
getcwd(),
function ( $dir ) {
static function ( $dir ) {
static $wp_load_count = 0;
$wp_load_path = $dir . DIRECTORY_SEPARATOR . 'wp-load.php';
if ( file_exists( $wp_load_path ) ) {
Expand Down Expand Up @@ -1246,23 +1246,9 @@ public function load_wordpress() {
// Load all the admin APIs, for convenience
require ABSPATH . 'wp-admin/includes/admin.php';

// Maybe load template functions, as they might be needed by starter
// content.
if ( ! function_exists( 'get_theme_file_uri' ) ) {
require_once ABSPATH . 'wp-includes/link-template.php';
}

// Polyfill is_customize_preview(), as it is needed by TwentyTwenty to
// check for starter content.
if ( ! function_exists( 'is_customize_preview' ) ) {
function is_customize_preview() {
return false;
}
}

add_filter(
'filesystem_method',
function() {
static function () {
return 'direct';
},
99
Expand Down Expand Up @@ -1352,7 +1338,7 @@ function () use ( $help_handler ) {
} else {
WP_CLI::add_wp_hook(
'wp_die_handler',
function() {
static function () {
return '\WP_CLI\Utils\wp_die_handler';
}
);
Expand All @@ -1363,7 +1349,7 @@ function() {

WP_CLI::add_wp_hook(
'nocache_headers',
function( $headers ) {
static function ( $headers ) {
// WordPress might be calling nocache_headers() because of a dead db
global $wpdb;
if ( ! empty( $wpdb->error ) ) {
Expand All @@ -1375,11 +1361,25 @@ function( $headers ) {
}
);

WP_CLI::add_wp_hook(
'setup_theme',
static function () {
// Polyfill is_customize_preview(), as it is needed by TwentyTwenty to
// check for starter content.
if ( ! function_exists( 'is_customize_preview' ) ) {
function is_customize_preview() {
return false;
}
}
},
0
);

// ALTERNATE_WP_CRON might trigger a redirect, which we can't handle
if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
WP_CLI::add_wp_hook(
'muplugins_loaded',
function() {
static function () {
remove_action( 'init', 'wp_cron' );
}
);
Expand All @@ -1398,7 +1398,7 @@ function() {
foreach ( $values as $key => $value ) {
WP_CLI::add_wp_hook(
"pre_site_option_$key",
function () use ( $values, $key ) {
static function () use ( $values, $key ) {
return $values[ $key ];
}
);
Expand All @@ -1411,15 +1411,15 @@ function () use ( $values, $key ) {
// Always permit operations against WordPress, regardless of maintenance mode
WP_CLI::add_wp_hook(
'enable_maintenance_mode',
function() {
static function () {
return false;
}
);

// Use our own debug mode handling instead of WP core
WP_CLI::add_wp_hook(
'enable_wp_debug_mode_checks',
function( $ret ) {
static function ( $ret ) {
Utils\wp_debug_mode();
return false;
}
Expand All @@ -1428,7 +1428,7 @@ function( $ret ) {
// Never load advanced-cache.php drop-in when WP-CLI is operating
WP_CLI::add_wp_hook(
'enable_loading_advanced_cache_dropin',
function() {
static function () {
return false;
}
);
Expand All @@ -1454,7 +1454,7 @@ function() {
&& Utils\wp_version_compare( '4.0', '>=' ) ) {
WP_CLI::add_wp_hook(
'ms_site_not_found',
function() use ( $run_on_site_not_found ) {
static function () use ( $run_on_site_not_found ) {
// esc_sql() isn't yet loaded, but needed.
if ( 'search-replace' === $run_on_site_not_found ) {
require_once ABSPATH . WPINC . '/formatting.php';
Expand All @@ -1469,7 +1469,7 @@ function() use ( $run_on_site_not_found ) {
}
WP_CLI::add_wp_hook(
'ms_site_not_found',
function( $current_site, $domain, $path ) {
static function ( $current_site, $domain, $path ) {
$url = $domain . $path;
$message = $url ? "Site '{$url}' not found." : 'Site not found.';
$has_param = isset( WP_CLI::get_runner()->config['url'] );
Expand Down Expand Up @@ -1497,7 +1497,7 @@ function( $current_site, $domain, $path ) {
// The APC cache is not available on the command-line, so bail, to prevent cache poisoning
WP_CLI::add_wp_hook(
'muplugins_loaded',
function() {
static function () {
if ( $GLOBALS['_wp_using_ext_object_cache'] && class_exists( 'APC_Object_Cache' ) ) {
WP_CLI::warning( 'Running WP-CLI while the APC object cache is activated can result in cache corruption.' );
WP_CLI::confirm( 'Given the consequences, do you wish to continue?' );
Expand All @@ -1511,7 +1511,7 @@ function() {
$config = $this->config;
WP_CLI::add_wp_hook(
'init',
function() use ( $config ) {
static function () use ( $config ) {
if ( isset( $config['user'] ) ) {
$fetcher = new \WP_CLI\Fetchers\User();
$user = $fetcher->get_check( $config['user'] );
Expand All @@ -1527,7 +1527,7 @@ function() use ( $config ) {
// Avoid uncaught exception when using wp_mail() without defined $_SERVER['SERVER_NAME']
WP_CLI::add_wp_hook(
'wp_mail_from',
function( $from_email ) {
static function ( $from_email ) {
if ( 'wordpress@' === $from_email ) {
$sitename = strtolower( Utils\parse_url( site_url(), PHP_URL_HOST ) );
if ( substr( $sitename, 0, 4 ) === 'www.' ) {
Expand All @@ -1542,7 +1542,7 @@ function( $from_email ) {
// Don't apply set_url_scheme in get_site_url()
WP_CLI::add_wp_hook(
'site_url',
function( $url, $path, $scheme, $blog_id ) {
static function ( $url, $path, $scheme, $blog_id ) {
if ( empty( $blog_id ) || ! is_multisite() ) {
$url = get_option( 'siteurl' );
} else {
Expand All @@ -1562,7 +1562,7 @@ function( $url, $path, $scheme, $blog_id ) {
// Set up hook for plugins and themes to conditionally add WP-CLI commands.
WP_CLI::add_wp_hook(
'init',
function () {
static function () {
do_action( 'cli_init' );
}
);
Expand All @@ -1572,7 +1572,7 @@ function () {
* Set up the filters to skip the loaded plugins
*/
private function setup_skip_plugins_filters() {
$wp_cli_filter_active_plugins = function( $plugins ) {
$wp_cli_filter_active_plugins = static function ( $plugins ) {
$skipped_plugins = WP_CLI::get_runner()->config['skip-plugins'];
if ( true === $skipped_plugins ) {
return array();
Expand Down Expand Up @@ -1607,7 +1607,7 @@ private function setup_skip_plugins_filters() {
}
WP_CLI::add_wp_hook(
'plugins_loaded',
function() use ( $hooks, $wp_cli_filter_active_plugins ) {
static function () use ( $hooks, $wp_cli_filter_active_plugins ) {
foreach ( $hooks as $hook ) {
remove_filter( $hook, $wp_cli_filter_active_plugins, 999 );
}
Expand All @@ -1620,7 +1620,7 @@ function() use ( $hooks, $wp_cli_filter_active_plugins ) {
* Set up the filters to skip the loaded theme
*/
public function action_setup_theme_wp_cli_skip_themes() {
$wp_cli_filter_active_theme = function( $value ) {
$wp_cli_filter_active_theme = static function ( $value ) {
$skipped_themes = WP_CLI::get_runner()->config['skip-themes'];
if ( true === $skipped_themes ) {
return '';
Expand Down Expand Up @@ -1653,7 +1653,7 @@ public function action_setup_theme_wp_cli_skip_themes() {
// Clean up after the TEMPLATEPATH and STYLESHEETPATH constants are defined
WP_CLI::add_wp_hook(
'after_setup_theme',
function() use ( $hooks, $wp_cli_filter_active_theme ) {
static function () use ( $hooks, $wp_cli_filter_active_theme ) {
foreach ( $hooks as $hook ) {
remove_filter( $hook, $wp_cli_filter_active_theme, 999 );
}
Expand Down

0 comments on commit 74c949c

Please sign in to comment.