Skip to content

Remove unnecessary-flags from help #1054

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
merged 1 commit into from
Jun 11, 2018
Merged

Remove unnecessary-flags from help #1054

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
10 changes: 5 additions & 5 deletions php/EE/Bootstrap/IncludePackageAutoloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ protected function get_autoloader_paths() {
}

$runner = new RunnerInstance();
$skip_packages = $runner()->config['skip-packages'];
if ( true === $skip_packages ) {
\EE::debug( 'Skipped loading packages.', 'bootstrap' );
//$skip_packages = $runner()->config['skip-packages'];
// if ( true === $skip_packages ) {
// \EE::debug( 'Skipped loading packages.', 'bootstrap' );

return false;
}
// return false;
// }

$autoloader_path = $runner()->get_packages_dir_path() . 'vendor/autoload.php';

Expand Down
10 changes: 2 additions & 8 deletions php/EE/Runner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,10 +530,9 @@ public function init_config() {

$configurator->merge_yml( $this->global_config_path, $this->alias );
$config = $configurator->to_array();
$this->_required_files['global'] = $config[0]['require'];
$configurator->merge_yml( $this->project_config_path, $this->alias );
$config = $configurator->to_array();
$this->_required_files['project'] = $config[0]['require'];
//$this->_required_files['project'] = $config[0]['require'];
}

// Runtime config and args
Expand Down Expand Up @@ -593,7 +592,7 @@ public function init_config() {
$this->aliases['@all'] = 'Run command against every registered alias.';
$this->aliases = array_reverse( $this->aliases );
}
$this->_required_files['runtime'] = $this->config['require'];
//$this->_required_files['runtime'] = $this->config['require'];
}

/**
Expand Down Expand Up @@ -736,11 +735,6 @@ public function start() {
$this->_run_command_and_exit();
}

if ( $this->config['ssh'] ) {
$this->run_ssh_command( $this->config['ssh'] );
return;
}

// First try at showing man page.
if ( $this->cmd_starts_with( array( 'help' ) ) ) {
$this->auto_check_update();
Expand Down
29 changes: 0 additions & 29 deletions php/config-spec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,6 @@

return array(

'ssh' => array(
'runtime' => '=[<scheme>:][<user>@]<host|container>[:<port>][<path>]',
'file' => '[<scheme>:][<user>@]<host|container>[:<port>][<path>]',
'desc' => 'Perform operation against a remote server over SSH (or a container using scheme of "docker", "docker-compose", "vagrant").',
),

# Used by wp-cli to control wp site remotely.
# Might be useful in future for controlling ee remotely.
// 'http' => array(
// 'runtime' => '=<http>',
// 'file' => '<http>',
// 'desc' => 'Reserved for future.',
// ),

'skip-packages' => array(
'runtime' => '',
'file' => '<bool>',
'desc' => 'Skip loading all installed packages.',
'default' => false,
),

'require' => array(
'runtime' => '=<path>',
'file' => '<path>',
'desc' => 'Load PHP file before running the command (may be used more than once).',
'multiple' => true,
'default' => array(),
),

'disabled_commands' => array(
'file' => '<list>',
'default' => array(),
Expand Down