aboutsummaryrefslogtreecommitdiffstats
path: root/tests/mock
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-04-16 15:14:04 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-04-16 15:14:04 +0200
commit1b63292cc3f1d55d81d38c695958a9a1c290a6c5 (patch)
tree4222993adfbbca37d66512dc3d4191089d0d92e6 /tests/mock
parent9d35258532ad232868c38b275b4df32089086d37 (diff)
parent1cbc6dedab1e5d02872d9ed185125383abd96de1 (diff)
downloadforums-1b63292cc3f1d55d81d38c695958a9a1c290a6c5.tar
forums-1b63292cc3f1d55d81d38c695958a9a1c290a6c5.tar.gz
forums-1b63292cc3f1d55d81d38c695958a9a1c290a6c5.tar.bz2
forums-1b63292cc3f1d55d81d38c695958a9a1c290a6c5.tar.xz
forums-1b63292cc3f1d55d81d38c695958a9a1c290a6c5.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'tests/mock')
-rw-r--r--tests/mock/extension_manager.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php
index 2ce61c5149..4e48278bbd 100644
--- a/tests/mock/extension_manager.php
+++ b/tests/mock/extension_manager.php
@@ -20,5 +20,7 @@ class phpbb_mock_extension_manager extends \phpbb\extension\manager
$this->extensions = $extensions;
$this->filesystem = new \phpbb\filesystem\filesystem();
$this->container = $container;
+ $this->config = new \phpbb\config\config(array());
+ $this->user = new \phpbb\user('\phpbb\datetime');
}
}