From d9bfb4d01d0708e782bd82789666420774d9056d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Bartus?= Date: Sat, 16 Jan 2021 10:03:52 +0100 Subject: [PATCH] [ticket/16643] Refactor installer task ordering PHPBB3-16643 --- .../container/services_install_data.yml | 26 ++++++------ .../container/services_install_database.yml | 12 +++--- .../container/services_install_filesystem.yml | 4 +- .../container/services_install_finish.yml | 8 ++-- .../services_install_obtain_data.yml | 42 +++++++++---------- .../services_install_requirements.yml | 8 ++-- .../container/services_update_database.yml | 2 +- .../container/services_update_filesystem.yml | 2 +- .../container/services_update_obtain_data.yml | 2 +- .../services_update_requirements.yml | 2 +- 10 files changed, 54 insertions(+), 54 deletions(-) diff --git a/phpBB/config/installer/container/services_install_data.yml b/phpBB/config/installer/container/services_install_data.yml index 5de00170e9..b10309a58f 100644 --- a/phpBB/config/installer/container/services_install_data.yml +++ b/phpBB/config/installer/container/services_install_data.yml @@ -1,4 +1,13 @@ services: + installer.install_data.add_languages: + class: phpbb\install\module\install_data\task\add_languages + arguments: + - '@installer.helper.iohandler' + - '@installer.helper.container_factory' + - '@language.helper.language_file' + tags: + - { name: install_data_install, order: 1 } + installer.install_data.add_bots: class: phpbb\install\module\install_data\task\add_bots arguments: @@ -9,16 +18,7 @@ services: - '%core.root_path%' - '%core.php_ext%' tags: - - { name: install_data_install, order: 20 } - - installer.install_data.add_languages: - class: phpbb\install\module\install_data\task\add_languages - arguments: - - '@installer.helper.iohandler' - - '@installer.helper.container_factory' - - '@language.helper.language_file' - tags: - - { name: install_data_install, order: 10 } + - { name: install_data_install, order: 2 } installer.install_data.add_modules: class: phpbb\install\module\install_data\task\add_modules @@ -27,7 +27,7 @@ services: - '@installer.helper.iohandler' - '@installer.helper.container_factory' tags: - - { name: install_data_install, order: 30 } + - { name: install_data_install, order: 3 } installer.install_data.create_search_index: class: phpbb\install\module\install_data\task\create_search_index @@ -37,7 +37,7 @@ services: - '%core.root_path%' - '%core.php_ext%' tags: - - { name: install_data_install, order: 40 } + - { name: install_data_install, order: 4 } installer.module.data_install_collection: class: phpbb\di\ordered_service_collection @@ -52,4 +52,4 @@ services: arguments: - '@installer.module.data_install_collection' tags: - - { name: installer_install_module, order: 50 } + - { name: installer_install_module, order: 5 } diff --git a/phpBB/config/installer/container/services_install_database.yml b/phpBB/config/installer/container/services_install_database.yml index 2203e3b751..0139859e55 100644 --- a/phpBB/config/installer/container/services_install_database.yml +++ b/phpBB/config/installer/container/services_install_database.yml @@ -9,7 +9,7 @@ services: - '%core.php_ext%' - '%tables%' tags: - - { name: install_database_install, order: 10 } + - { name: install_database_install, order: 1 } installer.install_database.set_up_database: class: phpbb\install\module\install_database\task\set_up_database @@ -20,7 +20,7 @@ services: - '@installer.helper.iohandler' - '%core.root_path%' tags: - - { name: install_database_install, order: 20 } + - { name: install_database_install, order: 2 } installer.install_database.add_tables: class: phpbb\install\module\install_database\task\add_tables @@ -29,7 +29,7 @@ services: - '@installer.helper.database' - '%core.root_path%' tags: - - { name: install_database_install, order: 30 } + - { name: install_database_install, order: 3 } installer.install_database.add_default_data: class: phpbb\install\module\install_database\task\add_default_data @@ -41,7 +41,7 @@ services: - '@language' - '%core.root_path%' tags: - - { name: install_database_install, order: 40 } + - { name: install_database_install, order: 4 } installer.install_database.add_config_settings: class: phpbb\install\module\install_database\task\add_config_settings @@ -53,7 +53,7 @@ services: - '@language' - '%core.root_path%' tags: - - { name: install_database_install, order: 50 } + - { name: install_database_install, order: 5 } installer.module.install_database_collection: class: phpbb\di\ordered_service_collection @@ -68,4 +68,4 @@ services: arguments: - '@installer.module.install_database_collection' tags: - - { name: installer_install_module, order: 40 } + - { name: installer_install_module, order: 4 } diff --git a/phpBB/config/installer/container/services_install_filesystem.yml b/phpBB/config/installer/container/services_install_filesystem.yml index 65b2a6eddd..996e593d15 100644 --- a/phpBB/config/installer/container/services_install_filesystem.yml +++ b/phpBB/config/installer/container/services_install_filesystem.yml @@ -10,7 +10,7 @@ services: - '%core.php_ext%' - '%installer.create_config_file.options%' tags: - - { name: install_filesystem_install, order: 10 } + - { name: install_filesystem_install, order: 1 } installer.module.install_filesystem_collection: class: phpbb\di\ordered_service_collection @@ -25,4 +25,4 @@ services: arguments: - '@installer.module.install_filesystem_collection' tags: - - { name: installer_install_module, order: 30 } + - { name: installer_install_module, order: 3 } diff --git a/phpBB/config/installer/container/services_install_finish.yml b/phpBB/config/installer/container/services_install_finish.yml index 6a46d8f9d9..9999b54846 100644 --- a/phpBB/config/installer/container/services_install_finish.yml +++ b/phpBB/config/installer/container/services_install_finish.yml @@ -5,7 +5,7 @@ services: - '@installer.helper.config' - '@installer.helper.container_factory' tags: - - { name: install_finish, order: 10 } + - { name: install_finish, order: 1 } installer.install_finish.install_extensions: class: phpbb\install\module\install_finish\task\install_extensions @@ -15,7 +15,7 @@ services: - '@installer.helper.iohandler' - '%core.root_path%' tags: - - { name: install_finish, order: 20 } + - { name: install_finish, order: 2 } installer.install_finish.notify_user: class: phpbb\install\module\install_finish\task\notify_user @@ -26,7 +26,7 @@ services: - '%core.root_path%' - '%core.php_ext%' tags: - - { name: install_finish, order: 30 } + - { name: install_finish, order: 3 } installer.module.install_finish_collection: class: phpbb\di\ordered_service_collection @@ -41,4 +41,4 @@ services: arguments: - '@installer.module.install_finish_collection' tags: - - { name: installer_install_module, order: 60 } + - { name: installer_install_module, order: 6 } diff --git a/phpBB/config/installer/container/services_install_obtain_data.yml b/phpBB/config/installer/container/services_install_obtain_data.yml index 010aba829d..04b6912853 100644 --- a/phpBB/config/installer/container/services_install_obtain_data.yml +++ b/phpBB/config/installer/container/services_install_obtain_data.yml @@ -5,16 +5,7 @@ services: - '@installer.helper.config' - '@installer.helper.iohandler' tags: - - { name: install_obtain_data, order: 10 } - - installer.obtain_data.obtain_board_data: - class: phpbb\install\module\obtain_data\task\obtain_board_data - arguments: - - '@installer.helper.config' - - '@installer.helper.iohandler' - - '@language.helper.language_file' - tags: - - { name: install_obtain_data, order: 50 } + - { name: install_obtain_data, order: 1 } installer.obtain_data.obtain_database_data: class: phpbb\install\module\obtain_data\task\obtain_database_data @@ -23,15 +14,7 @@ services: - '@installer.helper.config' - '@installer.helper.iohandler' tags: - - { name: install_obtain_data, order: 20 } - - installer.obtain_data.obtain_email_data: - class: phpbb\install\module\obtain_data\task\obtain_email_data - arguments: - - '@installer.helper.config' - - '@installer.helper.iohandler' - tags: - - { name: install_obtain_data, order: 40 } + - { name: install_obtain_data, order: 2 } installer.obtain_data.obtain_server_data: class: phpbb\install\module\obtain_data\task\obtain_server_data @@ -39,7 +22,24 @@ services: - '@installer.helper.config' - '@installer.helper.iohandler' tags: - - { name: install_obtain_data, order: 30 } + - { name: install_obtain_data, order: 3 } + + installer.obtain_data.obtain_email_data: + class: phpbb\install\module\obtain_data\task\obtain_email_data + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + tags: + - { name: install_obtain_data, order: 4 } + + installer.obtain_data.obtain_board_data: + class: phpbb\install\module\obtain_data\task\obtain_board_data + arguments: + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@language.helper.language_file' + tags: + - { name: install_obtain_data, order: 5 } installer.module.install_obtain_data_collection: class: phpbb\di\ordered_service_collection @@ -56,4 +56,4 @@ services: - true - false tags: - - { name: installer_install_module, order: 20 } + - { name: installer_install_module, order: 2 } diff --git a/phpBB/config/installer/container/services_install_requirements.yml b/phpBB/config/installer/container/services_install_requirements.yml index c03eb1fb93..93d123a0e9 100644 --- a/phpBB/config/installer/container/services_install_requirements.yml +++ b/phpBB/config/installer/container/services_install_requirements.yml @@ -7,7 +7,7 @@ services: - '%core.root_path%' - '%core.php_ext%' tags: - - { name: installer_requirements, order: 10 } + - { name: installer_requirements, order: 1 } installer.requirements.check_server_environment: class: phpbb\install\module\requirements\task\check_server_environment @@ -15,8 +15,8 @@ services: - '@installer.helper.database' - '@installer.helper.iohandler' tags: - - { name: installer_requirements, order: 20 } - - { name: update_requirements, order: 20 } + - { name: installer_requirements, order: 2 } + - { name: update_requirements, order: 2 } installer.module.install_requirements_collection: class: phpbb\di\ordered_service_collection @@ -34,4 +34,4 @@ services: - true - false tags: - - { name: installer_install_module, order: 10 } + - { name: installer_install_module, order: 1 } diff --git a/phpBB/config/installer/container/services_update_database.yml b/phpBB/config/installer/container/services_update_database.yml index bb97cff489..836b943670 100644 --- a/phpBB/config/installer/container/services_update_database.yml +++ b/phpBB/config/installer/container/services_update_database.yml @@ -37,4 +37,4 @@ services: - true - false tags: - - { name: installer_update_module, order: 40 } + - { name: installer_update_module, order: 4 } diff --git a/phpBB/config/installer/container/services_update_filesystem.yml b/phpBB/config/installer/container/services_update_filesystem.yml index cd9058bd3f..1dce58eaad 100644 --- a/phpBB/config/installer/container/services_update_filesystem.yml +++ b/phpBB/config/installer/container/services_update_filesystem.yml @@ -68,4 +68,4 @@ services: - true - false tags: - - { name: installer_update_module, order: 30 } + - { name: installer_update_module, order: 3 } diff --git a/phpBB/config/installer/container/services_update_obtain_data.yml b/phpBB/config/installer/container/services_update_obtain_data.yml index 999976aed0..37eb66ae01 100644 --- a/phpBB/config/installer/container/services_update_obtain_data.yml +++ b/phpBB/config/installer/container/services_update_obtain_data.yml @@ -50,4 +50,4 @@ services: - true - false tags: - - { name: installer_update_module, order: 20 } + - { name: installer_update_module, order: 2 } diff --git a/phpBB/config/installer/container/services_update_requirements.yml b/phpBB/config/installer/container/services_update_requirements.yml index 6b851de78b..7ca7c921d1 100644 --- a/phpBB/config/installer/container/services_update_requirements.yml +++ b/phpBB/config/installer/container/services_update_requirements.yml @@ -38,4 +38,4 @@ services: - true - false tags: - - { name: installer_update_module, order: 10 } + - { name: installer_update_module, order: 1 }