13 files changed, 284 insertions, 38 deletions
diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml
index c376726b3b..6577a44195 100644
--- a/phpBB/config/default/container/services.yml
+++ b/phpBB/config/default/container/services.yml
@@ -8,10 +8,15 @@ imports:
     - { resource: services_db.yml }
     - { resource: services_event.yml }
     - { resource: services_feed.yml }
+    - { resource: services_help.yml }
+    - { resource: services_language.yml }
     - { resource: services_mimetype_guesser.yml }
     - { resource: services_notification.yml }
     - { resource: services_password.yml }
     - { resource: services_profilefield.yml }
+    - { resource: services_report.yml }
+    - { resource: services_routing.yml }
+    - { resource: services_text_formatter.yml }
     - { resource: services_twig.yml }
     - { resource: services_user.yml }
 
@@ -83,7 +88,6 @@ services:
     controller.resolver:
         class: phpbb\controller\resolver
         arguments:
-            - @user
             - @service_container
             - %core.root_path%
             - @template
@@ -95,14 +99,13 @@ services:
             - @dbal.conn
             - @config
             - @filesystem
-            - @user
             - %tables.ext%
             - %core.root_path%
             - %core.php_ext%
             - @cache.driver
 
     filesystem:
-        class: phpbb\filesystem
+        class: phpbb\filesystem\filesystem
 
     file_downloader:
         class: phpbb\file_downloader
@@ -155,24 +158,6 @@ services:
             - null
             - %core.disable_super_globals%
 
-    router:
-        class: phpbb\routing\router
-        arguments:
-            - @ext.manager
-            - %core.root_path%
-            - %core.php_ext%
-            - %core.environment%
-
-    router.listener:
-        class: Symfony\Component\HttpKernel\EventListener\RouterListener
-        arguments:
-            - @router
-            - null
-            - null
-            - @request_stack
-        tags:
-            - { name: kernel.event_subscriber }
-
     # WARNING: The Symfony request does not escape the input and should be used very carefully
     #           prefer the phpbb request (service @request) as possible
     symfony_request:
@@ -183,20 +168,8 @@ services:
     request_stack:
         class: Symfony\Component\HttpFoundation\RequestStack
 
-    template:
-        class: phpbb\template\twig\twig
-        arguments:
-            - @path_helper
-            - @config
-            - @user
-            - @template_context
-            - @template.twig.environment
-            - %core.template.cache_path%
-            - @template.twig.extensions.collection
-            - @ext.manager
-
-    template_context:
-        class: phpbb\template\context
+    upload_imagesize:
+        class: fastImageSize\fastImageSize
 
     version_helper:
         class: phpbb\version_helper
diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml
index 5292489715..c74bef3d66 100644
--- a/phpBB/config/default/container/services_avatar.yml
+++ b/phpBB/config/default/container/services_avatar.yml
@@ -17,6 +17,7 @@ services:
         class: phpbb\avatar\driver\gravatar
         arguments:
             - @config
+            - @upload_imagesize
             - %core.root_path%
             - %core.php_ext%
             - @path_helper
@@ -30,6 +31,7 @@ services:
         class: phpbb\avatar\driver\local
         arguments:
             - @config
+            - @upload_imagesize
             - %core.root_path%
             - %core.php_ext%
             - @path_helper
@@ -43,6 +45,7 @@ services:
         class: phpbb\avatar\driver\remote
         arguments:
             - @config
+            - @upload_imagesize
             - %core.root_path%
             - %core.php_ext%
             - @path_helper
@@ -58,6 +61,7 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - @filesystem
             - @path_helper
             - @mimetype.guesser
             - @cache.driver
diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml
index 1e18a7dd37..f0ae6c8ab4 100644
--- a/phpBB/config/default/container/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -84,6 +84,7 @@ services:
             - @config
             - @cache
             - @log
+            - @filesystem
             - %core.root_path%
         tags:
             - { name: console.command }
diff --git a/phpBB/config/default/container/services_db.yml b/phpBB/config/default/container/services_db.yml
index 77ceb0b02c..ae2707b9a5 100644
--- a/phpBB/config/default/container/services_db.yml
+++ b/phpBB/config/default/container/services_db.yml
@@ -14,10 +14,71 @@ services:
         class: phpbb\db\tools\factory
 
     dbal.tools:
