aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-06-05 10:09:05 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-06-05 10:09:05 +0200
commit59ac18c03ed611d21c68909b4ca5e22e4ad000ff (patch)
treebb762f927c966d301122f51693ef8e0efd9d39de
parentc8ccae7a7c253d15685d68a740dc3e1129f06082 (diff)
parent49f2dd8c5e42265c9b1a21953922644f84752c16 (diff)
downloadforums-59ac18c03ed611d21c68909b4ca5e22e4ad000ff.tar
forums-59ac18c03ed611d21c68909b4ca5e22e4ad000ff.tar.gz
forums-59ac18c03ed611d21c68909b4ca5e22e4ad000ff.tar.bz2
forums-59ac18c03ed611d21c68909b4ca5e22e4ad000ff.tar.xz
forums-59ac18c03ed611d21c68909b4ca5e22e4ad000ff.zip
Merge pull request #3682 from marc1706/ticket/13564
[ticket/13564] Fix user_delete_test on master
-rw-r--r--tests/functions/user_delete_test.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php
index db52dcded7..21561492fd 100644
--- a/tests/functions/user_delete_test.php
+++ b/tests/functions/user_delete_test.php
@@ -28,10 +28,12 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
{
parent::setUp();
- global $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $user;
+ global $cache, $config, $db, $phpbb_container, $phpbb_dispatcher, $user, $phpbb_root_path, $phpEx;
$this->db = $db = $this->new_dbal();
- $user = new \phpbb\user('\phpbb\datetime');
+ $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
+ $lang = new \phpbb\language\language($lang_loader);
+ $user = new \phpbb\user($lang, '\phpbb\datetime');
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$phpbb_container = new phpbb_mock_container_builder();
$config = new \phpbb\config\config(array(
@@ -39,8 +41,7 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
'auth_oauth_google_key' => 'foo',
'auth_oauth_google_secret' => 'bar',
));
- set_config_count('foobar', 0, false, $config);
- $cache = new \phpbb\cache\driver\null();
+ $cache = new \phpbb\cache\driver\dummy();
$request = new phpbb_mock_request();
$notification_manager = new phpbb_mock_notification_manager();
$provider_collection = new \phpbb\auth\provider_collection($phpbb_container, $config);