diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-10 15:23:15 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-10 15:23:15 +0200 |
| commit | 54b0ebc4106b985053e0c1827283e77fcfb596af (patch) | |
| tree | c024029d308d89ed7279fcc50de955a629f8f445 /tests/controller | |
| parent | 472fe9fe60fc60a8f540456736e10f92b9809cd6 (diff) | |
| parent | f0852dcf1af3b0c99cfa71618b543b4f7ab7ccbe (diff) | |
| download | forums-54b0ebc4106b985053e0c1827283e77fcfb596af.tar forums-54b0ebc4106b985053e0c1827283e77fcfb596af.tar.gz forums-54b0ebc4106b985053e0c1827283e77fcfb596af.tar.bz2 forums-54b0ebc4106b985053e0c1827283e77fcfb596af.tar.xz forums-54b0ebc4106b985053e0c1827283e77fcfb596af.zip | |
Merge pull request #2862 from marc1706/ticket/12932
[ticket/12932] Add method for allowing override of \phpbb\datetime class
* marc1706/ticket/12932:
[ticket/12932] Remove set_datetime_class method from user class
[ticket/12932] Fix tests and calls to create_datetime
[ticket/12932] Add method for getting the datetime class and allow overriding
Diffstat (limited to 'tests/controller')
| -rw-r--r-- | tests/controller/controller_test.php | 2 | ||||
| -rw-r--r-- | tests/controller/helper_route_test.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 67faf83e29..58bcf0ef81 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -72,7 +72,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, dirname(__FILE__) . '/'); + $resolver = new \phpbb\controller\resolver(new \phpbb\user('\phpbb\datetime'), $container, dirname(__FILE__) . '/'); $symfony_request = new Request(); $symfony_request->attributes->set('_controller', 'foo.controller:handle'); diff --git a/tests/controller/helper_route_test.php b/tests/controller/helper_route_test.php index 206c3a4f0b..04bff81683 100644 --- a/tests/controller/helper_route_test.php +++ b/tests/controller/helper_route_test.php @@ -20,7 +20,7 @@ class phpbb_controller_helper_route_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'); + $this->user = new \phpbb\user('\phpbb\datetime'); $phpbb_path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( new phpbb_mock_request() |