diff options
author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-07 23:09:13 +0200 |
---|---|---|
committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-08 14:15:44 +0200 |
commit | 403c647b9e84640977ca0f98d21d15ceb4957bdb (patch) | |
tree | 43ef25beb7444ee2f49f5a814f51b0f268b7bb2e /tests/controller/common_helper_route.php | |
parent | 82743c792287a1efe906c231df7d22dadc8bedcd (diff) | |
download | forums-403c647b9e84640977ca0f98d21d15ceb4957bdb.tar forums-403c647b9e84640977ca0f98d21d15ceb4957bdb.tar.gz forums-403c647b9e84640977ca0f98d21d15ceb4957bdb.tar.bz2 forums-403c647b9e84640977ca0f98d21d15ceb4957bdb.tar.xz forums-403c647b9e84640977ca0f98d21d15ceb4957bdb.zip |
[ticket/14220] Move route loading to services
PHPBB3-14220
Diffstat (limited to 'tests/controller/common_helper_route.php')
-rw-r--r-- | tests/controller/common_helper_route.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php index 4c0c8569a3..72c5328b0b 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -122,9 +122,11 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case ) ); - $this->router = new phpbb_mock_router($container, $this->filesystem, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT, $this->extension_manager); - $this->router->find_routing_files($this->extension_manager->all_enabled(false)); - $this->router->find(dirname(__FILE__) . '/'); + $loader = new \Symfony\Component\Routing\Loader\YamlFileLoader( + new \phpbb\routing\file_locator($this->filesystem, dirname(__FILE__) . '/') + ); + $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $this->extension_manager); + $this->router = new phpbb_mock_router($container, $resources_locator, $loader, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT); // Set correct current phpBB root path $this->root_path = $this->get_phpbb_root_path(); |