diff options
Diffstat (limited to 'tests/controller')
| -rw-r--r-- | tests/controller/controller_test.php | 4 | ||||
| -rw-r--r-- | tests/controller/helper_url_test.php | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index dfc4f80469..9445ea53d4 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -31,7 +31,7 @@ class phpbb_controller_controller_test extends phpbb_test_case public function test_provider() { - $provider = new phpbb_controller_provider; + $provider = new \phpbb\controller\provider; $routes = $provider ->import_paths_from_finder($this->extension_manager->get_finder()) ->find('./tests/controller/'); @@ -62,7 +62,7 @@ class phpbb_controller_controller_test extends phpbb_test_case include(__DIR__.'/phpbb/controller/foo.php'); } - $resolver = new phpbb_controller_resolver(new phpbb_user, $container); + $resolver = new \phpbb\controller\resolver(new \phpbb\user, $container); $symfony_request = new Request(); $symfony_request->attributes->set('_controller', 'foo.controller:handle'); diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php index 2dd7269caa..6e53db9ba2 100644 --- a/tests/controller/helper_url_test.php +++ b/tests/controller/helper_url_test.php @@ -48,19 +48,19 @@ class phpbb_controller_helper_url_test extends phpbb_test_case global $phpbb_dispatcher, $phpbb_root_path, $phpEx; $phpbb_dispatcher = new phpbb_mock_event_dispatcher; - $this->user = $this->getMock('phpbb_user'); - $phpbb_filesystem = new phpbb_filesystem( - new phpbb_symfony_request( + $this->user = $this->getMock('\phpbb\user'); + $phpbb_filesystem = new \phpbb\filesystem( + new \phpbb\symfony\request( new phpbb_mock_request() ), $phpbb_root_path, $phpEx ); - $this->template = new phpbb_template_twig($phpbb_filesystem, $config, $this->user, new phpbb_template_context()); + $this->template = new phpbb\template\twig\twig($phpbb_filesystem, $config, $this->user, new \phpbb\template\context()); // We don't use mod_rewrite in these tests - $config = new phpbb_config(array('enable_mod_rewrite' => '0')); - $helper = new phpbb_controller_helper($this->template, $this->user, $config, '', 'php'); + $config = new \phpbb\config\config(array('enable_mod_rewrite' => '0')); + $helper = new \phpbb\controller\helper($this->template, $this->user, $config, '', 'php'); $this->assertEquals($helper->url($route, $params, $is_amp, $session_id), $expected); } @@ -100,18 +100,18 @@ class phpbb_controller_helper_url_test extends phpbb_test_case global $phpbb_dispatcher, $phpbb_root_path, $phpEx; $phpbb_dispatcher = new phpbb_mock_event_dispatcher; - $this->user = $this->getMock('phpbb_user'); - $phpbb_filesystem = new phpbb_filesystem( - new phpbb_symfony_request( + $this->user = $this->getMock('\phpbb\user'); + $phpbb_filesystem = new \phpbb\filesystem( + new \phpbb\symfony\request( new phpbb_mock_request() ), $phpbb_root_path, $phpEx ); - $this->template = new phpbb_template_twig($phpbb_filesystem, $config, $this->user, new phpbb_template_context()); + $this->template = new \phpbb\template\twig\twig($phpbb_filesystem, $config, $this->user, new \phpbb\template\context()); - $config = new phpbb_config(array('enable_mod_rewrite' => '1')); - $helper = new phpbb_controller_helper($this->template, $this->user, $config, '', 'php'); + $config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); + $helper = new \phpbb\controller\helper($this->template, $this->user, $config, '', 'php'); $this->assertEquals($helper->url($route, $params, $is_amp, $session_id), $expected); } } |