mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 20:24:08 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4171 from CHItA/ticket/14462

Browse Source 
[ticket/14462] Try to prevent timeouts in the installer

* CHItA/ticket/14462:
  [ticket/14462] Not show timeout messages in convertors
  [ticket/14462] Make timeout error translateable
  [ticket/14462] Update ordering in install db config
  [ticket/14462] Fix comments
  [ticket/14462] Fix tests
  [ticket/14462] Fix CS and typo
  [ticket/14462] Set instance of db driver for database access using global
  [ticket/14462] Fix installation in tests
  [ticket/14462] Refactor tasks to be more modular
  [ticket/14462] Further speed improvements
This commit is contained in:
Tristan Darricau
2016-02-16 00:06:52 +01:00
parent 00d71d854c 6debd9a1be
commit d0ce6a18df
42 changed files with 1198 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/install/convert/controller/convertor.php
View File

@@ -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);
@@ -583,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
{
@@ -677,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
{
@@ -770,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
{
@@ -794,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)