[ticket/16643] Refactor installer task ordering

PHPBB3-16643

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 }

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 }

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 }

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 }

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 }

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 }

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 }

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 }

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 }

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 }