diff options
| author | Carlo <carlo@phpbbitalia.net> | 2014-07-15 16:07:52 +0200 |
|---|---|---|
| committer | Carlo <carlo@phpbbitalia.net> | 2014-07-15 16:07:52 +0200 |
| commit | 7cffedf5e310e0cde9bfd541ca835a4fedf26ef3 (patch) | |
| tree | 8a858aa91d95e9fa984adde8e09f4cbcf46f9dff | |
| parent | 3eafeeb88d173bc4f2b082ee5f09f85bef931ec9 (diff) | |
| download | forums-7cffedf5e310e0cde9bfd541ca835a4fedf26ef3.tar forums-7cffedf5e310e0cde9bfd541ca835a4fedf26ef3.tar.gz forums-7cffedf5e310e0cde9bfd541ca835a4fedf26ef3.tar.bz2 forums-7cffedf5e310e0cde9bfd541ca835a4fedf26ef3.tar.xz forums-7cffedf5e310e0cde9bfd541ca835a4fedf26ef3.zip | |
[ticket/12685] Override getDefaultInputDefinition()
PHPBB3-12685
| -rwxr-xr-x | phpBB/bin/phpbbcli.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/console/application.php | 26 |
2 files changed, 19 insertions, 9 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php index d181a63f68..baaa22e67b 100755 --- a/phpBB/bin/phpbbcli.php +++ b/phpBB/bin/phpbbcli.php @@ -44,7 +44,7 @@ $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_fil $input = new ArgvInput(); -if ($input->hasParameterOption(array('--safe-mode'))) +if ($input->getParameterOption(array('--safe-mode'))) { $phpbb_container_builder->set_use_extensions(false); $phpbb_container_builder->set_dump_container(false); diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php index b08346b8fa..bc4897af18 100644 --- a/phpBB/phpbb/console/application.php +++ b/phpBB/phpbb/console/application.php @@ -37,9 +37,26 @@ class application extends \Symfony\Component\Console\Application */ public function __construct($name, $version, \phpbb\user $user) { + $this->user = $user; + parent::__construct($name, $version); + } - $this->user = $user; + /** + * {@inheritdoc} + */ + protected function getDefaultInputDefinition() + { + $input_definition = parent::getDefaultInputDefinition(); + + $input_definition->addOption(new InputOption( + 'safe-mode', + null, + InputOption::VALUE_NONE, + $this->user->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE') + )); + + return $input_definition; } /** @@ -66,13 +83,6 @@ class application extends \Symfony\Component\Console\Application $this->user->lang('CLI_DESCRIPTION_OPTION_SHELL') )); - $this->getDefinition()->addOption(new InputOption( - '--safe-mode', - null, - InputOption::VALUE_NONE, - $this->user->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE') - )); - return parent::getHelp(); } |