Skip to content

Introduce CompositeCommand->remove_subcommand() #2629

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 1 commit into from
Apr 6, 2016
Merged

Introduce CompositeCommand->remove_subcommand() #2629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions features/command.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,3 +490,24 @@ Feature: WP-CLI Commands
shop: cha cha cha
burrito:
"""

Scenario: Removing a subcommand should remove it from the index
Given an empty directory
And a remove-comment.php file:
"""
<?php
$command = WP_CLI::get_root_command();
$command->remove_subcommand( 'comment' );
"""

When I run `wp`
Then STDOUT should contain:
"""
Manage comments.
"""

When I run `wp --require=remove-comment.php`
Then STDOUT should not contain:
"""
Manage comments.
"""
13 changes: 13 additions & 0 deletions php/WP_CLI/Dispatcher/CompositeCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,19 @@ public function add_subcommand( $name, $command ) {
$this->subcommands[ $name ] = $command;
}

/**
* Remove a named subcommand from this composite command's set of contained
* subcommands
*
* @param string $name Represents how subcommand should be invoked
*/
public function remove_subcommand( $name ) {
if ( isset( $this->subcommands[ $name ] ) ) {
unset( $this->subcommands[ $name ] );
}
}


/**
* Composite commands always contain subcommands.
*
Expand Down
2 changes: 0 additions & 2 deletions php/WP_CLI/Dispatcher/RootCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ public function find_subcommand( &$args ) {
* @return array
*/
public function get_subcommands() {
Utils\load_all_commands();

return parent::get_subcommands();
}
}
Expand Down
2 changes: 1 addition & 1 deletion php/WP_CLI/Runner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ public function start() {

// Load bundled commands early, so that they're forced to use the same
// APIs as non-bundled commands.
Utils\load_command( $this->arguments[0] );
Utils\load_all_commands();

$skip_packages = \WP_CLI::get_runner()->config['skip-packages'];
if ( true === $skip_packages ) {
Expand Down