diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-12-24 19:55:03 +0100 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-12-24 19:55:03 +0100 |
| commit | 2b16b7cada85492b6312d126afa71a8a2e50a2a3 (patch) | |
| tree | 2ed9a389c1253514a1eb3afabe7f059c5425af1a | |
| parent | 719a49d38793f1490988ed0fa3fea84da17d3886 (diff) | |
| download | forums-2b16b7cada85492b6312d126afa71a8a2e50a2a3.tar forums-2b16b7cada85492b6312d126afa71a8a2e50a2a3.tar.gz forums-2b16b7cada85492b6312d126afa71a8a2e50a2a3.tar.bz2 forums-2b16b7cada85492b6312d126afa71a8a2e50a2a3.tar.xz forums-2b16b7cada85492b6312d126afa71a8a2e50a2a3.zip | |
[ticket/15339] Fix tests
PHPBB3-15339
| -rw-r--r-- | phpBB/phpbb/db/migration/tool/module.php | 2 | ||||
| -rw-r--r-- | tests/dbal/migrator_tool_module_test.php | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php index e1dfe40709..238e063a87 100644 --- a/phpBB/phpbb/db/migration/tool/module.php +++ b/phpBB/phpbb/db/migration/tool/module.php @@ -391,7 +391,7 @@ class module implements \phpbb\db\migration\tool\tool_interface $parent_sql = ''; if ($parent !== false) { - $parents = (array)$this->get_parent_module_id($parent, $module); + $parents = (array) $this->get_parent_module_id($parent, $module); $parent_sql = 'AND ' . $this->db->sql_in_set('parent_id', $parents); } diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php index 29b21166b6..c625b93ded 100644 --- a/tests/dbal/migrator_tool_module_test.php +++ b/tests/dbal/migrator_tool_module_test.php @@ -195,25 +195,6 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case // Test adding module when plural parent module_langname exists // PHPBB3-14703 - // Adding fail - try - { - $this->tool->add('acp', 'ACP_FORUM_BASED_PERMISSIONS', array( - 'module_basename' => 'acp_new_permissions_module', - 'module_langname' => 'ACP_NEW_PERMISSIONS_MODULE', - 'module_mode' => 'test', - 'module_auth' => '', - )); - $this->fail('Exception not thrown'); - } - catch (Exception $e) - { - $this->assertEquals('phpbb\db\migration\exception', get_class($e)); - $this->assertEquals('MODULE_EXIST_MULTIPLE', $e->getMessage()); - } - - // Test adding module when plural parent module_langname exists - // PHPBB3-14703 // Adding success try { |