diff options
| author | MateBartus <mate.bartus@gmail.com> | 2015-05-31 13:20:56 +0200 |
|---|---|---|
| committer | MateBartus <mate.bartus@gmail.com> | 2015-05-31 13:22:45 +0200 |
| commit | e877a752be55dfda5a72c7995708e4e132a1079d (patch) | |
| tree | a4700affa6b2bfaf347c25e8e90484342a39b919 /phpBB/config | |
| parent | 71d03647f0433fca5a071e485d3f0cc3145c44d1 (diff) | |
| download | forums-e877a752be55dfda5a72c7995708e4e132a1079d.tar forums-e877a752be55dfda5a72c7995708e4e132a1079d.tar.gz forums-e877a752be55dfda5a72c7995708e4e132a1079d.tar.bz2 forums-e877a752be55dfda5a72c7995708e4e132a1079d.tar.xz forums-e877a752be55dfda5a72c7995708e4e132a1079d.zip | |
[ticket/13777] Deduplicate migration service definitions
PHPBB3-13777
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/default/container/services.yml | 1 | ||||
| -rw-r--r-- | phpBB/config/default/container/services_db.yml | 63 | ||||
| -rw-r--r-- | phpBB/config/default/container/services_migrator.yml | 4 |
3 files changed, 5 insertions, 63 deletions
diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index 9b5fd538ee..cab82a5d9c 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -10,6 +10,7 @@ imports: - { resource: services_feed.yml } - { resource: services_help.yml } - { resource: services_language.yml } + - { resource: services_migrator.yml } - { resource: services_mimetype_guesser.yml } - { resource: services_module.yml } - { resource: services_notification.yml } diff --git a/phpBB/config/default/container/services_db.yml b/phpBB/config/default/container/services_db.yml index ae2707b9a5..ed3f88c704 100644 --- a/phpBB/config/default/container/services_db.yml +++ b/phpBB/config/default/container/services_db.yml @@ -79,66 +79,3 @@ services: - %core.root_path% - @request - @dbal.conn.driver - -# ----- Migrator ----- - migrator: - class: phpbb\db\migrator - arguments: - - @service_container - - @config - - @dbal.conn - - @dbal.tools - - %tables.migrations% - - %core.root_path% - - %core.php_ext% - - %core.table_prefix% - - @migrator.tool_collection - - @migrator.helper - - migrator.helper: - class: phpbb\db\migration\helper - -# ----- Migrator's tools ----- - migrator.tool_collection: - class: phpbb\di\service_collection - arguments: - - @service_container - tags: - - { name: service_collection, tag: migrator.tool } - - migrator.tool.config: - class: phpbb\db\migration\tool\config - arguments: - - @config - tags: - - { name: migrator.tool } - - migrator.tool.config_text: - class: phpbb\db\migration\tool\config_text - arguments: - - @config_text - tags: - - { name: migrator.tool } - - migrator.tool.module: - class: phpbb\db\migration\tool\module - arguments: - - @dbal.conn - - @cache - - @user - - %core.root_path% - - %core.php_ext% - - %tables.modules% - tags: - - { name: migrator.tool } - - migrator.tool.permission: - class: phpbb\db\migration\tool\permission - arguments: - - @dbal.conn - - @cache - - @auth - - %core.root_path% - - %core.php_ext% - tags: - - { name: migrator.tool } diff --git a/phpBB/config/default/container/services_migrator.yml b/phpBB/config/default/container/services_migrator.yml index cd04eea5c2..01bd7d3a11 100644 --- a/phpBB/config/default/container/services_migrator.yml +++ b/phpBB/config/default/container/services_migrator.yml @@ -1,7 +1,9 @@ services: +# ----- Migrator ----- migrator: class: phpbb\db\migrator arguments: + - @service_container - @config - @dbal.conn - @dbal.tools @@ -15,6 +17,7 @@ services: migrator.helper: class: phpbb\db\migration\helper +# ----- Migrator's tools ----- migrator.tool_collection: class: phpbb\di\service_collection arguments: @@ -42,6 +45,7 @@ services: - @dbal.conn - @cache - @user + - @module.manager - %core.root_path% - %core.php_ext% - %tables.modules% |