From 65d6e338a99baa2f100d6bd4dea5cd76ac146ac3 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 24 Feb 2016 15:05:01 +0100
Subject: [ticket/14492] Allow specifying extensions to update & install

PHPBB3-14492
---
 .../phpbb/install/console/command/install/install.php  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'phpBB/phpbb/install/console/command')

diff --git a/phpBB/phpbb/install/console/command/install/install.php b/phpBB/phpbb/install/console/command/install/install.php
index de3a2e2d61..3378f5fdac 100644
--- a/phpBB/phpbb/install/console/command/install/install.php
+++ b/phpBB/phpbb/install/console/command/install/install.php
@@ -80,6 +80,10 @@ class install extends \phpbb\console\command\command
 				'config-file',
 				InputArgument::REQUIRED,
 				$this->language->lang('CLI_CONFIG_FILE'))
+			->addArgument(
+				'install-extensions',
+				InputArgument::OPTIONAL,
+				$this->language->lang('CLI_INSTALL_EXTENSIONS'))
 			->setDescription($this->language->lang('CLI_INSTALL_BOARD'))
 		;
 	}
@@ -147,6 +151,7 @@ class install extends \phpbb\console\command\command
 		}
 
 		$this->register_configuration($iohandler, $config);
+		$this->register_install_extensions($iohandler, $input);
 
 		try
 		{
@@ -204,4 +209,17 @@ class install extends \phpbb\console\command\command
 		$iohandler->set_input('script_path', $config['server']['script_path']);
 		$iohandler->set_input('submit_server', 'submit');
 	}
+
+	/**
+	 * Register extensions to install during installation
+	 *
+	 * @param cli_iohandler $iohandler
+	 * @param InputInterface $input
+	 */
+	private function register_install_extensions(cli_iohandler $iohandler, InputInterface $input)
+	{
+		$install_extensions = $input->getArgument('install-extensions');
+		$install_extensions = !empty($install_extensions) ? explode(',', $install_extensions) : array();
+		$iohandler->set_input('install-extensions', $install_extensions);
+	}
 }
-- 
cgit v1.2.1


From ffe900c72d358ba0337c607f2ed76f893715f686 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 2 Mar 2016 11:53:20 +0100
Subject: [ticket/14492] Define extensions to install in config not via cli
 argument

PHPBB3-14492
---
 .../phpbb/install/console/command/install/install.php | 19 ++-----------------
 phpBB/phpbb/install/console/command/update/update.php |  3 +++
 2 files changed, 5 insertions(+), 17 deletions(-)

(limited to 'phpBB/phpbb/install/console/command')

diff --git a/phpBB/phpbb/install/console/command/install/install.php b/phpBB/phpbb/install/console/command/install/install.php
index 3378f5fdac..52a348fe44 100644
--- a/phpBB/phpbb/install/console/command/install/install.php
+++ b/phpBB/phpbb/install/console/command/install/install.php
@@ -80,10 +80,6 @@ class install extends \phpbb\console\command\command
 				'config-file',
 				InputArgument::REQUIRED,
 				$this->language->lang('CLI_CONFIG_FILE'))
-			->addArgument(
-				'install-extensions',
-				InputArgument::OPTIONAL,
-				$this->language->lang('CLI_INSTALL_EXTENSIONS'))
 			->setDescription($this->language->lang('CLI_INSTALL_BOARD'))
 		;
 	}
@@ -151,11 +147,11 @@ class install extends \phpbb\console\command\command
 		}
 
 		$this->register_configuration($iohandler, $config);
-		$this->register_install_extensions($iohandler, $input);
 
 		try
 		{
 			$this->installer->run();
+			return 0;
 		}
 		catch (installer_exception $e)
 		{
@@ -208,18 +204,7 @@ class install extends \phpbb\console\command\command
 		$iohandler->set_input('server_port', $config['server']['server_port']);
 		$iohandler->set_input('script_path', $config['server']['script_path']);
 		$iohandler->set_input('submit_server', 'submit');
-	}
 
-	/**
-	 * Register extensions to install during installation
-	 *
-	 * @param cli_iohandler $iohandler
-	 * @param InputInterface $input
-	 */
-	private function register_install_extensions(cli_iohandler $iohandler, InputInterface $input)
-	{
-		$install_extensions = $input->getArgument('install-extensions');
-		$install_extensions = !empty($install_extensions) ? explode(',', $install_extensions) : array();
-		$iohandler->set_input('install-extensions', $install_extensions);
+		$iohandler->set_input('install-extensions', $config['extensions']);
 	}
 }
diff --git a/phpBB/phpbb/install/console/command/update/update.php b/phpBB/phpbb/install/console/command/update/update.php
index 116f42f758..e827761d1c 100644
--- a/phpBB/phpbb/install/console/command/update/update.php
+++ b/phpBB/phpbb/install/console/command/update/update.php
@@ -151,6 +151,7 @@ class update extends \phpbb\console\command\command
 		try
 		{
 			$this->installer->run();
+			return 0;
 		}
 		catch (installer_exception $e)
 		{
@@ -175,5 +176,7 @@ class update extends \phpbb\console\command\command
 		$iohandler->set_input('submit_update_file', 'submit');
 
 		$iohandler->set_input('submit_continue_file_update', 'submit');
+
+		$iohandler->set_input('update-extensions', $config['extensions']);
 	}
 }
-- 
cgit v1.2.1