mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
This reverts commit a1b58d05d1, reversing
changes made to 0e772afb9d.

PHPBB3-13280
This commit is contained in:
Tristan Darricau
2014-11-12 10:30:27 +01:00
parent cd6085ebdc
commit 6d533d2f86
4 changed files with 12 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/security/extract_current_page_test.php
View File

@@ -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);
}
}