diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2015-08-28 12:00:46 +0200 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2015-08-28 12:00:46 +0200 |
| commit | e91e525e8a81f3bd7a90bbb7b94a351f950003d8 (patch) | |
| tree | 5a10c7f943cae593a53fb67d1ba0f9761a372c02 /phpBB/phpbb | |
| parent | e8219e8610d37dc6fe3c15a5f9c4ab2664335ed7 (diff) | |
| parent | c868582e4412d482853e7975b1cff1965f51ce25 (diff) | |
| download | forums-e91e525e8a81f3bd7a90bbb7b94a351f950003d8.tar forums-e91e525e8a81f3bd7a90bbb7b94a351f950003d8.tar.gz forums-e91e525e8a81f3bd7a90bbb7b94a351f950003d8.tar.bz2 forums-e91e525e8a81f3bd7a90bbb7b94a351f950003d8.tar.xz forums-e91e525e8a81f3bd7a90bbb7b94a351f950003d8.zip | |
Merge pull request #3858 from Nicofuma/ticket/14125
[ticket/14125] Add --env option to all CLI commands
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/console/application.php | 57 |
1 files changed, 45 insertions, 12 deletions
diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php index 2c69a3cc73..dc9b8016b2 100644 --- a/phpBB/phpbb/console/application.php +++ b/phpBB/phpbb/console/application.php @@ -13,6 +13,7 @@ namespace phpbb\console; +use Symfony\Component\Console\Input\InputDefinition; use Symfony\Component\Console\Shell; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -49,12 +50,7 @@ class application extends \Symfony\Component\Console\Application { $input_definition = parent::getDefaultInputDefinition(); - $input_definition->addOption(new InputOption( - 'safe-mode', - null, - InputOption::VALUE_NONE, - $this->language->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE') - )); + $this->register_global_options($input_definition); return $input_definition; } @@ -76,12 +72,20 @@ class application extends \Symfony\Component\Console\Application return parent::getHelp(); } - $this->getDefinition()->addOption(new InputOption( - '--shell', - '-s', - InputOption::VALUE_NONE, - $this->language->lang('CLI_DESCRIPTION_OPTION_SHELL') - )); + try + { + $definition = $this->getDefinition(); + $definition->addOption(new InputOption( + '--shell', + '-s', + InputOption::VALUE_NONE, + $this->language->lang('CLI_DESCRIPTION_OPTION_SHELL') + )); + } + catch (\LogicException $e) + { + // Do nothing + } return parent::getHelp(); } @@ -117,4 +121,33 @@ class application extends \Symfony\Component\Console\Application return parent::doRun($input, $output); } + + /** + * Register global options + * + * @param InputDefinition $definition An InputDefinition instance + */ + protected function register_global_options(InputDefinition $definition) + { + try + { + $definition->addOption(new InputOption( + 'safe-mode', + null, + InputOption::VALUE_NONE, + $this->language->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE') + )); + + $definition->addOption(new InputOption( + 'env', + 'e', + InputOption::VALUE_REQUIRED, + $this->language->lang('CLI_DESCRIPTION_OPTION_ENV') + )); + } + catch (\LogicException $e) + { + // Do nothing + } + } } |