6 files changed, 46 insertions, 74 deletions
diff --git a/phpBB/config/default/container/services_http.yml b/phpBB/config/default/container/services_http.yml
index 9c2bdd2337..1285fd1d88 100644
--- a/phpBB/config/default/container/services_http.yml
+++ b/phpBB/config/default/container/services_http.yml
@@ -1,4 +1,11 @@
 services:
+    http_kernel:
+        class: Symfony\Component\HttpKernel\HttpKernel
+        arguments:
+            - @dispatcher
+            - @controller.resolver
+            - @request_stack
+
     # WARNING: The Symfony request does not escape the input and should be used very carefully
     #           prefer the phpbb request (service @request) as possible
     symfony_request:
@@ -14,10 +21,3 @@ services:
         arguments:
             - null
             - %core.disable_super_globals%
-
-    http_kernel:
-        class: Symfony\Component\HttpKernel\HttpKernel
-        arguments:
-            - @dispatcher
-            - @controller.resolver
-            - @request_stack
diff --git a/phpBB/includes/compatibility_globals.php b/phpBB/includes/compatibility_globals.php
index cb4087d09b..fadc879640 100644
--- a/phpBB/includes/compatibility_globals.php
+++ b/phpBB/includes/compatibility_globals.php
@@ -1,15 +1,15 @@
 <?php
 /**
- *
- * This file is part of the phpBB Forum Software package.
- *
- * @copyright (c) phpBB Limited <https://www.phpbb.com>
- * @license GNU General Public License, version 2 (GPL-2.0)
- *
- * For full copyright and license information, please see
- * the docs/CREDITS.txt file.
- *
- */
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
 
 /**
  */
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
index 0df1ae71a4..8445d80a41 100644
--- a/phpBB/phpbb/install/controller/helper.php
+++ b/phpBB/phpbb/install/controller/helper.php
@@ -13,6 +13,13 @@
 
 namespace phpbb\install\controller;
 
+use phpbb\install\helper\navigation\navigation_provider;
+use phpbb\language\language;
+use phpbb\language\language_file_helper;
+use phpbb\path_helper;
+use phpbb\routing\router;
+use phpbb\symfony_request;
+use phpbb\template\template;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -68,7 +75,19 @@ class helper
 	 */
 	protected $phpbb_root_path;
 
-	public function __construct(\phpbb\language\language $language, \phpbb\language\language_file_helper $lang_helper, \phpbb\install\helper\navigation\navigation_provider $nav, \phpbb\template\template $template, \phpbb\path_helper $path_helper, \phpbb\symfony_request $request, \phpbb\routing\router $router, $phpbb_root_path)
+	/**
+	 * Constructor
+	 *
+	 * @param language				$language
+	 * @param language_file_helper	$lang_helper
+	 * @param navigation_provider	$nav
+	 * @param template				$template
+	 * @param path_helper			$path_helper
+	 * @param symfony_request		$request
+	 * @param router				$router
+	 * @param string				$phpbb_root_path
+	 */
+	public function __construct(language $language, language_file_helper $lang_helper, navigation_provider $nav, template $template, path_helper $path_helper, symfony_request $request, router $router, $phpbb_root_path)
 	{
 		$this->language = $language;
 		$this->lang_helper = $lang_helper;
diff --git a/phpBB/phpbb/install/exception/installer_exception.php b/phpBB/phpbb/install/exception/installer_exception.php
index c37950d05c..f17dca8f17 100644
--- a/phpBB/phpbb/install/exception/installer_exception.php
+++ b/phpBB/phpbb/install/exception/installer_exception.php
@@ -13,10 +13,12 @@
 
 namespace phpbb\install\exception;
 
+use phpbb\exception\runtime_exception;
+
 /**
  * Installer's base exception
  */
-class installer_exception extends \Exception
+class installer_exception extends runtime_exception
 {
 
 }
diff --git a/phpBB/phpbb/install/exception/invalid_service_name_exception.php b/phpBB/phpbb/install/exception/invalid_service_name_exception.php
index e64cd2026f..dff4873f3c 100644
--- a/phpBB/phpbb/install/exception/invalid_service_name_exception.php
+++ b/phpBB/phpbb/install/exception/invalid_service_name_exception.php
@@ -15,55 +15,5 @@ namespace phpbb\install\exception;
 
 class invalid_service_name_exception extends installer_exception
 {
-	/**
-	 * @var string
-	 */
-	private $params;
 
-	/**
-	 * @var string
-	 */
-	private $error;
-
-	/**
-	 * Constructor
-	 *
-	 * @param string	$error	The name of the missing installer module
-	 * @param array		$params	Additional values for message translation
-	 */
-	public function __construct($error, $params = array())
-	{
-		$this->error = $error;
-		$this->params = $params;
-	}
-
-	/**
-	 * Returns the language entry's name for the error
-	 *
-	 * @return string
-	 */
-	public function get_error()
-	{
-		return $this->error;
-	}
-
-	/**
-	 * Returns parameters for the language entry, if there is any
-	 *
-	 * @return array
-	 */
-	public function get_params()
-	{
-		return $this->params;
-	}
-
-	/**
-	 * Returns true, if there are any parameters set
-	 *
-	 * @return bool
-	 */
-	public function has_params()
-	{
-		return (sizeof($this->params) !== 0);
-	}
 }
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php
index f5da898a00..d64713e6a3 100644
--- a/phpBB/phpbb/install/installer.php
+++ b/phpBB/phpbb/install/installer.php
@@ -229,17 +229,18 @@ class installer
 		}
 		catch (invalid_service_name_exception $e)
 		{
-			if ($e->has_params())
+			$params = $e->get_parameters();
+
+			if (!empty($params))
 			{
-				$msg = $e->get_params();
-				array_unshift($msg, $e->get_error());
+				array_unshift($params, $e->getMessage());
 			}
 			else
 			{
-				$msg = $e->get_error();
+				$params = $e->getMessage();
 			}
 
-			$this->iohandler->add_error_message($msg);
+			$this->iohandler->add_error_message($params);
 			$flush_messages = true;
 		}