From 06f4ebce1b1cc8ecd5ddd84f7d2705007a685de3 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Sun, 31 May 2015 17:19:42 +0200
Subject: [ticket/13740] CLI installer and fixes

[ci skip]

PHPBB3-13740
---
 phpBB/phpbb/console/application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/console/application.php')

diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
index bc4897af18..0943e8a4b8 100644
--- a/phpBB/phpbb/console/application.php
+++ b/phpBB/phpbb/console/application.php
@@ -35,7 +35,7 @@ class application extends \Symfony\Component\Console\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, $version, \phpbb\user $user)
+	public function __construct($name, $version, $user)
 	{
 		$this->user = $user;
 
-- 
cgit v1.2.1


From be7e1ba7a0d35a86c4b41ab037e82a3a114108cb Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Fri, 24 Jul 2015 18:05:10 +0200
Subject: [ticket/13740] Use language service in console application

PHPBB3-13740
---
 phpBB/phpbb/console/application.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'phpBB/phpbb/console/application.php')

diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
index 0943e8a4b8..2c69a3cc73 100644
--- a/phpBB/phpbb/console/application.php
+++ b/phpBB/phpbb/console/application.php
@@ -26,18 +26,18 @@ class application extends \Symfony\Component\Console\Application
 	protected $in_shell = false;
 
 	/**
-	* @var \phpbb\user User object
+	* @var \phpbb\language\language User object
 	*/
-	protected $user;
+	protected $language;
 
 	/**
-	* @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)
+	* @param string						$name		The name of the application
+	* @param string						$version	The version of the application
+	* @param \phpbb\language\language	$language	The user which runs the application (used for translation)
 	*/
-	public function __construct($name, $version, $user)
+	public function __construct($name, $version, \phpbb\language\language $language)
 	{
-		$this->user = $user;
+		$this->language = $language;
 
 		parent::__construct($name, $version);
 	}
@@ -53,7 +53,7 @@ class application extends \Symfony\Component\Console\Application
 			'safe-mode',
 			null,
 			InputOption::VALUE_NONE,
-			$this->user->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE')
+			$this->language->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE')
 		));
 
 		return $input_definition;
@@ -80,7 +80,7 @@ class application extends \Symfony\Component\Console\Application
 			'--shell',
 			'-s',
 			InputOption::VALUE_NONE,
-			$this->user->lang('CLI_DESCRIPTION_OPTION_SHELL')
+			$this->language->lang('CLI_DESCRIPTION_OPTION_SHELL')
 		));
 
 		return parent::getHelp();
-- 
cgit v1.2.1


From c868582e4412d482853e7975b1cff1965f51ce25 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Mon, 24 Aug 2015 17:45:24 +0200
Subject: [ticket/14125] Add --env option to all CLI commands

PHPBB3-14125
---
 phpBB/phpbb/console/application.php | 57 +++++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 12 deletions(-)

(limited to 'phpBB/phpbb/console/application.php')

diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
index 2c69a3cc73..dc9b8016b2 100644
--- a/phpBB/phpbb/console/application.php
+++ b/phpBB/phpbb/console/application.php
@@ -13,6 +13,7 @@
 
 namespace phpbb\console;
 
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Shell;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -49,12 +50,7 @@ class application extends \Symfony\Component\Console\Application
 	{
 		$input_definition = parent::getDefaultInputDefinition();
 
-		$input_definition->addOption(new InputOption(
-			'safe-mode',
-			null,
-			InputOption::VALUE_NONE,
-			$this->language->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE')
-		));
+		$this->register_global_options($input_definition);
 
 		return $input_definition;
 	}
@@ -76,12 +72,20 @@ class application extends \Symfony\Component\Console\Application
 			return parent::getHelp();
 		}
 
-		$this->getDefinition()->addOption(new InputOption(
-			'--shell',
-			'-s',
-			InputOption::VALUE_NONE,
-			$this->language->lang('CLI_DESCRIPTION_OPTION_SHELL')
-		));
+		try
+		{
+			$definition = $this->getDefinition();
+			$definition->addOption(new InputOption(
+				'--shell',
+				'-s',
+				InputOption::VALUE_NONE,
+				$this->language->lang('CLI_DESCRIPTION_OPTION_SHELL')
+			));
+		}
+		catch (\LogicException $e)
+		{
+			// Do nothing
+		}
 
 		return parent::getHelp();
 	}
@@ -117,4 +121,33 @@ class application extends \Symfony\Component\Console\Application
 
 		return parent::doRun($input, $output);
 	}
+
+	/**
+	 * Register global options
+	 *
+	 * @param InputDefinition $definition An InputDefinition instance
+	 */
+	protected function register_global_options(InputDefinition $definition)
+	{
+		try
+		{
+			$definition->addOption(new InputOption(
+				'safe-mode',
+				null,
+				InputOption::VALUE_NONE,
+				$this->language->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE')
+			));
+
+			$definition->addOption(new InputOption(
+				'env',
+				'e',
+				InputOption::VALUE_REQUIRED,
+				$this->language->lang('CLI_DESCRIPTION_OPTION_ENV')
+			));
+		}
+		catch (\LogicException $e)
+		{
+			// Do nothing
+		}
+	}
 }
-- 
cgit v1.2.1