aboutsummaryrefslogtreecommitdiffstats
path: root/tests/extension
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-01-20 23:27:54 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-01-20 23:27:54 +0100
commita5fae1b1f09358f8a24ff32fc5192395cd314244 (patch)
treee4944e89871808f1ada2df59e8cf815d3d2203ec /tests/extension
parentd0e5c0a1871c37bfea780cc525e996749b13a0ee (diff)
parentdab07283573689fcc6eb2c4e270ac37c3a573959 (diff)
downloadforums-a5fae1b1f09358f8a24ff32fc5192395cd314244.tar
forums-a5fae1b1f09358f8a24ff32fc5192395cd314244.tar.gz
forums-a5fae1b1f09358f8a24ff32fc5192395cd314244.tar.bz2
forums-a5fae1b1f09358f8a24ff32fc5192395cd314244.tar.xz
forums-a5fae1b1f09358f8a24ff32fc5192395cd314244.zip
Merge pull request #3293 from Nicofuma/ticket/13489
[ticket/13489] Disable the event dispatcher in the migrator
Diffstat (limited to 'tests/extension')
-rw-r--r--tests/extension/manager_test.php4
-rw-r--r--tests/extension/metadata_manager_test.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 5c7cad89f6..0eeb060936 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -156,7 +156,10 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
$table_prefix = 'phpbb_';
$user = new \phpbb\user('\phpbb\user');
+ $container = new phpbb_mock_container_builder();
+
$migrator = new \phpbb\db\migrator(
+ $container,
$config,
$db,
$db_tools,
@@ -167,7 +170,6 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
array(),
new \phpbb\db\migration\helper()
);
- $container = new phpbb_mock_container_builder();
$container->set('migrator', $migrator);
return new \phpbb\extension\manager(
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index fab1d3af3a..2a746d3792 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -62,7 +62,10 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
new \phpbb\template\context()
);
+ $container = new phpbb_mock_container_builder();
+
$this->migrator = new \phpbb\db\migrator(
+ $container,
$this->config,
$this->db,
$this->db_tools,
@@ -73,7 +76,6 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
array(),
new \phpbb\db\migration\helper()
);
- $container = new phpbb_mock_container_builder();
$container->set('migrator', $this->migrator);
$this->extension_manager = new \phpbb\extension\manager(