3 files changed, 15 insertions, 6 deletions
diff --git a/phpBB/phpbb/install/console/command/install/config/show.php b/phpBB/phpbb/install/console/command/install/config/show.php
index 4155440fc3..5d82d8d1ef 100644
--- a/phpBB/phpbb/install/console/command/install/config/show.php
+++ b/phpBB/phpbb/install/console/command/install/config/show.php
@@ -96,7 +96,7 @@ class show extends \phpbb\console\command\command
 
 		if (!is_file($config_file))
 		{
-			$iohandler->add_error_message(array('MISSING_FILE', array($config_file)));
+			$iohandler->add_error_message(array('MISSING_FILE', $config_file));
 
 			return;
 		}
diff --git a/phpBB/phpbb/install/console/command/install/install.php b/phpBB/phpbb/install/console/command/install/install.php
index 81ad1039f6..d76182af92 100644
--- a/phpBB/phpbb/install/console/command/install/install.php
+++ b/phpBB/phpbb/install/console/command/install/install.php
@@ -116,7 +116,7 @@ class install extends \phpbb\console\command\command
 
 		if (!is_file($config_file))
 		{
-			$iohandler->add_error_message(array('MISSING_FILE', array($config_file)));
+			$iohandler->add_error_message(array('MISSING_FILE', $config_file));
 
 			return 1;
 		}
@@ -127,7 +127,7 @@ class install extends \phpbb\console\command\command
 		}
 		catch (ParseException $e)
 		{
-			$iohandler->add_error_message('INVALID_YAML_FILE');
+			$iohandler->add_error_message(array('INVALID_YAML_FILE', $config_file));
 
 			return 1;
 		}
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php
index 77e0a896bc..a41b4cd6a6 100644
--- a/phpBB/phpbb/install/installer.php
+++ b/phpBB/phpbb/install/installer.php
@@ -13,6 +13,7 @@
 
 namespace phpbb\install;
 
+use phpbb\cache\driver\driver_interface;
 use phpbb\di\ordered_service_collection;
 use phpbb\install\exception\installer_config_not_writable_exception;
 use phpbb\install\exception\jump_to_restart_point_exception;
@@ -26,6 +27,11 @@ use phpbb\path_helper;
 class installer
 {
 	/**
+	 * @var driver_interface
+	 */
+	protected $cache;
+
+	/**
 	 * @var config
 	 */
 	protected $install_config;
@@ -55,11 +61,13 @@ class installer
 	/**
 	 * Constructor
 	 *
-	 * @param config		$config			Installer config handler
-	 * @param path_helper	$path_helper	Path helper
+	 * @param driver_interface	$cache			Cache service
+	 * @param config			$config			Installer config handler
+	 * @param path_helper		$path_helper	Path helper
 	 */
-	public function __construct(config $config, path_helper $path_helper)
+	public function __construct(driver_interface $cache, config $config, path_helper $path_helper)
 	{
+		$this->cache				= $cache;
 		$this->install_config		= $config;
 		$this->installer_modules	= null;
 		$this->web_root				= $path_helper->get_web_root_path();
@@ -235,6 +243,7 @@ class installer
 			if ($install_finished || $fail_cleanup)
 			{
 				$this->install_config->clean_up_config_file();
+				$this->cache->purge();
 			}
 			else
 			{