-        class: phpbb\db\tools\tools
+        class: phpbb\db\tools\tools_interface
         factory: ["@dbal.tools.factory", get]
         arguments:
-            - @dbal.conn
+            - @dbal.conn.driver
+
+# ----- DB Extractor -----
+    dbal.extractor.factory:
+        class: phpbb\db\extractor\factory
+        arguments:
+            - @dbal.conn.driver
+            - @service_container
+
+    dbal.extractor:
+        class: phpbb\db\extractor\extractor_interface
+        factory: ["@dbal.extractor.factory", get]
+
+# ----- DB Extractors for different drivers -----
+# Scope MUST be prototype for all the handlers to work correctly.
+    dbal.extractor.extractors.mssql_extractor:
+        class: phpbb\db\extractor\mssql_extractor
+        scope: prototype
+        arguments:
+            - %core.root_path%
+            - @request
+            - @dbal.conn.driver
+
+    dbal.extractor.extractors.mysql_extractor:
+        class: phpbb\db\extractor\mysql_extractor
+        scope: prototype
+        arguments:
+            - %core.root_path%
+            - @request
+            - @dbal.conn.driver
+
+    dbal.extractor.extractors.oracle_extractor:
+        class: phpbb\db\extractor\oracle_extractor
+        scope: prototype
+        arguments:
+            - %core.root_path%
+            - @request
+            - @dbal.conn.driver
+
+    dbal.extractor.extractors.postgres_extractor:
+        class: phpbb\db\extractor\postgres_extractor
+        scope: prototype
+        arguments:
+            - %core.root_path%
+            - @request
+            - @dbal.conn.driver
+
+    dbal.extractor.extractors.sqlite3_extractor:
+        class: phpbb\db\extractor\sqlite3_extractor
+        scope: prototype
+        arguments:
+            - %core.root_path%
+            - @request
+            - @dbal.conn.driver
+
+    dbal.extractor.extractors.sqlite_extractor:
+        class: phpbb\db\extractor\sqlite_extractor
+        scope: prototype
+        arguments:
+            - %core.root_path%
+            - @request
+            - @dbal.conn.driver
 
 # ----- Migrator -----
     migrator:
diff --git a/phpBB/config/default/container/services_help.yml b/phpBB/config/default/container/services_help.yml
new file mode 100644
index 0000000000..8b9d497945
--- /dev/null
+++ b/phpBB/config/default/container/services_help.yml
@@ -0,0 +1,27 @@
+services:
+    phpbb.help.manager:
+        class: phpbb\help\manager
+        arguments:
+            - @dispatcher
+            - @language
+            - @template
+
+    phpbb.help.controller.bbcode:
+        class: phpbb\help\controller\bbcode
+        arguments:
+            - @controller.helper
+            - @phpbb.help.manager
+            - @template
+            - @language
+            - %core.root_path%
+            - %core.php_ext%
+
+    phpbb.help.controller.faq:
+        class: phpbb\help\controller\faq
+        arguments:
+            - @controller.helper
+            - @phpbb.help.manager
+            - @template
+            - @language
+            - %core.root_path%
+            - %core.php_ext%
diff --git a/phpBB/config/default/container/services_language.yml b/phpBB/config/default/container/services_language.yml
new file mode 100644
index 0000000000..aa3631ded1
--- /dev/null
+++ b/phpBB/config/default/container/services_language.yml
@@ -0,0 +1,22 @@
+services:
+    language.helper.language_file:
+        class: phpbb\language\language_file_helper
+        arguments:
+            - %core.root_path%
+
+    language:
+        class: phpbb\language\language
+        arguments:
+            - @language.loader
+
+    language.loader_abstract:
+        abstract: true
+        class: phpbb\language\language_file_loader
+        arguments:
+            - %core.root_path%
+            - %core.php_ext%
+
+    language.loader:
+        parent: language.loader_abstract
+        calls:
+            - [set_extension_manager, ["@ext.manager"]]
diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml
index b17a172fb5..c3bbcddfa6 100644
--- a/phpBB/config/default/container/services_notification.yml
+++ b/phpBB/config/default/container/services_notification.yml
@@ -221,6 +221,8 @@ services:
             - %tables.notification_types%
             - %tables.notifications%
             - %tables.user_notifications%
