4 files changed, 101 insertions, 3 deletions
diff --git a/tests/dbal/fixtures/migrator_module.xml b/tests/dbal/fixtures/migrator_module.xml
index 32afe7e6f3..e172d7a145 100644
--- a/tests/dbal/fixtures/migrator_module.xml
+++ b/tests/dbal/fixtures/migrator_module.xml
@@ -20,7 +20,7 @@
 			<value>acp</value>
 			<value>0</value>
 			<value>1</value>
-			<value>4</value>
+			<value>6</value>
 			<value>ACP_CAT</value>
 			<value></value>
 			<value></value>
@@ -38,5 +38,57 @@
 			<value>test</value>
 			<value></value>
 		</row>
+		<row>
+			<value>3</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value>acp</value>
+			<value>1</value>
+			<value>4</value>
+			<value>5</value>
+			<value>ACP_FORUM_BASED_PERMISSIONS</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value>acp</value>
+			<value>0</value>
+			<value>7</value>
+			<value>12</value>
+			<value>ACP_CAT_FORUMS</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value>acp</value>
+			<value>4</value>
+			<value>8</value>
+			<value>11</value>
+			<value>ACP_FORUM_BASED_PERMISSIONS</value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value>acp</value>
+			<value>5</value>
+			<value>9</value>
+			<value>10</value>
+			<value>ACP_FORUM_BASED_PERMISSIONS_CHILD_1</value>
+			<value></value>
+			<value></value>
+		</row>
 	</table>
 </dataset>
diff --git a/tests/dbal/migration/if.php b/tests/dbal/migration/if.php
index 98a66526ed..481250ea77 100644
--- a/tests/dbal/migration/if.php
+++ b/tests/dbal/migration/if.php
@@ -36,13 +36,13 @@ class phpbb_dbal_migration_if extends \phpbb\db\migration\migration
 	{
 		global $migrator_test_if_true_failed;
 
-		$migrator_test_if_true_failed = false;
+		$migrator_test_if_true_failed = !$migrator_test_if_true_failed;
 	}
 
 	function test_false()
 	{
 		global $migrator_test_if_false_failed;
 
-		$migrator_test_if_false_failed = true;
+		$migrator_test_if_false_failed = !$migrator_test_if_false_failed;
 	}
 }
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php
index 4c4306888c..798200eef1 100644
--- a/tests/dbal/migrator_test.php
+++ b/tests/dbal/migrator_test.php
@@ -156,6 +156,14 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
 
 		$this->assertFalse($migrator_test_if_true_failed, 'True test failed');
 		$this->assertFalse($migrator_test_if_false_failed, 'False test failed');
+
+		while ($this->migrator->migration_state('phpbb_dbal_migration_if') !== false)
+		{
+			$this->migrator->revert('phpbb_dbal_migration_if');
+		}
+
+		$this->assertFalse($migrator_test_if_true_failed, 'True test after revert failed');
+		$this->assertFalse($migrator_test_if_false_failed, 'False test after revert failed');
 	}
 
 	public function test_recall()
diff --git a/tests/dbal/migrator_tool_module_test.php b/tests/dbal/migrator_tool_module_test.php
index 08c3e979b8..49dff8b929 100644
--- a/tests/dbal/migrator_tool_module_test.php
+++ b/tests/dbal/migrator_tool_module_test.php
@@ -118,6 +118,44 @@ class phpbb_dbal_migrator_tool_module_test extends phpbb_database_test_case
 			$this->fail($e);
 		}
 		$this->assertEquals(true, $this->tool->exists('acp', 'ACP_NEW_CAT', 'ACP_NEW_MODULE'));
+
+		// 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
+		{
+			$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'		=> '',
+				'after'				=> 'ACP_FORUM_BASED_PERMISSIONS_CHILD_1',
+			));
+		}
+		catch (Exception $e)
+		{
+			$this->fail($e);
+		}
+		$this->assertEquals(true, $this->tool->exists('acp', 'ACP_FORUM_BASED_PERMISSIONS', 'ACP_NEW_PERMISSIONS_MODULE'));
 	}
 
 	public function test_remove()