diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2016-02-28 00:19:24 +0100 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2016-02-28 14:05:07 +0100 |
| commit | 062358f8b1d9a7fa3d9be97f6b58e06fea7ca844 (patch) | |
| tree | 88c0da83c6a25eda15c9fd70af5dc23ae3ddb77a /phpBB/config/installer | |
| parent | 30db51a86e009f50920f8c0c6c05da26e2b10a56 (diff) | |
| download | forums-062358f8b1d9a7fa3d9be97f6b58e06fea7ca844.tar forums-062358f8b1d9a7fa3d9be97f6b58e06fea7ca844.tar.gz forums-062358f8b1d9a7fa3d9be97f6b58e06fea7ca844.tar.bz2 forums-062358f8b1d9a7fa3d9be97f6b58e06fea7ca844.tar.xz forums-062358f8b1d9a7fa3d9be97f6b58e06fea7ca844.zip | |
[ticket/14487] Try to handle connection timeouts
PHPBB3-14487
Diffstat (limited to 'phpBB/config/installer')
4 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/config/installer/container/services_install_controller.yml b/phpBB/config/installer/container/services_install_controller.yml index 394eb95c06..5aaba0f47f 100644 --- a/phpBB/config/installer/container/services_install_controller.yml +++ b/phpBB/config/installer/container/services_install_controller.yml @@ -65,3 +65,9 @@ services: - '@template' - '%core.root_path%' - '%core.php_ext%' + + phpbb.installer.controller.status: + class: phpbb\install\controller\timeout_check + arguments: + - '@phpbb.installer.controller.helper' + - '%core.root_path%' diff --git a/phpBB/config/installer/container/services_install_finish.yml b/phpBB/config/installer/container/services_install_finish.yml index f144cc6317..8b06ad7d97 100644 --- a/phpBB/config/installer/container/services_install_finish.yml +++ b/phpBB/config/installer/container/services_install_finish.yml @@ -26,7 +26,7 @@ services: - { name: service_collection, tag: install_finish, class_name_aware: true } installer.module.finish_install: - class: phpbb\install\module\install_filesystem\module + class: phpbb\install\module\install_finish\module parent: installer.module_base arguments: - '@installer.module.install_finish_collection' diff --git a/phpBB/config/installer/container/services_installer.yml b/phpBB/config/installer/container/services_installer.yml index 19b1b4f08e..57181b21d4 100644 --- a/phpBB/config/installer/container/services_installer.yml +++ b/phpBB/config/installer/container/services_installer.yml @@ -47,6 +47,7 @@ services: - '@request' - '@template' - '@router' + - '%core.root_path%' installer.helper.iohandler_cli: class: phpbb\install\helper\iohandler\cli_iohandler diff --git a/phpBB/config/installer/routing/installer.yml b/phpBB/config/installer/routing/installer.yml index 1961ba8ed6..47e16aa454 100644 --- a/phpBB/config/installer/routing/installer.yml +++ b/phpBB/config/installer/routing/installer.yml @@ -60,3 +60,8 @@ phpbb_convert_finish: path: /convert/finished defaults: _controller: phpbb.installer.controller.convert:finish + +phpbb_installer_status: + path: /installer/status + defaults: + _controller: phpbb.installer.controller.status:status |