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

PHPBB3-13740
author: Mate Bartus <mate.bartus@gmail.com> 2015-07-09 15:26:48 +0200
committer: Mate Bartus <mate.bartus@gmail.com> 2015-07-09 15:30:30 +0200
commit: 62103cec300ddadb904862ee2a74d68f71eb32ca (patch)
tree: 2ad0f1a4b9d9b58f18671b74ad4e3ddf2ba7e294 /phpBB/config
parent: 794726a464452a6056d8a2ba06c4394767d4c497 (diff)
download: forums-62103cec300ddadb904862ee2a74d68f71eb32ca.tar
forums-62103cec300ddadb904862ee2a74d68f71eb32ca.tar.gz
forums-62103cec300ddadb904862ee2a74d68f71eb32ca.tar.bz2
forums-62103cec300ddadb904862ee2a74d68f71eb32ca.tar.xz
forums-62103cec300ddadb904862ee2a74d68f71eb32ca.zip
7 files changed, 102 insertions, 8 deletions
diff --git a/phpBB/config/installer/container/services_install_data.yml b/phpBB/config/installer/container/services_install_data.yml
index 5e01be2bce..40885b6ed9 100644
--- 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 }
diff --git a/phpBB/config/installer/container/services_install_database.yml b/phpBB/config/installer/container/services_install_database.yml
index 061d3f6c42..efbfa82623 100644
--- 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 }
diff --git a/phpBB/config/installer/container/services_install_filesystem.yml b/phpBB/config/installer/container/services_install_filesystem.yml
index 077b1ccb98..71b2f697e0 100644
--- 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 }
diff --git a/phpBB/config/installer/container/services_install_finish.yml b/phpBB/config/installer/container/services_install_finish.yml
index d2002f9fd7..f70fefad84 100644
--- 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 }
diff --git a/phpBB/config/installer/container/services_install_obtain_data.yml b/phpBB/config/installer/container/services_install_obtain_data.yml
index ecbd3d6d37..b4077c2ecd 100644
--- 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 }
diff --git a/phpBB/config/installer/container/services_install_requirements.yml b/phpBB/config/installer/container/services_install_requirements.yml
index c93856837d..af640e0cff 100644
--- 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 }
diff --git a/phpBB/config/installer/container/services_installer.yml b/phpBB/config/installer/container/services_installer.yml
index 4c171f3fe7..4403a1ee51 100644
--- 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]]
author	Mate Bartus <mate.bartus@gmail.com>	2015-07-09 15:26:48 +0200
committer	Mate Bartus <mate.bartus@gmail.com>	2015-07-09 15:30:30 +0200
commit	62103cec300ddadb904862ee2a74d68f71eb32ca (patch)
tree	2ad0f1a4b9d9b58f18671b74ad4e3ddf2ba7e294 /phpBB/config
parent	794726a464452a6056d8a2ba06c4394767d4c497 (diff)
download	forums-62103cec300ddadb904862ee2a74d68f71eb32ca.tar forums-62103cec300ddadb904862ee2a74d68f71eb32ca.tar.gz forums-62103cec300ddadb904862ee2a74d68f71eb32ca.tar.bz2 forums-62103cec300ddadb904862ee2a74d68f71eb32ca.tar.xz forums-62103cec300ddadb904862ee2a74d68f71eb32ca.zip