3 files changed, 44 insertions, 1 deletions
diff --git a/phpBB/bin/phpbbcli.php b/phpBB/bin/phpbbcli.php
index 63c8f2230b..8b8d8e43fd 100755
--- a/phpBB/bin/phpbbcli.php
+++ b/phpBB/bin/phpbbcli.php
@@ -39,6 +39,9 @@ $phpbb_container = phpbb_create_update_container($phpbb_root_path, $phpEx, "$php
 $phpbb_container->get('request')->enable_super_globals();
 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->run();
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 838a73caed..0b82b447ef 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -226,6 +226,8 @@ $lang = array_merge($lang, array(
 	'CLI_DESCRIPTION_CRON_RUN'				=> 'Runs all ready cron tasks.',
 	'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',
 	'CONFIG_UPDATED'		=> 'Configuration updated successfully.',
 	'CRON_LOCK_ERROR'		=> 'Could not obtain cron lock.',
diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
index da2bfbb49a..00477ee7d7 100644
--- a/phpBB/phpbb/console/application.php
+++ b/phpBB/phpbb/console/application.php
@@ -13,10 +13,33 @@
 
 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;
 
 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')
 	{
 		foreach($container->findTaggedServiceIds($tag) as $id => $void)
@@ -24,4 +47,19 @@ class application extends \Symfony\Component\Console\Application
 			$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);
+	}
 }