Revert AJAX hacks

Author: iMattPro

tests/controller/acp_controller_test.php

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

tests/event/listener_test.php

@@ -59,11 +59,6 @@ protected static function setup_extensions()
 	/** @var string */
 	protected $php_ext;
 
-	/**
-	 * Get data set fixtures
-	 *
-	 * @return \PHPUnit\DbUnit\DataSet\XmlDataSet
-	 */
 	public function getDataSet()
 	{
 		return $this->createXMLDataSet(__DIR__ . '/../fixtures/board_announcements.xml');