aboutsummaryrefslogtreecommitdiffstats
path: root/tests/security/extract_current_page_test.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/security/extract_current_page_test.php')
-rw-r--r--tests/security/extract_current_page_test.php28
1 files changed, 8 insertions, 20 deletions
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);
- }
}