diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 15:47:23 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 15:47:23 +0200 |
| commit | 8d17cf5a70744b3e8cfd4edf57d2924658414604 (patch) | |
| tree | 68aac3d3c5db176c83dec4cfe7c1396baf0ce282 /tests/controller/controller_test.php | |
| parent | 7ec0289b83e2f3cee4e751e3a0e71ee861cb1332 (diff) | |
| parent | f37ff48e2c1edc643c25db6f213c56de6a27464e (diff) | |
| download | forums-8d17cf5a70744b3e8cfd4edf57d2924658414604.tar forums-8d17cf5a70744b3e8cfd4edf57d2924658414604.tar.gz forums-8d17cf5a70744b3e8cfd4edf57d2924658414604.tar.bz2 forums-8d17cf5a70744b3e8cfd4edf57d2924658414604.tar.xz forums-8d17cf5a70744b3e8cfd4edf57d2924658414604.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12529] Move $phpbb_root_path to the end of the constructor
[ticket/12529] Use root_path in controller\resolver to check the template dir
Diffstat (limited to 'tests/controller/controller_test.php')
| -rw-r--r-- | tests/controller/controller_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 7b8b78dd22..e0564f0a11 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -68,7 +68,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, dirname(__FILE__) . '/'); $symfony_request = new Request(); $symfony_request->attributes->set('_controller', 'foo.controller:handle'); |