From 74dbaac0394f45955553ff46515404fe5b06bfba Mon Sep 17 00:00:00 2001 From: MateBartus Date: Thu, 30 Apr 2015 22:40:17 +0200 Subject: [ticket/13800] Make router's extension manager dependency optional PHPBB3-13800 --- phpBB/config/default/container/services_routing.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 phpBB/config/default/container/services_routing.yml (limited to 'phpBB/config/default/container/services_routing.yml') diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml new file mode 100644 index 0000000000..6749202c0d --- /dev/null +++ b/phpBB/config/default/container/services_routing.yml @@ -0,0 +1,19 @@ +services: + router: + class: phpbb\routing\router + arguments: + - @filesystem + - %core.root_path% + - %core.php_ext% + - %core.environment% + - @ext.manager + + router.listener: + class: Symfony\Component\HttpKernel\EventListener\RouterListener + arguments: + - @router + - null + - null + - @request_stack + tags: + - { name: kernel.event_subscriber } -- cgit v1.2.1 From 66c0e0c6a83fbf091aa078ab06dd6467c8c6aa11 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 4 May 2015 15:10:33 +0200 Subject: [ticket/13388] Integrate routing and di parameters resolution PHPBB3-13388 --- phpBB/config/default/container/services_routing.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config/default/container/services_routing.yml') diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml index 6749202c0d..f76b5e5ede 100644 --- a/phpBB/config/default/container/services_routing.yml +++ b/phpBB/config/default/container/services_routing.yml @@ -2,6 +2,7 @@ services: router: class: phpbb\routing\router arguments: + - @service_container - @filesystem - %core.root_path% - %core.php_ext% -- cgit v1.2.1 From 8e5e954438b232f4ce7aec6a5db3d52b974c07a8 Mon Sep 17 00:00:00 2001 From: Nicofuma Date: Sun, 22 Feb 2015 23:36:27 +0100 Subject: [ticket/13645] Move the feeds to controllers PHPBB3-13645 --- phpBB/config/default/container/services_routing.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'phpBB/config/default/container/services_routing.yml') 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% -- cgit v1.2.1 From 403c647b9e84640977ca0f98d21d15ceb4957bdb Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 7 Oct 2015 23:09:13 +0200 Subject: [ticket/14220] Move route loading to services PHPBB3-14220 --- .../config/default/container/services_routing.yml | 53 +++++++++++++++++++++- 1 file changed, 51 insertions(+), 2 deletions(-) (limited to 'phpBB/config/default/container/services_routing.yml') 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 } -- cgit v1.2.1 From 8f5a0ad6f73e7b7757b02c827436384c96069b5a Mon Sep 17 00:00:00 2001 From: Mate Bartus Date: Fri, 24 Jul 2015 09:20:50 +0200 Subject: [ticket/14039] Revamp updater PHPBB3-14039 --- phpBB/config/default/container/services_routing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/config/default/container/services_routing.yml') diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml index 12fc98ce74..4bedc951ee 100644 --- a/phpBB/config/default/container/services_routing.yml +++ b/phpBB/config/default/container/services_routing.yml @@ -56,7 +56,7 @@ services: tags: - { name: routing.loader } -# ---- Resources Locators ---- +# ---- Resources Locators ---- routing.chained_resources_locator: class: phpbb\routing\resources_locator\chained_resources_locator -- cgit v1.2.1 From d9d89cad94eada62e900a012046b8d45c5aa3129 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 7 Dec 2015 13:11:22 -0800 Subject: [ticket/14247] Use quotes around @ and % strings in YAML PHPBB3-14247 --- .../config/default/container/services_routing.yml | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'phpBB/config/default/container/services_routing.yml') diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml index 4bedc951ee..3cb74ca2b1 100644 --- a/phpBB/config/default/container/services_routing.yml +++ b/phpBB/config/default/container/services_routing.yml @@ -2,57 +2,57 @@ services: router: class: phpbb\routing\router arguments: - - @service_container - - @routing.chained_resources_locator - - @routing.delegated_loader - - %core.root_path% - - %core.php_ext% - - %core.environment% + - '@service_container' + - '@routing.chained_resources_locator' + - '@routing.delegated_loader' + - '%core.root_path%' + - '%core.php_ext%' + - '%core.environment%' router.listener: class: Symfony\Component\HttpKernel\EventListener\RouterListener arguments: - - @router + - '@router' - null - null - - @request_stack + - '@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% + - '@config' + - '@router' + - '@symfony_request' + - '@request' + - '@filesystem' + - '%core.root_path%' + - '%core.php_ext%' # ---- Route loaders ---- routing.delegated_loader: class: Symfony\Component\Config\Loader\DelegatingLoader arguments: - - @routing.resolver + - '@routing.resolver' routing.resolver: class: phpbb\routing\loader_resolver arguments: - - @routing.loader.collection + - '@routing.loader.collection' routing.loader.collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: routing.loader } routing.loader.yaml: class: Symfony\Component\Routing\Loader\YamlFileLoader arguments: - - @file_locator + - '@file_locator' tags: - { name: routing.loader } @@ -61,20 +61,20 @@ services: routing.chained_resources_locator: class: phpbb\routing\resources_locator\chained_resources_locator arguments: - - @routing.resources_locator.collection + - '@routing.resources_locator.collection' routing.resources_locator.collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@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 + - '%core.root_path%' + - '%core.environment%' + - '@ext.manager' tags: - { name: routing.resources_locator } -- cgit v1.2.1 From 56c2caf6c0778c0da48fe0ac688c893777b89ee4 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 23 Mar 2016 22:48:58 +0100 Subject: [ticket/14555] Uniformize cache directory usages PHPBB3-14555 --- phpBB/config/default/container/services_routing.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/config/default/container/services_routing.yml') diff --git a/phpBB/config/default/container/services_routing.yml b/phpBB/config/default/container/services_routing.yml index 3cb74ca2b1..3048145a2f 100644 --- a/phpBB/config/default/container/services_routing.yml +++ b/phpBB/config/default/container/services_routing.yml @@ -5,9 +5,8 @@ services: - '@service_container' - '@routing.chained_resources_locator' - '@routing.delegated_loader' - - '%core.root_path%' - '%core.php_ext%' - - '%core.environment%' + - '%core.cache_dir%' router.listener: class: Symfony\Component\HttpKernel\EventListener\RouterListener -- cgit v1.2.1