1 files changed, 29 insertions, 28 deletions
diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml
index c74bef3d66..6cc38516ae 100644
--- a/phpBB/config/default/container/services_avatar.yml
+++ b/phpBB/config/default/container/services_avatar.yml
@@ -2,26 +2,26 @@ services:
     avatar.manager:
         class: phpbb\avatar\manager
         arguments:
-            - @config
-            - @avatar.driver_collection
+            - '@config'
+            - '@avatar.driver_collection'
 
 # ----- Avatar drivers -----
     avatar.driver_collection:
         class: phpbb\di\service_collection
         arguments:
-            - @service_container
+            - '@service_container'
         tags:
             - { name: service_collection, tag: avatar.driver }
 
     avatar.driver.gravatar:
         class: phpbb\avatar\driver\gravatar
         arguments:
-            - @config
-            - @upload_imagesize
-            - %core.root_path%
-            - %core.php_ext%
-            - @path_helper
-            - @cache.driver
+            - '@config'
+            - '@upload_imagesize'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@path_helper'
+            - '@cache.driver'
         calls:
             - [set_name, [avatar.driver.gravatar]]
         tags:
@@ -30,12 +30,12 @@ services:
     avatar.driver.local:
         class: phpbb\avatar\driver\local
         arguments:
-            - @config
-            - @upload_imagesize
-            - %core.root_path%
-            - %core.php_ext%
-            - @path_helper
-            - @cache.driver
+            - '@config'
+            - '@upload_imagesize'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@path_helper'
+            - '@cache.driver'
         calls:
             - [set_name, [avatar.driver.local]]
         tags:
@@ -44,12 +44,12 @@ services:
     avatar.driver.remote:
         class: phpbb\avatar\driver\remote
         arguments:
-            - @config
-            - @upload_imagesize
-            - %core.root_path%
-            - %core.php_ext%
-            - @path_helper
-            - @cache.driver
+            - '@config'
+            - '@upload_imagesize'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@path_helper'
+            - '@cache.driver'
         calls:
             - [set_name, [avatar.driver.remote]]
         tags:
@@ -58,13 +58,14 @@ services:
     avatar.driver.upload:
         class: phpbb\avatar\driver\upload
         arguments:
-            - @config
-            - %core.root_path%
-            - %core.php_ext%
-            - @filesystem
-            - @path_helper
-            - @mimetype.guesser
-            - @cache.driver
+            - '@config'
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@filesystem'
+            - '@path_helper'
+            - '@dispatcher'
+            - '@files.factory'
+            - '@cache.driver'
         calls:
             - [set_name, [avatar.driver.upload]]
         tags: