Fix tests

Author: iMattPro

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 		 backupGlobals="true"
 		 backupStaticAttributes="false"
 		 colors="true"

tests/acp/acp_test.php

@@ -24,8 +24,6 @@
 use phpbb_mock_extension_manager;
 use phpbb_mock_lang;
 use phpbb_mock_user;
-use PHPUnit\DbUnit\DataSet\DefaultDataSet;
-use PHPUnit\DbUnit\DataSet\XmlDataSet;
 use PHPUnit\Framework\MockObject\MockObject;
 use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -74,7 +72,7 @@ protected static function setup_extensions(): array
 		return ['vse/abbc3'];
 	}
 
-	public function getDataSet(): XmlDataSet|DefaultDataSet
+	public function getDataSet()
 	{
 		return $this->createXMLDataSet(__DIR__ . '/../core/fixtures/config_text.xml');
 	}

tests/core/acp_base.php

@@ -22,8 +22,6 @@
 use phpbb_database_test_case;
 use phpbb_mock_event_dispatcher;
 use phpbb_mock_request;
-use PHPUnit\DbUnit\DataSet\DefaultDataSet;
-use PHPUnit\DbUnit\DataSet\XmlDataSet;
 use PHPUnit\Framework\MockObject\MockObject;
 use vse\abbc3\core\acp_manager;
 use phpbb\datetime;
@@ -52,7 +50,7 @@ protected static function setup_extensions(): array
 	/** @var user */
 	protected user $user;
 
-	public function getDataSet(): XmlDataSet|DefaultDataSet
+	public function getDataSet()
 	{
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/bbcodes.xml');
 	}

tests/core/acp_bbcode_drag_drop_test.php

@@ -11,6 +11,7 @@
 namespace vse\abbc3\tests\core;
 
 use phpbb\request\request_interface;
+use vse\abbc3\core\acp_manager;
 
 class acp_bbcode_drag_drop_test extends acp_base
 {
@@ -43,11 +44,11 @@ public function test_bbcode_drag_drop($bbcodes)
 			])
 		;
 
-		// Handle trigger_error() output called from json_response
-		$this->setExpectedTriggerError(E_WARNING);
+		// Expect JSON output but prevent exit()
+		$this->expectOutputString('{"success":true}');
 
-		// Get the acp_manager
-		$acp_manager = $this->get_acp_manager();
+		// Get the testable acp_manager
+		$acp_manager = $this->get_testable_acp_manager();
 
 		// Call move_drag()
 		$acp_manager->move_drag();
@@ -70,4 +71,17 @@ public function test_bbcode_drag_drop_fails()
 		// Call move_drag()
 		$acp_manager->move_drag();
 	}
+
+	protected function get_testable_acp_manager(): acp_manager
+	{
+		return new class($this->db, $this->group_helper, $this->lang, $this->request) extends acp_manager {
+			protected function send_json_response(bool $content): void
+			{
+				if ($this->request->is_ajax())
+				{
+					echo json_encode(['success' => (bool) $content]);
+				}
+			}
+		};
+	}
 }

tests/core/acp_bbcode_move_test.php

@@ -11,6 +11,7 @@
 namespace vse\abbc3\tests\core;
 
 use phpbb\request\request_interface;
+use vse\abbc3\core\acp_manager;
 
 class acp_bbcode_move_test extends acp_base
 {
@@ -127,13 +128,33 @@ public function test_bbcode_move_triggers_error($item, $action, $hash, $ajax, $e
 			])
 		;
 
-		// Handle trigger_error() output
-		$this->setExpectedTriggerError($errNo);
-
-		// Get the acp_manager
-		$acp_manager = $this->get_acp_manager();
+		if ($ajax)
+		{
+			// Expect JSON output for ajax requests
+			$this->expectOutputString('{"success":true}');
+			$acp_manager = $this->get_testable_acp_manager();
+		}
+		else
+		{
+			// Handle trigger_error() output for non-ajax
+			$this->setExpectedTriggerError($errNo);
+			$acp_manager = $this->get_acp_manager();
+		}
 
 		// Call move()
 		$acp_manager->move($action);
 	}
+
+	protected function get_testable_acp_manager(): acp_manager
+	{
+		return new class($this->db, $this->group_helper, $this->lang, $this->request) extends acp_manager {
+			protected function send_json_response(bool $content): void
+			{
+				if ($this->request->is_ajax())
+				{
+					echo json_encode(['success' => (bool) $content]);
+				}
+			}
+		};
+	}
 }

tests/core/bbcodes_test.php

@@ -19,8 +19,6 @@
 use phpbb\user;
 use phpbb_database_test_case;
 use phpbb_mock_extension_manager;
-use PHPUnit\DbUnit\DataSet\DefaultDataSet;
-use PHPUnit\DbUnit\DataSet\XmlDataSet;
 use PHPUnit\Framework\MockObject\MockObject;
 use phpbb\datetime;
 use s9e\TextFormatter\Parser;
@@ -50,7 +48,7 @@ protected static function setup_extensions(): array
 	/** @var phpbb_mock_extension_manager */
 	protected phpbb_mock_extension_manager $ext_manager;
 
-	public function getDataSet(): XmlDataSet|DefaultDataSet
+	public function getDataSet()
 	{
 		return $this->createXMLDataSet(__DIR__ . '/fixtures/user_group.xml');
 	}
@@ -353,12 +351,17 @@ public function test_set_renderer_params_caching()
 			->method('get_renderer')
 			->willReturn($s9e_renderer_mock);
 
+		$expectedCalls = [
+			['param1' => 'value1', 'param2' => 'value2'],
+			['param3' => 'value3']
+		];
+		$callIndex = 0;
 		$s9e_renderer_mock->expects(self::exactly(2))
 			->method('setParameters')
-			->withConsecutive(
-				[['param1' => 'value1', 'param2' => 'value2']],
-				[['param3' => 'value3']]
-			);
+			->willReturnCallback(function($params) use (&$expectedCalls, &$callIndex) {
+				self::assertEquals($expectedCalls[$callIndex], $params);
+				$callIndex++;
+			});
 
 		$bbcodes_manager = $this->bbcodes_manager();
 

tests/core/faq_test.php

@@ -43,7 +43,7 @@ protected static function setup_extensions(): array
 	/** @var bbcodes_help */
 	protected bbcodes_help $bbcodes_help;
 
-	public function getDataSet(): CompositeDataSet
+	public function getDataSet()
 	{
 		// Aggregate multiple fixtures into a single dataset
 		$ds1 = $this->createXMLDataSet(__DIR__ . '/fixtures/bbcodes.xml');