makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12655] Run the shell when --shell is used

Browse source 
PHPBB3-12655
This commit is contained in:
Tristan Darricau 2014-06-04 14:26:40 +02:00
parent 8ba083f886
commit 5efd55a348
3 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/bin/phpbbcli.php
View file

@ -39,6 +39,9 @@ $phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, "$php
$phpbb_container->get('request')->enable_super_globals(); $phpbb_container->get('request')->enable_super_globals();
require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx); require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION); $user = $phpbb_container->get('user');
$user->add_lang('acp/common');
$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $user);
$application->register_container_commands($phpbb_container); $application->register_container_commands($phpbb_container);
$application->run(); $application->run();

2
phpBB/language/en/acp/common.php
View file

@ -226,6 +226,8 @@ $lang = array_merge($lang, array(
'CLI_DESCRIPTION_CRON_RUN' => 'Runs all ready cron tasks.', 'CLI_DESCRIPTION_CRON_RUN' => 'Runs all ready cron tasks.',
'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run', 'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run',
'CLI_DESCRIPTION_OPTION_SHELL' => 'Launch the shell.',
'COLOUR_SWATCH' => 'Web-safe colour swatch', 'COLOUR_SWATCH' => 'Web-safe colour swatch',
'CONFIG_UPDATED' => 'Configuration updated successfully.', 'CONFIG_UPDATED' => 'Configuration updated successfully.',
'CRON_LOCK_ERROR' => 'Could not obtain cron lock.', 'CRON_LOCK_ERROR' => 'Could not obtain cron lock.',

38
phpBB/phpbb/console/application.php
View file

@ -13,10 +13,33 @@
namespace phpbb\console; namespace phpbb\console;
use Symfony\Component\Console\Shell;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\DependencyInjection\TaggedContainerInterface; use Symfony\Component\DependencyInjection\TaggedContainerInterface;
class application extends \Symfony\Component\Console\Application class application extends \Symfony\Component\Console\Application
{ {
/**
* @param string $name The name of the application
* @param string $version The version of the application
* @param \phpbb\user $user The user which runs the application (used for translation)
*/
public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN', \phpbb\user $user)
{
parent::__construct($name, $version);
$this->getDefinition()->addOption(new InputOption('--shell', '-s', InputOption::VALUE_NONE, $user->lang('CLI_DESCRIPTION_OPTION_SHELL')));
}
/**
* Register a set of commands from the container
*
* @param TaggedContainerInterface $container The container
* @param string $tag The tag used to register the commands
*/
function register_container_commands(TaggedContainerInterface $container, $tag = 'console.command') function register_container_commands(TaggedContainerInterface $container, $tag = 'console.command')
{ {
foreach($container->findTaggedServiceIds($tag) as $id => $void) foreach($container->findTaggedServiceIds($tag) as $id => $void)
@ -24,4 +47,19 @@ class application extends \Symfony\Component\Console\Application
$this->add($container->get($id)); $this->add($container->get($id));
} }
} }
/**
* {@inheritdoc}
*/
public function doRun(InputInterface $input, OutputInterface $output)
{
if ($input->hasParameterOption(array('--shell', '-s')) === true) {
$shell = new Shell($this);
$shell->run();
return 0;
}
parent::doRun($input, $output);
}
} }