Skip to content

Fix --skip-themes for themes with block patterns #5737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielbachhuber merged 4 commits into from
Feb 8, 2023
Merged

Fix --skip-themes for themes with block patterns #5737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4353dcb
Fix `--skip-themes` for themes with block patterns
danielbachhuber Feb 8, 2023
e1a9bc9
Abstract further to allow for future additions
danielbachhuber Feb 8, 2023
20c5b84
Support for multiple callbacks on the same action
danielbachhuber Feb 8, 2023
dc25ace
Only run when `--skip-themes` is provided
danielbachhuber Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions features/skip-themes.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,38 @@ Feature: Skipping themes
false
"""
And STDERR should be empty

@require-wp-6.1
Scenario: Skip a theme using block patterns
Given a WP installation
And I run `wp theme install blockline --activate`

When I run `wp eval 'var_dump( function_exists( "blockline_support" ) );'`
Then STDOUT should be:
"""
bool(true)
"""

When I run `wp --skip-themes=blockline eval 'var_dump( function_exists( "blockline_support" ) );'`
Then STDOUT should be:
"""
bool(false)
"""

@require-wp-6.1
Scenario: Skip a theme using block patterns with Gutenberg active
Given a WP installation
And I run `wp plugin install gutenberg --activate`
And I run `wp theme install blockline --activate`

When I run `wp eval 'var_dump( function_exists( "blockline_support" ) );'`
Then STDOUT should be:
"""
bool(true)
"""

When I run `wp --skip-themes=blockline eval 'var_dump( function_exists( "blockline_support" ) );'`
Then STDOUT should be:
"""
bool(false)
"""
13 changes: 13 additions & 0 deletions php/WP_CLI/Runner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,6 +1778,19 @@ public function action_setup_theme_wp_cli_skip_themes() {
foreach ( $hooks as $hook ) {
add_filter( $hook, $wp_cli_filter_active_theme, 999 );
}

// Remove theme-related actions not directly tied into the theme lifecycle.
if ( WP_CLI::get_runner()->config['skip-themes'] ) {
$theme_related_actions = [
[ 'init', '_register_theme_block_patterns' ], // Block patterns registration in WP Core.
[ 'init', 'gutenberg_register_theme_block_patterns' ], // Block patterns registration in the GB plugin.
];
foreach ( $theme_related_actions as $action ) {
list( $hook, $callback ) = $action;
remove_action( $hook, $callback );
}
}

// Clean up after the TEMPLATEPATH and STYLESHEETPATH constants are defined
WP_CLI::add_wp_hook(
'after_setup_theme',
Expand Down