9 files changed, 119 insertions, 16 deletions
diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml
index 1daf35b3fb..288785201c 100644
--- a/phpBB/config/default/container/services.yml
+++ b/phpBB/config/default/container/services.yml
@@ -84,12 +84,9 @@ services:
             - @template
             - @user
             - @config
-            - @router
             - @symfony_request
             - @request
-            - @filesystem
-            - %core.root_path%
-            - %core.php_ext%
+            - @routing.helper
 
     controller.resolver:
         class: phpbb\controller\resolver
@@ -151,7 +148,7 @@ services:
             - @mimetype.guesser
 
     upload_imagesize:
-        class: fastImageSize\fastImageSize
+        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 1b0c109298..76057cf5a7 100644
--- a/phpBB/config/default/container/services_avatar.yml
+++ b/phpBB/config/default/container/services_avatar.yml
@@ -63,8 +63,8 @@ services:
             - %core.php_ext%
             - @filesystem
             - @path_helper
-            - @mimetype.guesser
             - @dispatcher
+            - @files.factory
             - @cache.driver
         calls:
             - [set_name, [avatar.driver.upload]]
diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml
index 71b6244e13..6b46375c7d 100644
--- a/phpBB/config/default/container/services_console.yml
+++ b/phpBB/config/default/container/services_console.yml
@@ -83,6 +83,17 @@ services:
         tags:
             - { name: console.command }
 
+    console.command.db.list:
+        class: phpbb\console\command\db\list_command
+        arguments:
+            - @user
+            - @migrator
+            - @ext.manager
+            - @config
+            - @cache
+        tags:
+            - { name: console.command }
+
     console.command.db.migrate:
         class: phpbb\console\command\db\migrate
         arguments:
@@ -97,6 +108,19 @@ services:
         tags:
             - { name: console.command }
 
+    console.command.db.revert:
+        class: phpbb\console\command\db\revert
+        arguments:
+            - @user
+            - @migrator
+            - @ext.manager
+            - @config
+            - @cache
+            - @filesystem
+            - %core.root_path%
+        tags:
+            - { name: console.command }
+
     console.command.dev.migration_tips:
         class: phpbb\console\command\dev\migration_tips
         arguments:
diff --git a/phpBB/config/default/container/services_event.yml b/phpBB/config/default/container/services_event.yml
index 1ccef78f9b..8fd4faa274 100644
--- a/phpBB/config/default/container/services_event.yml
+++ b/phpBB/config/default/container/services_event.yml
@@ -23,3 +23,10 @@ services:
         class: phpbb\event\kernel_terminate_subscriber
         tags:
             - { name: kernel.event_subscriber }
+
+    symfony_response_listener:
+        class: Symfony\Component\HttpKernel\EventListener\ResponseListener
+        arguments:
+            - UTF-8
+        tags:
+            - { name: kernel.event_subscriber }
diff --git a/phpBB/config/default/container/services_feed.yml b/phpBB/config/default/container/services_feed.yml
index 48bd9fe76f..2133b3c489 100644
--- a/phpBB/config/default/container/services_feed.yml
+++ b/phpBB/config/default/container/services_feed.yml
@@ -1,18 +1,25 @@
 services:
-    feed.helper:
-        class: phpbb\feed\helper
+    phpbb.feed.controller:
+        class: phpbb\feed\controller\feed
         arguments:
+            - @template.twig.environment
+            - @symfony_request
+            - @controller.helper
             - @config
+            - @dbal.conn
+            - @service_container
+            - @feed.helper
             - @user
-            - %core.root_path%
+            - @auth
             - %core.php_ext%
 
-    feed.factory:
-        class: phpbb\feed\factory
+    feed.helper:
+        class: phpbb\feed\helper
         arguments:
-            - @service_container
             - @config
-            - @dbal.conn
+            - @user
+            - %core.root_path%
+            - %core.php_ext%
 
     feed.forum:
         class: phpbb\feed\forum
diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml
index 828f9076dd..cfdade37df 100644
--- a/phpBB/config/default/container/services_files.yml
+++ b/phpBB/config/default/container/services_files.yml
@@ -1,3 +1,60 @@
 services:
     filesystem:
         class: phpbb\filesystem\filesystem
+
+    files.factory:
+        class: phpbb\files\factory
+        arguments:
+            - @service_container
+
+    files.filespec:
+        class: phpbb\files\filespec
+        scope: prototype
+        arguments:
+            - @filesystem
+            - @language
+            - @php_ini
+            - @upload_imagesize
+            - %core.root_path%
+            - @mimetype.guesser
+            - @plupload
+
+    files.upload:
+        class: phpbb\files\upload
+        scope: prototype
+        arguments:
+            - @filesystem
+            - @files.factory
+            - @language
+            - @php_ini
+            - @request
+            - %core.root_path%
+
+    files.types.form:
+        class: phpbb\files\types\form
+        scope: prototype
+        arguments:
+            - @files.factory
+            - @language
+            - @php_ini
+            - @plupload
+            - @request
+
+    files.types.local:
+        class: phpbb\files\types\form
+        scope: prototype
+        arguments:
+            - @files.factory
+            - @language
+            - @php_ini
+            - @request
+
+    files.types.remote:
+        class: phpbb\files\types\remote
+        scope: prototype
+        arguments:
+            - @files.factory
+            - @language
+            - @php_ini
+            - @request
+            - %core.root_path%
diff --git a/phpBB/config/default/container/services_php.yml b/phpBB/config/default/container/services_php.yml
index 8aabc7341f..29349960f3 100644
--- a/phpBB/config/default/container/services_php.yml
+++ b/phpBB/config/default/container/services_php.yml
@@ -1,3 +1,3 @@
 services:
     php_ini:
-        class: phpbb\php\ini
+        class: bantu\IniGetWrapper\IniGetWrapper
diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml
index f76b5e5ede..ec5ccd3b89 100644
--- a/phpBB/config/default/container/services_routing.yml
+++ b/phpBB/config/default/container/services_routing.yml
@@ -18,3 +18,14 @@ services:
             - @request_stack
         tags:
             - { name: kernel.event_subscriber }
+
+    routing.helper:
+        class: phpbb\routing\helper
+        arguments:
+            - @config
+            - @router
+            - @symfony_request
+            - @request
+            - @filesystem
+            - %core.root_path%
+            - %core.php_ext%
diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml
index 2799892376..4132be49fa 100644
--- a/phpBB/config/default/container/services_twig.yml
+++ b/phpBB/config/default/container/services_twig.yml
@@ -40,9 +40,9 @@ services:
             - { name: twig.extension }
 
     template.twig.extensions.routing:
-        class: Symfony\Bridge\Twig\Extension\RoutingExtension
+        class: phpbb\template\twig\extension\routing
         arguments:
-            - @router
+            - @routing.helper
         tags:
             - { name: twig.extension }