diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-03 14:00:47 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-03 14:00:47 +0200 |
| commit | 8d9133a30e576d9f4315bc914b56c7be5481ebf4 (patch) | |
| tree | 5bc5afef2e520f5af518f241f98303027e245c3e | |
| parent | 0d893d65eb2823aae449a9201941798e450a9be1 (diff) | |
| download | forums-8d9133a30e576d9f4315bc914b56c7be5481ebf4.tar forums-8d9133a30e576d9f4315bc914b56c7be5481ebf4.tar.gz forums-8d9133a30e576d9f4315bc914b56c7be5481ebf4.tar.bz2 forums-8d9133a30e576d9f4315bc914b56c7be5481ebf4.tar.xz forums-8d9133a30e576d9f4315bc914b56c7be5481ebf4.zip | |
[ticket/11497] Use a mock object to define the root folder for the finder
PHPBB3-11497
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 2 | ||||
| -rw-r--r-- | tests/controller/helper_route_test.php | 4 | ||||
| -rw-r--r-- | tests/mock/controller_helper.php | 22 |
3 files changed, 25 insertions, 3 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index ab3e3b3556..9f1a3864ef 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -68,7 +68,7 @@ class helper $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; $provider->set_ext_finder($manager->get_finder()); - $this->route_collection = $provider->find('./')->get_routes(); + $this->route_collection = $provider->find($phpbb_root_path)->get_routes(); } /** diff --git a/tests/controller/helper_route_test.php b/tests/controller/helper_route_test.php index e40fa280da..c633df7c38 100644 --- a/tests/controller/helper_route_test.php +++ b/tests/controller/helper_route_test.php @@ -84,7 +84,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->template, $this->user, $this->config, $this->provider, $this->extension_manager,'', 'php'); + $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->provider, $this->extension_manager, '', 'php', dirname(__FILE__) . '/'); $this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id)); } @@ -124,7 +124,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->template, $this->user, $this->config, $this->provider, $this->extension_manager,'', 'php'); + $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->provider, $this->extension_manager, '', 'php', dirname(__FILE__) . '/'); $this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id)); } } diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php new file mode 100644 index 0000000000..c53d7265c4 --- /dev/null +++ b/tests/mock/controller_helper.php @@ -0,0 +1,22 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2011 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +class phpbb_mock_controller_helper extends \phpbb\controller\helper +{ + public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, $phpbb_root_path, $php_ext, $phpbb_root_path_ext) + { + $this->template = $template; + $this->user = $user; + $this->config = $config; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $php_ext; + $provider->set_ext_finder($manager->get_finder()); + $this->route_collection = $provider->find($phpbb_root_path_ext)->get_routes(); + } +} |