Revert AJAX hacks

Author: iMattPro

tests/controller/admin_controller_test.php

@@ -930,6 +930,15 @@ public function test_ad_enable($ad_id, $enable, $is_ajax, $err_msg)
 			->method('is_ajax')
 			->willReturn($is_ajax);
 
+		if ($is_ajax)
+		{
+			$this->expectOutputString('{"text":"' . ($enable ? 'Enabled' : 'Disabled') . '","title":"AD_ENABLE_TITLE"}');
+		}
+		else
+		{
+			$this->setExpectedTriggerError($ad_id ? E_USER_NOTICE : E_USER_WARNING, $err_msg);
+		}
+
 		$variable_expectations = [['action', ''], ['id', 0]];
 		$return_values = [$enable ? 'enable' : 'disable', $ad_id];
 		$this->request
@@ -942,23 +951,6 @@ public function test_ad_enable($ad_id, $enable, $is_ajax, $err_msg)
 				return array_shift($return_values);
 			});
 
-		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);
-			}
-		}
-		else
-		{
-			$this->setExpectedTriggerError($ad_id ? E_USER_NOTICE : E_USER_WARNING, $err_msg);
-		}
-
 		$controller->mode_manage();
 	}
 

tests/controller/admin_input_test.php

@@ -98,17 +98,13 @@ protected function setUp(): void
 	 */
 	public function get_input_controller(): admin_input
 	{
-		return new class($this->user, $this->user_loader, $this->language, $this->request, $this->banner) extends \phpbb\ads\controller\admin_input {
-			protected function send_ajax_response($success, $text): void
-			{
-				if ($this->request->is_ajax())
-				{
-					echo json_encode([
-						'success' => $success
-					], JSON_THROW_ON_ERROR);
-				}
-			}
-		};
+		return new \phpbb\ads\controller\admin_input(
+			$this->user,
+			$this->user_loader,
+			$this->language,
+			$this->request,
+			$this->banner
+		);
 	}
 
 	/**
@@ -245,14 +241,14 @@ public function test_banner_upload($can_create_directory, $can_move_file, $is_aj
 				->method('remove');
 		}
 
-		$this->request->expects(self::atLeast(1))
+		$this->request->expects(self::once())
 			->method('is_ajax')
 			->willReturn($is_ajax);
 
 		if ($is_ajax)
 		{
-			// Handle trigger_error() output called from json_response
-			$this->expectOutputString('{"success":' . (count($file_error) ? 'false' : 'true') . '}');
+			$text = !empty($file_error) ? '"CANNOT_CREATE_DIRECTORY"' : '"' . addcslashes(trim(substr($ad_code_expected, strpos($ad_code_expected, '<img'))), "/\"") . '"';
+			$this->expectOutputString('{"success":' . (count($file_error) ? 'false' : 'true') . ',"title":"Information","text":' . $text . '}');
 		}
 
 		$result = $input_controller->banner_upload($ad_code);

tests/controller/visual_demo_test.php

@@ -139,16 +139,13 @@ public function test_controller($action, $is_ajax, $status_code, $cookie_time)
 			->method('set_cookie')
 			->with('phpbb_ads_visual_demo', $this->anything(), $cookie_time);
 
-		$controller = $this->get_controller();
-
 		// If a non-ajax redirect is encountered, in testing it will trigger_error
 		if (!$is_ajax)
 		{
 			$this->setExpectedTriggerError(E_USER_DEPRECATED);
-			$controller->handle($action);
-			return; // Skip response assertions since redirect calls exit
 		}
 
+		$controller = $this->get_controller();
 		$response = $controller->handle($action);
 		self::assertInstanceOf(JsonResponse::class, $response);
 		self::assertEquals($status_code, $response->getStatusCode());