diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 16:21:02 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 16:21:02 -0700 |
| commit | 179f41475b555d0a3314d779d0d7423f66f0fb95 (patch) | |
| tree | 8664f91f4fa58765cc34333b248c34b75ab91758 /tests/controller | |
| parent | af2ad7a162d7b4cf4bf617e97f601c6cb7d406d0 (diff) | |
| parent | 213e7563ad4565b322680ce2f3526a7130d2a90e (diff) | |
| download | forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar.gz forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar.bz2 forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar.xz forums-179f41475b555d0a3314d779d0d7423f66f0fb95.zip | |
Merge pull request #1735 from nickvergessen/ticket/11852
Ticket/11852 filesystem class must not depend on a web request
Diffstat (limited to 'tests/controller')
| -rw-r--r-- | tests/controller/helper_url_test.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php index 4ea177074f..33fc6c4f1b 100644 --- a/tests/controller/helper_url_test.php +++ b/tests/controller/helper_url_test.php @@ -49,14 +49,15 @@ class phpbb_controller_helper_url_test extends phpbb_test_case $phpbb_dispatcher = new phpbb_mock_event_dispatcher; $this->user = $this->getMock('\phpbb\user'); - $phpbb_filesystem = new \phpbb\filesystem( + $phpbb_path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() ), + new \phpbb\filesystem(), $phpbb_root_path, $phpEx ); - $this->template = new phpbb\template\twig\twig($phpbb_filesystem, $config, $this->user, new \phpbb\template\context()); + $this->template = new phpbb\template\twig\twig($phpbb_path_helper, $config, $this->user, new \phpbb\template\context()); // We don't use mod_rewrite in these tests $config = new \phpbb\config\config(array('enable_mod_rewrite' => '0')); @@ -101,14 +102,15 @@ class phpbb_controller_helper_url_test extends phpbb_test_case $phpbb_dispatcher = new phpbb_mock_event_dispatcher; $this->user = $this->getMock('\phpbb\user'); - $phpbb_filesystem = new \phpbb\filesystem( + $phpbb_path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() ), + new \phpbb\filesystem(), $phpbb_root_path, $phpEx ); - $this->template = new \phpbb\template\twig\twig($phpbb_filesystem, $config, $this->user, new \phpbb\template\context()); + $this->template = new \phpbb\template\twig\twig($phpbb_path_helper, $config, $this->user, new \phpbb\template\context()); $config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); $helper = new \phpbb\controller\helper($this->template, $this->user, $config, '', 'php'); |