aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework/phpbb_functional_test_case.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-30 23:01:57 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-30 23:01:57 +0200
commite8af120037b0098f35b25a461d11c4977dae4582 (patch)
treec8b13394ce875cc7e9fd912aff2af3647b86269e /tests/test_framework/phpbb_functional_test_case.php
parentbe8770532c8bda7b5d73075705518ac1bb5d3d37 (diff)
parent9f87c497fe25611ddd2f6963ce38b7edad876de3 (diff)
downloadforums-e8af120037b0098f35b25a461d11c4977dae4582.tar
forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.gz
forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.bz2
forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.xz
forums-e8af120037b0098f35b25a461d11c4977dae4582.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/11467] Add user object to extension manager for tests [ticket/11467] Add language variables to tests [ticket/11467] Add language variables for extension exception messages
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
-rw-r--r--tests/test_framework/phpbb_functional_test_case.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 0bfdfa57ac..182ffaaaf7 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -203,12 +203,14 @@ class phpbb_functional_test_case extends phpbb_test_case
);
$container = new phpbb_mock_container_builder();
$container->set('migrator', $migrator);
+ $user = new \phpbb\user();
$extension_manager = new \phpbb\extension\manager(
$container,
$db,
$config,
new phpbb\filesystem(),
+ $user,
self::$config['table_prefix'] . 'ext',
dirname(__FILE__) . '/',
$phpEx,