6 files changed, 71 insertions, 13 deletions
diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml
index 841b50c38b..1943381f4a 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
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_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 }
 
diff --git a/phpBB/config/default/routing/feed.yml b/phpBB/config/default/routing/feed.yml
new file mode 100644
index 0000000000..22c9ea5755
--- /dev/null
+++ b/phpBB/config/default/routing/feed.yml
@@ -0,0 +1,35 @@
+phpbb_feed_forums:
+    path: /forums
+    defaults: { _controller: phpbb.feed.controller:forums }
+
+phpbb_feed_news:
+    path: /news
+    defaults: { _controller: phpbb.feed.controller:news }
+
+phpbb_feed_topics:
+    path: /topics
+    defaults: { _controller: phpbb.feed.controller:topics }
+
+phpbb_feed_topics_active:
+    path: /topics_active
+    defaults: { _controller: phpbb.feed.controller:topics_active }
+
+phpbb_feed_topics_new:
+    path: /topics_new
+    defaults: { _controller: phpbb.feed.controller:topics_new }
+
+phpbb_feed_forum:
+    path: /forum/{forum_id}
+    defaults: { _controller: phpbb.feed.controller:forum }
+    requirements:
+        forum_id: \d+
+
+phpbb_feed_topic:
+    path: /topic/{topic_id}
+    defaults: { _controller: phpbb.feed.controller:topic }
+    requirements:
+        topic_id: \d+
+
+phpbb_feed_overall:
+    path: /{mode}
+    defaults: { _controller: phpbb.feed.controller:overall }
diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml
index b7e7a69b4f..073984841a 100644
--- a/phpBB/config/default/routing/routing.yml
+++ b/phpBB/config/default/routing/routing.yml
@@ -8,6 +8,14 @@
 # instantiate the "foo_service" service and call the "method" method.
 #
 
+phpbb_feed_routing:
+    resource: "feed.yml"
+    prefix: /feed
+
+phpbb_feed_index:
+    path: /feed
+    defaults: { _controller: phpbb.feed.controller:overall }
+
 phpbb_help_routing:
     resource: "help.yml"
     prefix: /help