Revert AJAX hacks

Author: iMattPro

controller/admin_controller.php

@@ -188,14 +188,15 @@ public function delete_autogroup_rule($autogroups_id)
 		// If AJAX was used, show user a result message
 		if ($this->request->is_ajax())
 		{
-			return new \Symfony\Component\HttpFoundation\JsonResponse(array(
+			$json_response = new \phpbb\json_response;
+			$json_response->send(array(
 				'MESSAGE_TITLE'	=> $this->language->lang('INFORMATION'),
 				'MESSAGE_TEXT'	=> $this->language->lang('ACP_AUTOGROUPS_DELETE_SUCCESS'),
-				'REFRESH_DATA'	=> ['time' => 3],
+				'REFRESH_DATA'	=> array(
+					'time'	=> 3
+				)
 			));
 		}
-
-		return null;
 	}
 
 	/**

controller/admin_interface.php

@@ -38,7 +38,7 @@ public function save_autogroup_rule($autogroups_id);
 	 * Delete the auto group rule
 	 *
 	 * @param int $autogroups_id The auto groups identifier to delete
-	 * @return \Symfony\Component\HttpFoundation\JsonResponse|null
+	 * @return void
 	 * @access public
 	 */
 	public function delete_autogroup_rule($autogroups_id);

tests/controller/admin_controller_base.php

@@ -40,6 +40,9 @@ protected static function setup_extensions()
 	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\template\template */
 	protected $template;
 
+	/** @var \phpbb\language\language */
+	protected $language;
+
 	/** @var \phpbb\user */
 	protected $user;
 
@@ -70,9 +73,8 @@ protected function setUp(): void
 		$this->template = $this->getMockBuilder('\phpbb\template\template')
 			->getMock();
 		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
-		$lang = new \phpbb\language\language($lang_loader);
-		$language = $lang;
-		$user = new \phpbb\user($lang, '\phpbb\datetime');
+		$this->language = $language = new \phpbb\language\language($lang_loader);
+		$user = new \phpbb\user($this->language, '\phpbb\datetime');
 		$user->data['user_id'] = 2;
 		$user->data['user_form_salt'] = '';
 		$this->user = $user;
@@ -90,7 +92,7 @@ protected function setUp(): void
 			$cache,
 			$this->db,
 			$group_helper,
-			$lang,
+			$this->language,
 			$this->log,
 			$this->manager,
 			$this->request,

tests/controller/delete_autogroup_rule_test.php

@@ -10,8 +10,6 @@
 
 namespace phpbb\autogroups\tests\controller;
 
-use Symfony\Component\HttpFoundation\JsonResponse;
-
 class delete_autogroup_rule_test extends admin_controller_base
 {
 	/**
@@ -71,9 +69,13 @@ public function test_delete_autogroup_rule_ajax()
 			->method('is_ajax')
 			->willReturn(true);
 
+		// Handle trigger_error() output called from json_response
+		$this->expectOutputString('{"MESSAGE_TITLE":"' . $this->language->lang('INFORMATION')
+			. '","MESSAGE_TEXT":"' . $this->language->lang('ACP_AUTOGROUPS_DELETE_SUCCESS')
+			. '","REFRESH_DATA":{"time":3}}');
+
 		// Call the delete_autogroup_rule() method
-		$response = $this->admin_controller->delete_autogroup_rule(1);
-		self::assertInstanceOf(JsonResponse::class, $response);
+		$this->admin_controller->delete_autogroup_rule(1);
 
 		// Verify the autogroup rule has been removed
 		self::assertEquals(0, $this->get_autogroup_rule_count(1));