diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-03-15 14:02:46 +0100 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-15 09:18:14 -0400 |
| commit | 076711d9a95e05083143b7ac4a589914a2e2b2ad (patch) | |
| tree | 06182df5afc6b3e112171faac88925761be749d5 | |
| parent | 9259e635cacce34699115b909f256f9302ec3aaa (diff) | |
| download | forums-076711d9a95e05083143b7ac4a589914a2e2b2ad.tar forums-076711d9a95e05083143b7ac4a589914a2e2b2ad.tar.gz forums-076711d9a95e05083143b7ac4a589914a2e2b2ad.tar.bz2 forums-076711d9a95e05083143b7ac4a589914a2e2b2ad.tar.xz forums-076711d9a95e05083143b7ac4a589914a2e2b2ad.zip | |
[ticket/11334] Use mocks instead of making parameters optional
PHPBB3-11334
| -rw-r--r-- | phpBB/includes/controller/helper.php | 2 | ||||
| -rw-r--r-- | tests/controller/helper_url_test.php | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/includes/controller/helper.php b/phpBB/includes/controller/helper.php index 4c021849f4..1464267711 100644 --- a/phpBB/includes/controller/helper.php +++ b/phpBB/includes/controller/helper.php @@ -55,7 +55,7 @@ class phpbb_controller_helper * @param string $phpbb_root_path phpBB root path * @param string $php_ext PHP extension */ - public function __construct(phpbb_template $template = null, phpbb_user $user = null, $phpbb_root_path = './', $php_ext = '.php') + public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext) { $this->template = $template; $this->user = $user; diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php index 6e3f535cf3..7754278219 100644 --- a/tests/controller/helper_url_test.php +++ b/tests/controller/helper_url_test.php @@ -48,7 +48,11 @@ class phpbb_controller_helper_url_test extends phpbb_test_case global $phpbb_dispatcher; $phpbb_dispatcher = new phpbb_mock_event_dispatcher; - $helper = new phpbb_controller_helper; + $this->style_resource_locator = new phpbb_style_resource_locator(); + $this->user = $this->getMock('phpbb_user'); + $this->template = new phpbb_template($phpbb_root_path, $phpEx, $config, $this->user, $this->style_resource_locator, new phpbb_template_context()); + + $helper = new phpbb_controller_helper($this->template, $this->user, '', '.php'); $this->assertEquals($helper->url($route, $params, $is_amp, $session_id), $expected); } } |