Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714

* 'develop' of https://github.com/phpbb/phpbb3: (119 commits)
  [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
  [ticket/11358] Changed the name of post parameter.
  [ticket/11358] Changed the action parameter value to represent the link.
  [ticket/11358] Enabled link making all users default for a group.
  [ticket/11358] Removed redundant code and referred proper variable.
  [ticket/11358] Success message even without selecting a user.
  [ticket/11355] Referred proper variable when validating selection.
  [ticket/11355] Wrong error message when no user is selected.
  [ticket/10896] Add missing email validation lost in develop merge
  [ticket/7262] Add note about set_config() not updating is_dynamic.
  [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
  [ticket/7262] Backport set_config() and set_config_count() docs from develop.
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
  [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
  [ticket/11179] remove extra & in function call
  [ticket/11179] correct start parameter in sphinx search
  [ticket/11179] correct start parameter in native author search
  [ticket/11179] correct start parameter in native keyword search
  ...

Conflicts:
	phpBB/config/tables.yml

phpBB/config/migrator.yml

@@ -0,0 +1,49 @@
+services:
+    migrator:
+        class: phpbb_db_migrator
+        arguments:
+            - @config
+            - @dbal.conn
+            - @dbal.tools
+            - %tables.migrations%
+            - %core.root_path%
+            - %core.php_ext%
+            - %core.table_prefix%
+            - @migrator.tool_collection
+
+    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.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 }

phpBB/config/services.yml

@@ -1,6 +1,7 @@
 imports:
     - { resource: tables.yml }
     - { resource: cron_tasks.yml }
+    - { resource: migrator.yml }
 
 services:
     auth:
@@ -94,6 +95,12 @@ services:
         calls:
             - [sql_connect, [%dbal.dbhost%, %dbal.dbuser%, %dbal.dbpasswd%, %dbal.dbname%, %dbal.dbport%, false, %dbal.new_link%]]
 
+    dbal.tools:
+        file: %core.root_path%includes/db/db_tools.%core.php_ext%
+        class: phpbb_db_tools
+        arguments:
+            - @dbal.conn
+
     event.subscriber_loader:
         class: phpbb_event_extension_subscriber_loader
         arguments:
@@ -105,8 +112,10 @@ services:
     ext.manager:
         class: phpbb_extension_manager
         arguments:
+            - @service_container
             - @dbal.conn
             - @config
+            - @migrator
             - %tables.ext%
             - %core.root_path%
             - .%core.php_ext%

phpBB/config/tables.yml

@@ -2,3 +2,5 @@ parameters:
     tables.config: %core.table_prefix%config
     tables.ext: %core.table_prefix%ext
     tables.log: %core.table_prefix%log
+    tables.migrations: %core.table_prefix%migrations
+    tables.modules: %core.table_prefix%modules