Merge pull request #1054 from mrrobot47/remove-unnecessary-flags

Remove unnecessary-flags from help

Author: mrrobot47

php/EE/Bootstrap/IncludePackageAutoloader.php

@@ -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';
 

php/EE/Runner.php

@@ -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
@@ -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'];
 	}
 
 	/**
@@ -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();

php/config-spec.php

@@ -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(),