From 955b9ede33c5696173a760ea271ec32d79e843b9 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Thu, 11 Feb 2016 13:18:30 +0100
Subject: [ticket/14462] Further speed improvements

- Cache the secondary container
- Only initialize tasks/modules that are being used
- Add timeout error message in the AJAX UI

PHPBB3-14462
---
 phpBB/install/convert/controller/convertor.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convert/controller/convertor.php b/phpBB/install/convert/controller/convertor.php
index a36494c7e6..9b52fdda32 100644
--- a/phpBB/install/convert/controller/convertor.php
+++ b/phpBB/install/convert/controller/convertor.php
@@ -13,6 +13,7 @@
 
 namespace phpbb\convert\controller;
 
+use phpbb\cache\driver\driver_interface;
 use phpbb\exception\http_exception;
 use phpbb\install\controller\helper;
 use phpbb\install\helper\container_factory;
@@ -36,10 +37,15 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
 class convertor
 {
 	/**
-	 * @var \phpbb\cache\driver\driver_interface
+	 * @var driver_interface
 	 */
 	protected $cache;
 
+	/**
+	 * @var driver_interface
+	 */
+	protected $installer_cache;
+
 	/**
 	 * @var \phpbb\config\db
 	 */
@@ -123,6 +129,7 @@ class convertor
 	/**
 	 * Constructor
 	 *
+	 * @param driver_interface		$cache
 	 * @param container_factory		$container
 	 * @param database				$db_helper
 	 * @param helper				$controller_helper
@@ -135,8 +142,9 @@ class convertor
 	 * @param string				$phpbb_root_path
 	 * @param string				$php_ext
 	 */
-	public function __construct(container_factory $container, database $db_helper, helper $controller_helper, install_helper $install_helper, factory $iohandler, language $language, navigation_provider $nav, request_interface $request, template $template, $phpbb_root_path, $php_ext)
+	public function __construct(driver_interface $cache, container_factory $container, database $db_helper, helper $controller_helper, install_helper $install_helper, factory $iohandler, language $language, navigation_provider $nav, request_interface $request, template $template, $phpbb_root_path, $php_ext)
 	{
+		$this->installer_cache		= $cache;
 		$this->controller_helper	= $controller_helper;
 		$this->db_helper			= $db_helper;
 		$this->install_helper		= $install_helper;
@@ -379,6 +387,7 @@ class convertor
 		// If we reached this step (conversion completed) we want to purge the cache and log the user out.
 		// This is for making sure the session get not screwed due to the 3.0.x users table being completely new.
 		$this->cache->purge();
+		$this->installer_cache->purge();
 
 		require_once($this->phpbb_root_path . 'includes/constants.' . $this->php_ext);
 		require_once($this->phpbb_root_path . 'includes/functions_convert.' . $this->php_ext);
-- 
cgit v1.2.1


From 6debd9a1bea4ee69a06eac43cc6b2f856f601604 Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Sun, 14 Feb 2016 19:27:24 +0100
Subject: [ticket/14462] Not show timeout messages in convertors

PHPBB3-14462
---
 phpBB/install/convert/controller/convertor.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/install')

diff --git a/phpBB/install/convert/controller/convertor.php b/phpBB/install/convert/controller/convertor.php
index 9b52fdda32..a40f1d0b52 100644
--- a/phpBB/install/convert/controller/convertor.php
+++ b/phpBB/install/convert/controller/convertor.php
@@ -592,7 +592,7 @@ class convertor
 
 			$url = $this->controller_helper->route('phpbb_convert_convert', array('converter' => $convertor));
 			$this->iohandler->redirect($url);
-			$this->iohandler->send_response();
+			$this->iohandler->send_response(true);
 		}
 		else
 		{
@@ -686,7 +686,7 @@ class convertor
 		if ($this->request->is_ajax())
 		{
 			$this->iohandler->add_user_form_group($form_title, $form_data);
-			$this->iohandler->send_response();
+			$this->iohandler->send_response(true);
 		}
 		else
 		{
@@ -779,7 +779,7 @@ class convertor
 		if ($this->request->is_ajax())
 		{
 			$this->iohandler->add_error_message($msg, $desc);
-			$this->iohandler->send_response();
+			$this->iohandler->send_response(true);
 		}
 		else
 		{
@@ -803,7 +803,7 @@ class convertor
 	public function redirect_to_html($url)
 	{
 		$this->iohandler->redirect($url);
-		$this->iohandler->send_response();
+		$this->iohandler->send_response(true);
 	}
 
 	private function setup_navigation($stage)
-- 
cgit v1.2.1