[ticket/14492] Define extensions to install in config not via cli argument

marc1706 · marc1706 · commit ffe900c72d35 · 2016-12-03T14:23:34.000+01:00
PHPBB3-14492
diff --git a/phpBB/docs/install-config.sample.yml b/phpBB/docs/install-config.sample.yml
@@ -34,3 +34,5 @@ installer:
         server_name: localhost
         server_port: 80
         script_path: /
+
+    extensions: ['phpbb/viglink']
diff --git a/phpBB/docs/update-config.sample.yml b/phpBB/docs/update-config.sample.yml
@@ -1,2 +1,3 @@
 updater:
     type: all
+    extensions: ['phpbb/viglink']
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
@@ -330,7 +330,6 @@
 $lang = array_merge($lang, array(
 	'CLI_INSTALL_BOARD'				=> 'Install phpBB',
 	'CLI_UPDATE_BOARD'				=> 'Update phpBB',
-	'CLI_INSTALL_EXTENSIONS'		=> 'Extensions to install. Multiple extensions can be specified using a comma separated list.',
 	'CLI_INSTALL_SHOW_CONFIG'		=> 'Show the configuration which will be used',
 	'CLI_INSTALL_VALIDATE_CONFIG'	=> 'Validate a configuration file',
 	'CLI_CONFIG_FILE'				=> 'Config file to use',
diff --git a/phpBB/phpbb/install/console/command/install/install.php b/phpBB/phpbb/install/console/command/install/install.php
@@ -80,10 +80,6 @@ protected function configure()
 				'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 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		}
 
 		$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 @@ private function register_configuration(cli_iohandler $iohandler, $config)
 		$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
@@ -151,6 +151,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		try
 		{
 			$this->installer->run();
+			return 0;
 		}
 		catch (installer_exception $e)
 		{
@@ -175,5 +176,7 @@ private function register_configuration(cli_iohandler $iohandler, $config)
 		$iohandler->set_input('submit_update_file', 'submit');
 
 		$iohandler->set_input('submit_continue_file_update', 'submit');
+
+		$iohandler->set_input('update-extensions', $config['extensions']);
 	}
 }
diff --git a/phpBB/phpbb/install/installer_configuration.php b/phpBB/phpbb/install/installer_configuration.php
@@ -136,6 +136,10 @@ public function getConfigTreeBuilder()
 							 ->end()
 					->end()
 				->end()
+				->arrayNode('extensions')
+					->prototype('scalar')->end()
+					->defaultValue([])
+				->end()
 			->end()
 		;
 		return $treeBuilder;
diff --git a/phpBB/phpbb/install/updater_configuration.php b/phpBB/phpbb/install/updater_configuration.php
@@ -32,6 +32,10 @@ public function getConfigTreeBuilder()
 			->addDefaultsIfNotSet()
 			->children()
 				->enumNode('type')->values(['all','db_only'])->defaultValue('all')->end()
+				->arrayNode('extensions')
+					->prototype('scalar')->end()
+					->defaultValue([])
+				->end()
 			->end()
 		;
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`updater:`
`2`	`2`	`type: all`
	`3`	`+ extensions: ['phpbb/viglink']`
Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,6 @@ protected function configure()`
`80`	`80`	`'config-file',`
`81`	`81`	`InputArgument::REQUIRED,`
`82`	`82`	`$this->language->lang('CLI_CONFIG_FILE'))`
`83`		`- ->addArgument(`
`84`		`- 'install-extensions',`
`85`		`- InputArgument::OPTIONAL,`
`86`		`- $this->language->lang('CLI_INSTALL_EXTENSIONS'))`
`87`	`83`	`->setDescription($this->language->lang('CLI_INSTALL_BOARD'))`
`88`	`84`	`;`
`89`	`85`	`}`
`@@ -151,11 +147,11 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`151`	`147`	`}`
`152`	`148`
`153`	`149`	`$this->register_configuration($iohandler, $config);`
`154`		`- $this->register_install_extensions($iohandler, $input);`
`155`	`150`
`156`	`151`	`try`
`157`	`152`	`{`
`158`	`153`	`$this->installer->run();`
	`154`	`+ return 0;`
`159`	`155`	`}`
`160`	`156`	`catch (installer_exception $e)`
`161`	`157`	`{`
`@@ -208,18 +204,7 @@ private function register_configuration(cli_iohandler $iohandler, $config)`
`208`	`204`	`$iohandler->set_input('server_port', $config['server']['server_port']);`
`209`	`205`	`$iohandler->set_input('script_path', $config['server']['script_path']);`
`210`	`206`	`$iohandler->set_input('submit_server', 'submit');`
`211`		`- }`
`212`	`207`
`213`		`- /**`
`214`		`- * Register extensions to install during installation`
`215`		`- *`
`216`		`- * @param cli_iohandler $iohandler`
`217`		`- * @param InputInterface $input`
`218`		`- */`
`219`		`- private function register_install_extensions(cli_iohandler $iohandler, InputInterface $input)`
`220`		`- {`
`221`		`- $install_extensions = $input->getArgument('install-extensions');`
`222`		`- $install_extensions = !empty($install_extensions) ? explode(',', $install_extensions) : array();`
`223`		`- $iohandler->set_input('install-extensions', $install_extensions);`
	`208`	`+ $iohandler->set_input('install-extensions', $config['extensions']);`
`224`	`209`	`}`
`225`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`151`	`151`	`try`
`152`	`152`	`{`
`153`	`153`	`$this->installer->run();`
	`154`	`+ return 0;`
`154`	`155`	`}`
`155`	`156`	`catch (installer_exception $e)`
`156`	`157`	`{`
`@@ -175,5 +176,7 @@ private function register_configuration(cli_iohandler $iohandler, $config)`
`175`	`176`	`$iohandler->set_input('submit_update_file', 'submit');`
`176`	`177`
`177`	`178`	`$iohandler->set_input('submit_continue_file_update', 'submit');`
	`179`	`+`
	`180`	`+ $iohandler->set_input('update-extensions', $config['extensions']);`
`178`	`181`	`}`
`179`	`182`	`}`