diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-01 21:52:05 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-01 21:52:05 +0100 |
| commit | a38a6ec7f551ca0c5c81969520ad6390e69b0a60 (patch) | |
| tree | 94771f90ca2949327f5a4fab22b57cf17f953069 /phpBB/config/installer | |
| parent | b80cb8e796a107a49b77b0efe9d43ee7ef550655 (diff) | |
| parent | b1a136e7bd8cc06ee320655a4ee7cf72dcd7c611 (diff) | |
| download | forums-a38a6ec7f551ca0c5c81969520ad6390e69b0a60.tar forums-a38a6ec7f551ca0c5c81969520ad6390e69b0a60.tar.gz forums-a38a6ec7f551ca0c5c81969520ad6390e69b0a60.tar.bz2 forums-a38a6ec7f551ca0c5c81969520ad6390e69b0a60.tar.xz forums-a38a6ec7f551ca0c5c81969520ad6390e69b0a60.zip | |
Merge pull request #4196 from CHItA/ticket/14487
[ticket/14487] Try to handle connection timeouts
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 |