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

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12685] Setup class loader for extensions only if not in safe mode
  [ticket/12685] Replace getParameterOption with hasParameterOption
  [ticket/12685] Do not dump container
  [ticket/12685] Override getDefaultInputDefinition()
  [ticket/12685] Removed unused USE statement
  [ticket/12685] Inject console.command_collection instead of the container
  [ticket/12685] Add a new line
  [ticket/12685] Container is dumped by default
  [ticket/12685] Removed spaces
  [ticket/12685] Add --safe-mode
  [ticket/12685] We need extensions enabled
  [ticket/12685] Add space after foreach
  [ticket/12685] Add console collection and fixing CLI
This commit is contained in:
Tristan Darricau 2014-07-17 16:07:42 +02:00
commit d6d02188ad
4 changed files with 49 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/bin/phpbbcli.php
View file

@ -12,6 +12,8 @@
*
*/
use Symfony\Component\Console\Input\ArgvInput;
if (php_sapi_name() != 'cli')
{
echo 'This program must be run from the command line.' . PHP_EOL;
@ -35,13 +37,23 @@ require($phpbb_root_path . 'includes/functions.' . $phpEx);
require($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
$phpbb_class_loader_ext->register();
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_use_extensions(false);
$phpbb_container_builder->set_dump_container(false);
$input = new ArgvInput();
if ($input->hasParameterOption(array('--safe-mode')))
{
$phpbb_container_builder->set_use_extensions(false);
$phpbb_container_builder->set_dump_container(false);
}
else
{
$phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx);
$phpbb_class_loader_ext->register();
phpbb_load_extensions_autoloaders($phpbb_root_path);
}
$phpbb_container = $phpbb_container_builder->get_container();
$phpbb_container->get('request')->enable_super_globals();
require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
@ -50,5 +62,5 @@ $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->run();
$application->register_container_commands($phpbb_container->get('console.command_collection'));
$application->run($input);

7
phpBB/config/console.yml
View file

@ -1,4 +1,11 @@
services:
console.command_collection:
class: phpbb\di\service_collection
arguments:
- @service_container
tags:
- { name: service_collection, tag: console.command }
console.command.cache.purge:
class: phpbb\console\command\cache\purge
arguments:

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

@ -230,6 +230,7 @@ $lang = array_merge($lang, array(
'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run',
'CLI_DESCRIPTION_OPTION_SHELL' => 'Launch the shell.',
'CLI_DESCRIPTION_OPTION_SAFE_MODE' => 'Run in Safe Mode (without extensions).',
'COLOUR_SWATCH' => 'Web-safe colour swatch',
'CONFIG_UPDATED' => 'Configuration updated successfully.',

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

@ -17,7 +17,6 @@ use Symfony\Component\Console\Shell;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\DependencyInjection\TaggedContainerInterface;
class application extends \Symfony\Component\Console\Application
{
@ -38,9 +37,26 @@ class application extends \Symfony\Component\Console\Application
*/
public function __construct($name, $version, \phpbb\user $user)
{
parent::__construct($name, $version);
$this->user = $user;
parent::__construct($name, $version);
}
/**
* {@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;
}
/**
@ -73,14 +89,13 @@ class application extends \Symfony\Component\Console\Application
/**
* Register a set of commands from the container
*
* @param TaggedContainerInterface $container The container
* @param string $tag The tag used to register the commands
* @param \phpbb\di\service_collection $command_collection The console service collection
*/
public function register_container_commands(TaggedContainerInterface $container, $tag = 'console.command')
public function register_container_commands(\phpbb\di\service_collection $command_collection)
{
foreach($container->findTaggedServiceIds($tag) as $id => $void)
foreach ($command_collection as $service_command)
{
$this->add($container->get($id));
$this->add($service_command);
}
}