[ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"

This reverts commit a1b58d05d158ff7afd789c1b27821e17198f8d58, reversing
changes made to 0e772afb9db640e54e84cfccaddcf74f3edbb3fb.

PHPBB3-13280

2 files changed, 8 insertions, 26 deletions

diff --git a/tests/functions/build_url_test.php b/tests/functions/build_url_test.php
index 5cfd1300de..06415a424e 100644
--- a/tests/functions/build_url_test.php
+++ b/tests/functions/build_url_test.php
@@ -69,11 +69,6 @@ class phpbb_build_url_test extends phpbb_test_case
 				array('f', 'style', 't'),
 				'http://test.phpbb.com/viewtopic.php?',
 			),
-			array(
-				'posting.php?f=2&mode=delete&p=20%22%3Cscript%3Ealert%281%29%3B%3C%2Fscript%3E',
-				false,
-				'phpBB/posting.php?f=2&mode=delete&p=20%22%3Cscript%3Ealert%281%29%3B%3C%2Fscript%3E',
-			)
 		);
 	}
 
@@ -85,7 +80,6 @@ class phpbb_build_url_test extends phpbb_test_case
 		global $user, $phpbb_root_path;
 
 		$user->page['page'] = $page;
-
 		$output = build_url($strip_vars);
 
 		$this->assertEquals($expected, $output);
diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php
index c127b69b2b..58dea68dc8 100644
--- a/tests/security/extract_current_page_test.php
+++ b/tests/security/extract_current_page_test.php
@@ -37,16 +37,16 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 		));
 		$symfony_request->expects($this->any())
 			->method('getScriptName')
-			->will($this->returnValue($this->sanitizer($url)));
+			->will($this->returnValue($url));
 		$symfony_request->expects($this->any())
 			->method('getQueryString')
-			->will($this->returnValue($this->sanitizer($query_string)));
+			->will($this->returnValue($query_string));
 		$symfony_request->expects($this->any())
 			->method('getBasePath')
 			->will($this->returnValue($server['REQUEST_URI']));
-		$symfony_request->expects($this->sanitizer($this->any()))
+		$symfony_request->expects($this->any())
 			->method('getPathInfo')
-			->will($this->returnValue($this->sanitizer('/')));
+			->will($this->returnValue('/'));
 		$result = \phpbb\session::extract_current_page('./');
 
 		$label = 'Running extract_current_page on ' . $query_string . ' with PHP_SELF filled.';
@@ -65,32 +65,20 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 		));
 		$symfony_request->expects($this->any())
 			->method('getScriptName')
-			->will($this->returnValue($this->sanitizer($url)));
+			->will($this->returnValue($url));
 		$symfony_request->expects($this->any())
 			->method('getQueryString')
-			->will($this->returnValue($this->sanitizer($query_string)));
+			->will($this->returnValue($query_string));
 		$symfony_request->expects($this->any())
 			->method('getBasePath')
-			->will($this->returnValue($this->sanitizer($server['REQUEST_URI'])));
+			->will($this->returnValue($server['REQUEST_URI']));
 		$symfony_request->expects($this->any())
 			->method('getPathInfo')
-			->will($this->returnValue($this->sanitizer('/')));
+			->will($this->returnValue('/'));
 
 		$result = \phpbb\session::extract_current_page('./');
 
 		$label = 'Running extract_current_page on ' . $query_string . ' with REQUEST_URI filled.';
 		$this->assertEquals($expected, $result['query_string'], $label);
 	}
-
-	protected function sanitizer($value)
-	{
-		// Fix for objects passed in phpunit
-		if (is_object($value))
-		{
-			return $value;
-		}
-		$type_cast_helper = new \phpbb\request\type_cast_helper();
-		$type_cast_helper->set_var($value, $value, gettype($value), true);
-		return str_replace('&', '&', $value);
-	}
 }