2 files changed, 57 insertions, 2 deletions
diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml
index 288785201c..9bbcdcbd57 100644
--- a/phpBB/config/default/container/services.yml
+++ b/phpBB/config/default/container/services.yml
@@ -110,6 +110,12 @@ services:
     file_downloader:
         class: phpbb\file_downloader
 
+    file_locator:
+        class: phpbb\routing\file_locator
+        arguments:
+            - @filesystem
+            - %core.root_path%
+
     group_helper:
         class: phpbb\group\helper
         arguments:
diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml
index ec5ccd3b89..12fc98ce74 100644
--- a/phpBB/config/default/container/services_routing.yml
+++ b/phpBB/config/default/container/services_routing.yml
@@ -3,11 +3,11 @@ services:
         class: phpbb\routing\router
         arguments:
             - @service_container
-            - @filesystem
+            - @routing.chained_resources_locator
+            - @routing.delegated_loader
             - %core.root_path%
             - %core.php_ext%
             - %core.environment%
-            - @ext.manager
 
     router.listener:
         class: Symfony\Component\HttpKernel\EventListener\RouterListener
@@ -29,3 +29,52 @@ services:
             - @filesystem
             - %core.root_path%
             - %core.php_ext%
+
+# ---- Route loaders ----
+
+    routing.delegated_loader:
+        class: Symfony\Component\Config\Loader\DelegatingLoader
+        arguments:
+            - @routing.resolver
+
+    routing.resolver:
+        class: phpbb\routing\loader_resolver
+        arguments:
+            - @routing.loader.collection
+
+    routing.loader.collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: routing.loader }
+
+    routing.loader.yaml:
+        class: Symfony\Component\Routing\Loader\YamlFileLoader
+        arguments:
+            - @file_locator
+        tags:
+            - { name: routing.loader }
+
+# ---- Resources Locators ----
+
+    routing.chained_resources_locator:
+        class: phpbb\routing\resources_locator\chained_resources_locator
+        arguments:
+            - @routing.resources_locator.collection
+
+    routing.resources_locator.collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: routing.resources_locator }
+
+    routing.resources_locator.default:
+        class: phpbb\routing\resources_locator\default_resources_locator
+        arguments:
+            - %core.root_path%
+            - %core.environment%
+            - @ext.manager
+        tags:
+            - { name: routing.resources_locator }