diff options
author | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:37:07 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:37:07 +0200 |
commit | 5fa2d197566c0f443bbdd71101b6c7876158dea6 (patch) | |
tree | b1284f0f3257d24a155efc974ab4b1482191b7e8 /tests/mock/extension_manager.php | |
parent | b82a39fea9c48cb36677ed0aaf2dcb5531848d31 (diff) | |
parent | 4a06511d853024193435fd9b2e347ff292589420 (diff) | |
download | forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar.gz forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar.bz2 forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.tar.xz forums-5fa2d197566c0f443bbdd71101b6c7876158dea6.zip |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'tests/mock/extension_manager.php')
-rw-r--r-- | tests/mock/extension_manager.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php index 1a475f62e0..3b759fbbc2 100644 --- a/tests/mock/extension_manager.php +++ b/tests/mock/extension_manager.php @@ -13,11 +13,12 @@ class phpbb_mock_extension_manager extends \phpbb\extension\manager { - public function __construct($phpbb_root_path, $extensions = array()) + public function __construct($phpbb_root_path, $extensions = array(), $container = null) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = 'php'; $this->extensions = $extensions; $this->filesystem = new \phpbb\filesystem(); + $this->container = $container; } } |