[feature/request-class] Remove $html_encode arg, force manual decoding

PHPBB3-9716

3 files changed, 5 insertions, 17 deletions

diff --git a/tests/mock/request.php b/tests/mock/request.php
index 18aa2e724c..8b2708304c 100644
--- a/tests/mock/request.php
+++ b/tests/mock/request.php
@@ -25,21 +25,21 @@ class phpbb_mock_request implements phpbb_request_interface
 		$this->data[$super_global][$var_name] = $value;
 	}
 
-	public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST, $html_encode = true)
+	public function variable($var_name, $default, $multibyte = false, $super_global = phpbb_request_interface::REQUEST)
 	{
 		return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
 	}
 
-	public function server($var_name, $default = '', $html_encode = false)
+	public function server($var_name, $default = '')
 	{
 		$super_global = phpbb_request_interface::SERVER;
 		return isset($this->data[$super_global][$var_name]) ? $this->data[$super_global][$var_name] : $default;
 	}
 
-	public function header($header_name, $default = '', $html_encode = false)
+	public function header($header_name, $default = '')
 	{
 		$var_name = 'HTTP_' . str_replace('-', '_', strtoupper($header_name));
-		return $this->server($var_name, $default, $html_encode);
+		return $this->server($var_name, $default);
 	}
 
 	public function is_set_post($name)
diff --git a/tests/request/request_test.php b/tests/request/request_test.php
index 2e56841601..e492fa5cf1 100644
--- a/tests/request/request_test.php
+++ b/tests/request/request_test.php
@@ -60,8 +60,7 @@ class phpbb_request_test extends phpbb_test_case
 			->with(
 				$this->anything(),
 				'',
-				true,
-				false
+				true
 			);
 
 		$this->request->server('HTTP_SOMEVAR');
@@ -80,7 +79,6 @@ class phpbb_request_test extends phpbb_test_case
 			->with(
 				$this->anything(),
 				'',
-				true,
 				true
 			);
 
diff --git a/tests/request/type_cast_helper_test.php b/tests/request/type_cast_helper_test.php
index 0103c51561..06cf2e1bf6 100644
--- a/tests/request/type_cast_helper_test.php
+++ b/tests/request/type_cast_helper_test.php
@@ -48,14 +48,4 @@ class phpbb_type_cast_helper_test extends phpbb_test_case
 
 		$this->assertEquals($expected, $data);
 	}
-
-	public function test_simple_set_var_without_html_encoding()
-	{
-		$data = 'eviL<3';
-		$expected = 'eviL<3';
-
-		$this->type_cast_helper->recursive_set_var($data, '', true, false);
-
-		$this->assertEquals($expected, $data);
-	}
 }