Fix tests

Author: iMattPro

tests/controller/main_controller_test.php

@@ -213,11 +213,10 @@ public function test_display_redirects_when_disabled_and_closes_completed_tree()
 		$ruleset_operator->method('is_published')->with('en')->willReturn(true);
 		$assigned_rules = array();
 		$template = $this->createMock(\phpbb\template\template::class);
-<<<<<<< HEAD
 		$block_var_call = 0;
 		$template->expects(self::exactly(5))
 			->method('assign_block_vars')
-			->willReturnCallback(function ($block, $variables) use (&$block_var_call) {
+			->willReturnCallback(function ($block, $variables) use (&$block_var_call, &$assigned_rules) {
 				$expected = array(
 					array('rules', 'TITLE'),
 					array('rules', 'TITLE'),
@@ -232,22 +231,12 @@ public function test_display_redirects_when_disabled_and_closes_completed_tree()
 				{
 					self::assertSame(array('S_CLOSE_LIST' => true), $variables);
 				}
+				if ($block === 'rules' && isset($variables['U_ANCHOR']))
+				{
+					$assigned_rules[] = $variables;
+				}
 				$block_var_call++;
 			});
-=======
-		$template->expects(self::exactly(5))->method('assign_block_vars')->withConsecutive(
-			array('rules', self::arrayHasKey('TITLE')),
-			array('rules', self::arrayHasKey('TITLE')),
-			array('rules', array('S_CLOSE_LIST' => true)),
-			array('rules', self::arrayHasKey('TITLE')),
-			array('navlinks', self::arrayHasKey('U_VIEW_FORUM'))
-		)->willReturnCallback(function ($block, $vars) use (&$assigned_rules) {
-			if ($block === 'rules' && isset($vars['U_ANCHOR']))
-			{
-				$assigned_rules[] = $vars;
-			}
-		});
->>>>>>> master
 		$helper = $this->getMockBuilder(\phpbb\controller\helper::class)
 			->disableOriginalConstructor()
 			->getMock();

tests/migrations/v310_upgrade_test.php

@@ -101,10 +101,11 @@ public function test_language_trees_are_renumbered_independently(): void
 		$migration = new \phpbb\boardrules\migrations\v30x\m20_unicode_language_trees(
 			new \phpbb\config\config(array()),
 			$this->db,
-			$factory->get($this->db, true),
+			$factory->get($this->new_doctrine_dbal(), true),
 			$phpbb_root_path,
 			$phpEx,
-			'phpbb_'
+			'phpbb_',
+			self::get_core_tables()
 		);
 		$migration->renumber_language_trees();
 
@@ -149,10 +150,11 @@ public function test_language_tree_renumbering_crosses_update_batch_boundary():
 		$migration = new \phpbb\boardrules\migrations\v30x\m20_unicode_language_trees(
 			new \phpbb\config\config(array()),
 			$this->db,
-			$factory->get($this->db, true),
+			$factory->get($this->new_doctrine_dbal(), true),
 			$phpbb_root_path,
 			$phpEx,
-			'phpbb_'
+			'phpbb_',
+			self::get_core_tables()
 		);
 		$migration->renumber_language_trees();
 
@@ -176,10 +178,11 @@ public function test_table_lock_config_is_removed_only_on_revert(): void
 		$migration = new \phpbb\boardrules\migrations\v30x\m20_unicode_language_trees(
 			new \phpbb\config\config(array()),
 			$this->db,
-			$factory->get($this->db, true),
+			$factory->get($this->new_doctrine_dbal(), true),
 			$phpbb_root_path,
 			$phpEx,
-			'phpbb_'
+			'phpbb_',
+			self::get_core_tables()
 		);
 
 		foreach ($migration->update_data() as $instruction)