+        calls:
+            - [set_utils, [@text_formatter.utils]]
         tags:
             - { name: notification.type }
 
diff --git a/phpBB/config/default/container/services_report.yml b/phpBB/config/default/container/services_report.yml
new file mode 100644
index 0000000000..4bf929429e
--- /dev/null
+++ b/phpBB/config/default/container/services_report.yml
@@ -0,0 +1,53 @@
+services:
+# ----- Report controller -----
+    phpbb.report.controller:
+        class: phpbb\report\controller\report
+        arguments:
+            - @config
+            - @user
+            - @template
+            - @controller.helper
+            - @request
+            - @captcha.factory
+            - @phpbb.report.handler_factory
+            - @phpbb.report.report_reason_list_provider
+            - %core.root_path%
+            - %core.php_ext%
+
+# ----- Report handler factory -----
+    phpbb.report.handler_factory:
+        class: phpbb\report\handler_factory
+        arguments:
+            - @service_container
+
+# ----- Report UI provider -----
+    phpbb.report.report_reason_list_provider:
+        class: phpbb\report\report_reason_list_provider
+        arguments:
+            - @dbal.conn.driver
+            - @template
+            - @user
+
+# ----- Report handlers -----
+# Scope MUST be prototype for all the handlers to work correctly.
+    phpbb.report.handlers.report_handler_pm:
+        class: phpbb\report\report_handler_pm
+        scope: prototype
+        arguments:
+            - @dbal.conn.driver
+            - @dispatcher
+            - @config
+            - @auth
+            - @user
+            - @notification_manager
+
+    phpbb.report.handlers.report_handler_post:
+        class: phpbb\report\report_handler_post
+        scope: prototype
+        arguments:
+            - @dbal.conn.driver
+            - @dispatcher
+            - @config
+            - @auth
+            - @user
+            - @notification_manager
diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml
new file mode 100644
index 0000000000..6749202c0d
--- /dev/null
+++ b/phpBB/config/default/container/services_routing.yml
@@ -0,0 +1,19 @@
+services:
+    router:
+        class: phpbb\routing\router
+        arguments:
+            - @filesystem
+            - %core.root_path%
+            - %core.php_ext%
+            - %core.environment%
+            - @ext.manager
+
+    router.listener:
+        class: Symfony\Component\HttpKernel\EventListener\RouterListener
+        arguments:
+            - @router
+            - null
+            - null
+            - @request_stack
+        tags:
+            - { name: kernel.event_subscriber }
diff --git a/phpBB/config/default/container/services_text_formatter.yml b/phpBB/config/default/container/services_text_formatter.yml
new file mode 100644
index 0000000000..20436f0f64
--- /dev/null
+++ b/phpBB/config/default/container/services_text_formatter.yml
@@ -0,0 +1,60 @@
+parameters:
+    text_formatter.cache.dir: %core.root_path%cache/%core.environment%/
+    text_formatter.cache.parser.key: _text_formatter_parser
+    text_formatter.cache.renderer.key: _text_formatter_renderer
+
+services:
+    text_formatter.cache:
+        alias: text_formatter.s9e.factory
+
+    text_formatter.data_access:
+        class: phpbb\textformatter\data_access
+        arguments:
+            - @dbal.conn
+            - %tables.bbcodes%
+            - %tables.smilies%
+            - %tables.styles%
+            - %tables.words%
+            - %core.root_path%styles/
+
+    text_formatter.parser:
+        alias: text_formatter.s9e.parser
+
+    text_formatter.renderer:
+        alias: text_formatter.s9e.renderer
+
+    text_formatter.utils:
+        alias: text_formatter.s9e.utils
+
+    text_formatter.s9e.factory:
+        class: phpbb\textformatter\s9e\factory
+        arguments:
+            - @text_formatter.data_access
+            - @cache.driver
+            - @dispatcher
+            - %text_formatter.cache.dir%
+            - %text_formatter.cache.parser.key%
+            - %text_formatter.cache.renderer.key%
+
+    text_formatter.s9e.parser:
+        class: phpbb\textformatter\s9e\parser
+        arguments:
+            - @cache.driver
+            - %text_formatter.cache.parser.key%
+            - @text_formatter.s9e.factory
+            - @dispatcher
+
+    text_formatter.s9e.renderer:
+        class: phpbb\textformatter\s9e\renderer
+        arguments:
+            - @cache.driver
+            - %text_formatter.cache.dir%
+            - %text_formatter.cache.renderer.key%
+            - @text_formatter.s9e.factory
+            - @dispatcher
+        calls:
+            - [configure_smilies_path, [@config, @path_helper]]
+            - [configure_user, [@user, @config, @auth]]
+
+    text_formatter.s9e.utils:
+        class: phpbb\textformatter\s9e\utils
diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml
index 25382a95a1..2799892376 100644
--- a/phpBB/config/default/container/services_twig.yml
+++ b/phpBB/config/default/container/services_twig.yml
@@ -6,11 +6,13 @@ services:
         class: phpbb\template\twig\environment
         arguments:
             - @config
