aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config/default/container
diff options
context:
space:
mode:
authorNicofuma <github@nicofuma.fr>2015-02-22 23:36:27 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-08-23 22:36:10 +0200
commit8e5e954438b232f4ce7aec6a5db3d52b974c07a8 (patch)
tree26eb33e968d8b7a48f40bb092b751a1a708a8f59 /phpBB/config/default/container
parentf56fe0ba8da2211d3947369e79952f294cffe7d6 (diff)
downloadforums-8e5e954438b232f4ce7aec6a5db3d52b974c07a8.tar
forums-8e5e954438b232f4ce7aec6a5db3d52b974c07a8.tar.gz
forums-8e5e954438b232f4ce7aec6a5db3d52b974c07a8.tar.bz2
forums-8e5e954438b232f4ce7aec6a5db3d52b974c07a8.tar.xz
forums-8e5e954438b232f4ce7aec6a5db3d52b974c07a8.zip
[ticket/13645] Move the feeds to controllers
PHPBB3-13645
Diffstat (limited to 'phpBB/config/default/container')
-rw-r--r--phpBB/config/default/container/services.yml5
-rw-r--r--phpBB/config/default/container/services_feed.yml21
-rw-r--r--phpBB/config/default/container/services_routing.yml11
-rw-r--r--phpBB/config/default/container/services_twig.yml4
4 files changed, 28 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 }