[ticket/13740] Use service collection instead of array of task names

PHPBB3-13740
2025-08-11 03:04:09 +02:00 · 2015-07-09 15:26:48 +02:00
parent 794726a464
commit 62103cec30
14 changed files with 221 additions and 242 deletions
--- a/phpBB/config/installer/container/services_install_data.yml
+++ b/phpBB/config/installer/container/services_install_data.yml
@@ -8,6 +8,8 @@ services:
            - @language
            - %core.root_path%
            - %core.php_ext%
+        tags:
+            - { name: install_data_install, order: 2 }

    installer.install_data.add_languages:
        class: phpbb\install\module\install_data\task\add_languages
@@ -15,15 +17,28 @@ services:
            - @installer.helper.iohandler
            - @installer.helper.container_factory
            - @language.helper.language_file
+        tags:
+            - { name: install_data_install, order: 1 }

    installer.install_data.add_modules:
        class: phpbb\install\module\install_data\task\add_modules
        arguments:
            - @installer.helper.iohandler
            - @installer.helper.container_factory
+        tags:
+            - { name: install_data_install, order: 3 }
+
+    installer.module.data_install_collection:
+        class: phpbb\di\ordered_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: install_data_install }

    installer.module.data_install:
        class: phpbb\install\module\install_data\module
        parent: installer.module_base
        arguments:
-            - ["installer.install_data.add_languages", "installer.install_data.add_bots", "installer.install_data.add_modules"]
+            - @installer.module.data_install_collection
+        tags:
+            - { name: installer_install_module, order: 5 }
--- a/phpBB/config/installer/container/services_install_database.yml
+++ b/phpBB/config/installer/container/services_install_database.yml
@@ -6,9 +6,10 @@ services:
            - @installer.helper.database
            - @filesystem
            - @installer.helper.iohandler
-           # - @installer.helper.container_factory
            - %core.root_path%
            - %core.php_ext%
+        tags:
+            - { name: install_database_install, order: 1 }

    installer.install_database.add_default_data:
        class: phpbb\install\module\install_database\task\add_default_data
@@ -19,6 +20,8 @@ services:
            - @installer.helper.container_factory
            - @language
            - %core.root_path%
+        tags:
+            - { name: install_database_install, order: 2 }

    installer.install_database.add_config_settings:
        class: phpbb\install\module\install_database\task\add_config_settings
@@ -29,9 +32,20 @@ services:
            - @installer.helper.container_factory
            - @language
            - %core.root_path%
+        tags:
+            - { name: install_database_install, order: 3 }
+
+    installer.module.install_database_collection:
+        class: phpbb\di\ordered_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: install_database_install }

    installer.module.database_install:
        class: phpbb\install\module\install_database\module
        parent: installer.module_base
        arguments:
-            - ["installer.install_database.create_schema", "installer.install_database.add_default_data", "installer.install_database.add_config_settings"]
+            - @installer.module.install_database_collection
+        tags:
+            - { name: installer_install_module, order: 4 }
--- a/phpBB/config/installer/container/services_install_filesystem.yml
+++ b/phpBB/config/installer/container/services_install_filesystem.yml
@@ -8,9 +8,20 @@ services:
            - @installer.helper.iohandler
            - %core.root_path%
            - %core.php_ext%
+        tags:
+            - { name: install_filesystem_install, order: 1 }
+
+    installer.module.install_filesystem_collection:
+        class: phpbb\di\ordered_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: install_filesystem_install }

    installer.module.filesystem_install:
        class: phpbb\install\module\install_filesystem\module
        parent: installer.module_base
        arguments:
-            - ["installer.install_filesystem.create_config_file"]
+            - @installer.module.install_filesystem_collection
+        tags:
+            - { name: installer_install_module, order: 3 }
--- a/phpBB/config/installer/container/services_install_finish.yml
+++ b/phpBB/config/installer/container/services_install_finish.yml
@@ -3,6 +3,8 @@ services:
        class: phpbb\install\module\install_finish\task\populate_migrations
        arguments:
            - @installer.helper.container_factory
+        tags:
+            - { name: install_finish, order: 1 }

    installer.install_finish.notify_user:
        class: phpbb\install\module\install_finish\task\notify_user
@@ -12,9 +14,20 @@ services:
            - @installer.helper.iohandler
            - %core.root_path%
            - %core.php_ext%
