aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-07-17 16:03:55 +0200
committerTristan Darricau <github@nicofuma.fr>2014-07-17 16:03:55 +0200
commit42477861a45935b10285a1434f4ffaf5b199c5c2 (patch)
tree800c39bba49eba389c25760deb73069c7f57d36b
parent0d2a4780769e0e8d7b47c3a954c6dcecddcce581 (diff)
parent7f4d4250066eadb6badd43c4ce1b8f2f84e083cf (diff)
downloadforums-42477861a45935b10285a1434f4ffaf5b199c5c2.tar
forums-42477861a45935b10285a1434f4ffaf5b199c5c2.tar.gz
forums-42477861a45935b10285a1434f4ffaf5b199c5c2.tar.bz2
forums-42477861a45935b10285a1434f4ffaf5b199c5c2.tar.xz
forums-42477861a45935b10285a1434f4ffaf5b199c5c2.zip
Merge pull request #2576 from carlo94it/ticket/12685
[ticket/12685] New CLI container for load extensions * carlo94it/ticket/12685: [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
Diffstat
-rwxr-xr-xphpBB/bin/phpbbcli.php24
-rw-r--r--phpBB/config/console.yml7
-rw-r--r--phpBB/language/en/acp/common.php1
-rw-r--r--phpBB/phpbb/console/application.php29
4 files changed, 48 insertions, 13 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php
index c8098094a2..89bad94184 100755
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -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);
diff --git a/phpBB/config/console.yml b/phpBB/config/console.yml
index 00b8f9cec0..06ea0e317f 100644
--- a/phpBB/config/console.yml
+++ b/phpBB/config/console.yml
@@ -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:
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 61c718195e..0c3df5862e 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -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.',
diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
index b1f0635913..bc4897af18 100644
--- a/phpBB/phpbb/console/application.php
+++ b/phpBB/phpbb/console/application.php
@@ -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)
{
+ $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;
}
/**
@@ -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);
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-28 08:07:22 +0000