aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/bin
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-08-24 17:45:24 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-08-24 18:07:37 +0200
commitc868582e4412d482853e7975b1cff1965f51ce25 (patch)
treea66541b54aad603c764665aae54fc80b75b62f68 /phpBB/bin
parentf6a4843c6df3a9b0490eb3d273ebed7d04a89582 (diff)
downloadforums-c868582e4412d482853e7975b1cff1965f51ce25.tar
forums-c868582e4412d482853e7975b1cff1965f51ce25.tar.gz
forums-c868582e4412d482853e7975b1cff1965f51ce25.tar.bz2
forums-c868582e4412d482853e7975b1cff1965f51ce25.tar.xz
forums-c868582e4412d482853e7975b1cff1965f51ce25.zip
[ticket/14125] Add --env option to all CLI commands
PHPBB3-14125
Diffstat (limited to 'phpBB/bin')
-rwxr-xr-xphpBB/bin/phpbbcli.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php
index 18657aed0a..e5992f7536 100755
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -46,13 +46,17 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->with_config($phpbb_config_php_file);
-$phpbb_container_builder->without_cache();
-
$input = new ArgvInput();
+if ($input->hasParameterOption(array('--env')))
+{
+ $phpbb_container_builder->with_environment($input->getParameterOption('--env'));
+}
+
if ($input->hasParameterOption(array('--safe-mode')))
{
$phpbb_container_builder->without_extensions();
+ $phpbb_container_builder->without_cache();
}
else
{
@@ -68,6 +72,8 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
$user = $phpbb_container->get('user');
$user->add_lang('acp/common');
$user->add_lang('cli');
+
+/* @var $lang \phpbb\language\language */
$lang = $phpbb_container->get('language');
$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $lang);