+            - @filesystem
             - @path_helper
             - @service_container
             - %core.template.cache_path%
             - @ext.manager
             - @template.twig.loader
+            - []
 
     template.twig.lexer:
         class: phpbb\template\twig\lexer
@@ -19,6 +21,8 @@ services:
 
     template.twig.loader:
         class: phpbb\template\twig\loader
+        arguments:
+            - @filesystem
 
     template.twig.extensions.collection:
         class: phpbb\di\service_collection
@@ -31,7 +35,7 @@ services:
         class: phpbb\template\twig\extension
         arguments:
             - @template_context
-            - @user
+            - @language
         tags:
             - { name: twig.extension }
 
@@ -44,3 +48,18 @@ services:
 
     template.twig.extensions.debug:
         class: Twig_Extension_Debug
+
+    template:
+        class: phpbb\template\twig\twig
+        arguments:
+            - @path_helper
+            - @config
+            - @template_context
+            - @template.twig.environment
+            - %core.template.cache_path%
+            - @user
+            - @template.twig.extensions.collection
+            - @ext.manager
+
+    template_context:
+        class: phpbb\template\context
diff --git a/phpBB/config/default/container/services_user.yml b/phpBB/config/default/container/services_user.yml
index 1ca853ea45..ff114f022a 100644
--- a/phpBB/config/default/container/services_user.yml
+++ b/phpBB/config/default/container/services_user.yml
@@ -8,6 +8,7 @@ services:
     user:
         class: phpbb\user
         arguments:
+            - @language
             - %datetime.class%
 
     user_loader:
diff --git a/phpBB/config/default/container/tables.yml b/phpBB/config/default/container/tables.yml
index 2fe2a33be8..00067d5abe 100644
--- a/phpBB/config/default/container/tables.yml
+++ b/phpBB/config/default/container/tables.yml
@@ -1,6 +1,7 @@
 parameters:
     tables.auth_provider_oauth_token_storage: %core.table_prefix%oauth_tokens
     tables.auth_provider_oauth_account_assoc: %core.table_prefix%oauth_accounts
+    tables.bbcodes: %core.table_prefix%bbcodes
     tables.captcha_qa_questions: %core.table_prefix%captcha_questions
     tables.captcha_qa_answers: %core.table_prefix%captcha_answers
     tables.captcha_qa_confirm: %core.table_prefix%qa_confirm
@@ -18,6 +19,9 @@ parameters:
     tables.profile_fields_options_language: %core.table_prefix%profile_fields_lang
     tables.profile_fields_language: %core.table_prefix%profile_lang
     tables.posts: %core.table_prefix%posts
+    tables.smilies: %core.table_prefix%smilies
+    tables.styles: %core.table_prefix%styles
     tables.topics: %core.table_prefix%topics
     tables.user_notifications: %core.table_prefix%user_notifications
     tables.users: %core.table_prefix%users
+    tables.words: %core.table_prefix%words