diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-10 15:24:43 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-10 15:24:43 +0200 |
| commit | d998efcf54f3a7ec202a98555c70094aede7ec42 (patch) | |
| tree | a69aa6fd09f7d8a8f386bb7f3520c6a3dbde213b /tests/notification/submit_post_base.php | |
| parent | 58a863dbadbb316076647cfa235c69951d66df77 (diff) | |
| parent | 54b0ebc4106b985053e0c1827283e77fcfb596af (diff) | |
| download | forums-d998efcf54f3a7ec202a98555c70094aede7ec42.tar forums-d998efcf54f3a7ec202a98555c70094aede7ec42.tar.gz forums-d998efcf54f3a7ec202a98555c70094aede7ec42.tar.bz2 forums-d998efcf54f3a7ec202a98555c70094aede7ec42.tar.xz forums-d998efcf54f3a7ec202a98555c70094aede7ec42.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'tests/notification/submit_post_base.php')
| -rw-r--r-- | tests/notification/submit_post_base.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index bd926e2a98..684dd99280 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -85,7 +85,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); // User - $user = $this->getMock('\phpbb\user'); + $user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime')); $user->ip = ''; $user->data = array( 'user_id' => 2, |