Merge pull request #3470 from Nicofuma/ticket/13645

[ticket/13645] Move the feeds to controllers

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

phpBB/config/default/container/services_feed.yml

@@ -1,4 +1,18 @@
 services:
+    phpbb.feed.controller:
+        class: phpbb\feed\controller\feed
+        arguments:
+            - @template.twig.environment
+            - @symfony_request
+            - @controller.helper
+            - @config
+            - @dbal.conn
+            - @service_container
+            - @feed.helper
+            - @user
+            - @auth
+            - %core.php_ext%
+
     feed.helper:
         class: phpbb\feed\helper
         arguments:
@@ -7,13 +21,6 @@ services:
             - %core.root_path%
             - %core.php_ext%
 
-    feed.factory:
-        class: phpbb\feed\factory
-        arguments:
-            - @service_container
-            - @config
-            - @dbal.conn
-
     feed.forum:
         class: phpbb\feed\forum
         scope: prototype

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%

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 }