diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-16 00:06:52 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-02-16 00:06:52 +0100 |
| commit | d0ce6a18df2172a6e9baf1f1c2802efb30b25323 (patch) | |
| tree | 478bf6c878bacec7c4e60832e0af7d106bd52e52 /phpBB/config | |
| parent | 00d71d854cb844cba7755a2e8adfa4217dbc0ef0 (diff) | |
| parent | 6debd9a1bea4ee69a06eac43cc6b2f856f601604 (diff) | |
| download | forums-d0ce6a18df2172a6e9baf1f1c2802efb30b25323.tar forums-d0ce6a18df2172a6e9baf1f1c2802efb30b25323.tar.gz forums-d0ce6a18df2172a6e9baf1f1c2802efb30b25323.tar.bz2 forums-d0ce6a18df2172a6e9baf1f1c2802efb30b25323.tar.xz forums-d0ce6a18df2172a6e9baf1f1c2802efb30b25323.zip | |
Merge pull request #4171 from CHItA/ticket/14462
[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
Diffstat (limited to 'phpBB/config')
5 files changed, 31 insertions, 5 deletions
diff --git a/phpBB/config/installer/container/services_install_controller.yml b/phpBB/config/installer/container/services_install_controller.yml index 5688c61db9..394eb95c06 100644 --- a/phpBB/config/installer/container/services_install_controller.yml +++ b/phpBB/config/installer/container/services_install_controller.yml @@ -53,6 +53,7 @@ services: phpbb.installer.controller.convert: class: phpbb\convert\controller\convertor arguments: + - '@cache.driver' - '@installer.helper.container_factory' - '@installer.helper.database' - '@phpbb.installer.controller.helper' diff --git a/phpBB/config/installer/container/services_install_data.yml b/phpBB/config/installer/container/services_install_data.yml index d119ba6ebb..df63d16d0d 100644 --- a/phpBB/config/installer/container/services_install_data.yml +++ b/phpBB/config/installer/container/services_install_data.yml @@ -23,6 +23,7 @@ services: installer.install_data.add_modules: class: phpbb\install\module\install_data\task\add_modules arguments: + - '@installer.helper.config' - '@installer.helper.iohandler' - '@installer.helper.container_factory' tags: diff --git a/phpBB/config/installer/container/services_install_database.yml b/phpBB/config/installer/container/services_install_database.yml index 8324cd6086..33f596506d 100644 --- a/phpBB/config/installer/container/services_install_database.yml +++ b/phpBB/config/installer/container/services_install_database.yml @@ -1,16 +1,36 @@ services: - installer.install_database.create_schema: - class: phpbb\install\module\install_database\task\create_schema + installer.install_database.create_schema_file: + class: phpbb\install\module\install_database\task\create_schema_file arguments: - '@installer.helper.config' - '@installer.helper.database' - '@filesystem' - - '@installer.helper.iohandler' - '%core.root_path%' - '%core.php_ext%' tags: - { name: install_database_install, order: 10 } + installer.install_database.set_up_database: + class: phpbb\install\module\install_database\task\set_up_database + arguments: + - '@installer.helper.config' + - '@installer.helper.database' + - '@filesystem' + - '@installer.helper.iohandler' + - '%core.root_path%' + tags: + - { name: install_database_install, order: 20 } + + installer.install_database.add_tables: + class: phpbb\install\module\install_database\task\add_tables + arguments: + - '@installer.helper.config' + - '@installer.helper.database' + - '@filesystem' + - '%core.root_path%' + tags: + - { name: install_database_install, order: 30 } + installer.install_database.add_default_data: class: phpbb\install\module\install_database\task\add_default_data arguments: @@ -21,7 +41,7 @@ services: - '@language' - '%core.root_path%' tags: - - { name: install_database_install, order: 20 } + - { name: install_database_install, order: 40 } installer.install_database.add_config_settings: class: phpbb\install\module\install_database\task\add_config_settings @@ -33,7 +53,7 @@ services: - '@language' - '%core.root_path%' tags: - - { name: install_database_install, order: 30 } + - { name: install_database_install, order: 50 } installer.module.install_database_collection: class: phpbb\di\ordered_service_collection diff --git a/phpBB/config/installer/container/services_install_finish.yml b/phpBB/config/installer/container/services_install_finish.yml index 854b129b69..f144cc6317 100644 --- a/phpBB/config/installer/container/services_install_finish.yml +++ b/phpBB/config/installer/container/services_install_finish.yml @@ -2,6 +2,7 @@ services: installer.install_finish.populate_migrations: class: phpbb\install\module\install_finish\task\populate_migrations arguments: + - '@installer.helper.config' - '@installer.helper.container_factory' tags: - { name: install_finish, order: 10 } diff --git a/phpBB/config/installer/container/services_installer.yml b/phpBB/config/installer/container/services_installer.yml index bf9d28ec65..19b1b4f08e 100644 --- a/phpBB/config/installer/container/services_installer.yml +++ b/phpBB/config/installer/container/services_installer.yml @@ -89,6 +89,7 @@ services: - '@cache.driver' - '@installer.helper.config' - '@path_helper' + - '@installer.helper.container_factory' installer.install.module_collection: class: phpbb\di\ordered_service_collection @@ -108,8 +109,10 @@ services: parent: installer.installer.abstract calls: - [set_modules, ['@installer.install.module_collection']] + - [set_purge_cache_before, [false]] installer.installer.update: parent: installer.installer.abstract calls: - [set_modules, ['@installer.update.module_collection']] + - [set_purge_cache_before, [true]] |