Update 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/controller/acp_controller_test.php

@@ -575,7 +575,14 @@ public function test_action_move($id, $dir, $valid, $error, $is_ajax)
 		if ($is_ajax)
 		{
 			// Handle trigger_error() output called from json_response
-			$this->setExpectedTriggerError(E_WARNING);
+			if (version_compare(\PHPUnit\Runner\Version::id(), '10.0.0', '>='))
+			{
+				$this->markTestSkipped('setExpectedTriggerError not available in PHPUnit 10+');
+			}
+			else
+			{
+				$this->setExpectedTriggerError(E_WARNING);
+			}
 		}
 
 		$variable_invocation = 0;

tests/controller/controller_test.php

@@ -21,9 +21,6 @@
 use phpbb\lock\db;
 use phpbb_database_test_case;
 use phpbb_mock_event_dispatcher;
-use PHPUnit\DbUnit\DataSet\DefaultDataSet;
-use PHPUnit\DbUnit\DataSet\IDataSet;
-use PHPUnit\DbUnit\DataSet\XmlDataSet;
 use phpbb\path_helper;
 use phpbb\user;
 use PHPUnit\Framework\Exception;
@@ -50,7 +47,7 @@ protected static function setup_extensions(): array
 	/**
 	* Get data set fixtures
 	*/
-	public function getDataSet(): IDataSet|XmlDataSet|DefaultDataSet
+	public function getDataSet()
 	{
 		return $this->createXMLDataSet(__DIR__ . '/../fixtures/board_announcements.xml');
 	}
@@ -191,11 +188,10 @@ public function controller_data(): array
 	 */
 	public function test_controller($id, $user_id, $is_registered, $mode, $ajax, $status_code, $content, $expected)
 	{
-		// If a non-ajax redirect is encountered, in testing it will trigger_error/exception
+		// If a non-ajax redirect is encountered, in testing it will trigger_error
 		if (!$ajax)
 		{
-			$this->expectException(Exception::class);
-			$this->expectExceptionMessage('INSECURE_REDIRECT');
+			$this->setExpectedTriggerError(E_USER_DEPRECATED);
 		}
 
 		$controller = $this->get_controller($user_id, $is_registered, $mode, $ajax);

tests/event/listener_test.php

@@ -59,7 +59,7 @@ protected static function setup_extensions()
 	/**
 	 * Get data set fixtures
 	 *
-	 * @return \PHPUnit\DbUnit\DataSet\DefaultDataSet|\PHPUnit\DbUnit\DataSet\XmlDataSet
+	 * @return \PHPUnit\DbUnit\DataSet\XmlDataSet
 	 */
 	public function getDataSet()
 	{