aboutsummaryrefslogtreecommitdiffstats
path: root/tests/controller/controller_test.php
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-11-20 22:40:37 +0100
committerTristan Darricau <github@nicofuma.fr>2014-11-20 23:15:49 +0100
commit677b5b2cd4937ee6c777728082084c661223dee8 (patch)
tree4342890f46004943e15a2cfd8ccdd559619bb53c /tests/controller/controller_test.php
parent93f61a4a7d34f8ad565bdc1605784284994ecdfc (diff)
downloadforums-677b5b2cd4937ee6c777728082084c661223dee8.tar
forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.gz
forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.bz2
forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.xz
forums-677b5b2cd4937ee6c777728082084c661223dee8.zip
[ticket/12620] Fix rebase
PHPBB3-12620
Diffstat (limited to 'tests/controller/controller_test.php')
-rw-r--r--tests/controller/controller_test.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 637e9685e6..354a902831 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -40,8 +40,8 @@ class phpbb_controller_controller_test extends phpbb_test_case
public function test_router_find_files()
{
- $router = new \phpbb\routing\router($this->extension_manager, dirname(__FILE__) . '/', 'php');
- $router->find_routing_files($this->extension_manager->get_finder());
+ $router = new \phpbb\routing\router($this->extension_manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT);
+ $router->find_routing_files($this->extension_manager->all_enabled());
$routes = $router->find(__DIR__)->get_routes();
// This will need to be updated if any new routes are defined