mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3858 from Nicofuma/ticket/14125

Browse Source 
[ticket/14125] Add --env option to all CLI commands
This commit is contained in:
Máté Bartus
2015-08-28 12:00:46 +02:00
parent e8219e8610 c868582e44
commit e91e525e8a
3 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
phpBB/phpbb/console/application.php
View File

@@ -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
}
}
}