+        tags:
+            - { name: install_finish, order: 2 }
+
+    installer.module.install_finish_collection:
+        class: phpbb\di\ordered_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: install_finish }

    installer.module.finish_install:
        class: phpbb\install\module\install_filesystem\module
        parent: installer.module_base
        arguments:
-            - ["installer.install_finish.populate_migrations", "installer.install_finish.notify_user"]
+            - @installer.module.install_finish_collection
+        tags:
+            - { name: installer_install_module, order: 6 }
--- a/phpBB/config/installer/container/services_install_obtain_data.yml
+++ b/phpBB/config/installer/container/services_install_obtain_data.yml
@@ -4,6 +4,8 @@ services:
        arguments:
            - @installer.helper.config
            - @installer.helper.iohandler
+        tags:
+            - { name: install_obtain_data, order: 1 }

    installer.obtain_data.obtain_board_data:
        class: phpbb\install\module\obtain_data\task\obtain_board_data
@@ -11,6 +13,8 @@ services:
            - @installer.helper.config
            - @installer.helper.iohandler
            - @language.helper.language_file
+        tags:
+            - { name: install_obtain_data, order: 5 }

    installer.obtain_data.obtain_database_data:
        class: phpbb\install\module\obtain_data\task\obtain_database_data
@@ -18,28 +22,45 @@ services:
            - @installer.helper.database
            - @installer.helper.config
            - @installer.helper.iohandler
+        tags:
+            - { name: install_obtain_data, order: 2 }

    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_imagick_path:
        class: phpbb\install\module\obtain_data\task\obtain_imagick_path
        arguments:
            - @installer.helper.config
+        tags:
+            - { name: install_obtain_data, order: 6 }

    installer.obtain_data.obtain_server_data:
        class: phpbb\install\module\obtain_data\task\obtain_server_data
        arguments:
            - @installer.helper.config
            - @installer.helper.iohandler
+        tags:
+            - { name: install_obtain_data, order: 3 }
+
+    installer.module.install_obtain_data_collection:
+        class: phpbb\di\ordered_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: install_obtain_data }

    installer.module.obtain_data_install:
        class: phpbb\install\module\obtain_data\module
        parent: installer.module_base
        arguments:
-            - ["installer.obtain_data.obtain_admin_data", "installer.obtain_data.obtain_database_data", "installer.obtain_data.obtain_server_data", "installer.obtain_data.obtain_email_data", "installer.obtain_data.obtain_board_data", "installer.obtain_data.obtain_imagick_path"]
+            - @installer.module.install_obtain_data_collection
            - true
            - false
+        tags:
+            - { name: installer_install_module, order: 2 }
--- a/phpBB/config/installer/container/services_install_requirements.yml
+++ b/phpBB/config/installer/container/services_install_requirements.yml
@@ -6,18 +6,31 @@ services:
            - @installer.helper.iohandler
            - %core.root_path%
            - %core.php_ext%
+        tags:
+            - { name: installer_requirements, order: 1 }

    installer.requirements.check_server_environment:
        class: phpbb\install\module\requirements\task\check_server_environment
        arguments:
            - @installer.helper.database
            - @installer.helper.iohandler
+        tags:
+            - { name: installer_requirements, order: 2 }
+
+    installer.module.install_requirements_collection:
+        class: phpbb\di\ordered_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: installer_requirements }

 # Please note, that the name of this module is hard coded in the installer service
    installer.module.requirements_install:
        class: phpbb\install\module\requirements\module
        parent: installer.module_base
        arguments:
-            - ["installer.requirements.check_filesystem", "installer.requirements.check_server_environment"]
+            - @installer.module.install_requirements_collection
            - true
            - false
+        tags:
+            - { name: installer_install_module, order: 1 }
--- a/phpBB/config/installer/container/services_installer.yml
+++ b/phpBB/config/installer/container/services_installer.yml
@@ -69,7 +69,14 @@ services:
            - @installer.helper.config
            - @service_container

+    installer.install.module_collection:
+        class: phpbb\di\ordered_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: installer_install_module }
+
    installer.installer.install:
        parent: installer.installer.abstract
        calls:
-            - [set_modules, [["installer.module.requirements_install", "installer.module.obtain_data_install", "installer.module.filesystem_install", "installer.module.database_install", "installer.module.data_install", "installer.module.finish_install"]]]
+            - [set_modules, [@installer.install.module_collection]]