diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/controller/controller_test.php | 6 | ||||
| -rw-r--r-- | tests/controller/helper_route_test.php | 4 | ||||
| -rw-r--r-- | tests/pagination/pagination_test.php | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 8709f449db..597f01fa0f 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -31,10 +31,8 @@ class phpbb_controller_controller_test extends phpbb_test_case public function test_provider() { - $provider = new \phpbb\controller\provider; - $routes = $provider - ->import_paths_from_finder($this->extension_manager->get_finder()) - ->find(__DIR__); + $provider = new \phpbb\controller\provider($this->extension_manager->get_finder()); + $routes = $provider->find(__DIR__); // This will need to be updated if any new routes are defined $this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('core_controller')); diff --git a/tests/controller/helper_route_test.php b/tests/controller/helper_route_test.php index 3cd8a7237d..21dbe2a87e 100644 --- a/tests/controller/helper_route_test.php +++ b/tests/controller/helper_route_test.php @@ -80,7 +80,7 @@ class phpbb_controller_helper_route_test extends phpbb_test_case */ public function test_helper_url_no_rewrite($route, $params, $is_amp, $session_id, $expected, $description) { - $this->helper = new \phpbb\controller\helper($this->finder, $this->template, $this->user, $this->config, dirname(__FILE__) . '/', 'php'); + $this->helper = new \phpbb\controller\helper($this->template, $this->user, $this->config, new \phpbb\controller\provider($this->finder), dirname(__FILE__) . '/', 'php'); $this->assertEquals(dirname(__FILE__) . '/' . $expected, $this->helper->route($route, $params, $is_amp, $session_id)); } @@ -120,7 +120,7 @@ class phpbb_controller_helper_route_test extends phpbb_test_case public function test_helper_url_with_rewrite($route, $params, $is_amp, $session_id, $expected, $description) { $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); - $this->helper = new \phpbb\controller\helper($this->finder, $this->template, $this->user, $this->config, dirname(__FILE__) . '/', 'php'); + $this->helper = new \phpbb\controller\helper($this->template, $this->user, $this->config, new \phpbb\controller\provider($this->finder), dirname(__FILE__) . '/', 'php'); $this->assertEquals(dirname(__FILE__) . '/' . $expected, $this->helper->route($route, $params, $is_amp, $session_id)); } } diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php index 38ab8e62a4..89be33ebab 100644 --- a/tests/pagination/pagination_test.php +++ b/tests/pagination/pagination_test.php @@ -38,7 +38,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case ); $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); - $this->helper = new \phpbb\controller\helper($this->finder, $this->template, $this->user, $this->config, dirname(__FILE__) . '/', 'php'); + $this->helper = new \phpbb\controller\helper($this->template, $this->user, $this->config, new \phpbb\controller\provider($this->finder), dirname(__FILE__) . '/', 'php'); $this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper); } |