Merge pull request #3487 from MateBartus/ticket/13697

[ticket/13697] Moving filesystem related functions to filesystem service

phpBB/config/default/container/services.yml

@@ -104,7 +104,7 @@ services:
             - @cache.driver
 
     filesystem:
-        class: phpbb\filesystem
+        class: phpbb\filesystem\filesystem
 
     file_downloader:
         class: phpbb\file_downloader
@@ -160,6 +160,7 @@ services:
     router:
         class: phpbb\routing\router
         arguments:
+            - @filesystem
             - @ext.manager
             - %core.root_path%
             - %core.php_ext%

phpBB/config/default/container/services_avatar.yml

@@ -58,6 +58,7 @@ services:
             - @config
             - %core.root_path%
             - %core.php_ext%
+            - @filesystem
             - @path_helper
             - @mimetype.guesser
             - @cache.driver

phpBB/config/default/container/services_console.yml

@@ -84,6 +84,7 @@ services:
             - @config
             - @cache
             - @log
+            - @filesystem
             - %core.root_path%
         tags:
             - { name: console.command }

phpBB/config/default/container/services_twig.yml

@@ -19,6 +19,8 @@ services:
 
     template.twig.loader:
         class: phpbb\template\twig\loader
+        arguments:
+            - @filesystem
 
     template.twig.extensions.collection:
         class: phpbb\di\service_collection