mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 05:50:42 +02:00
[ticket/12090] Make provider a service and inject it into the helper
PHPBB3-12090
This commit is contained in:
@@ -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'));
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user