makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11850] Update for namespaces

Browse source 
PHPBB3-11850
This commit is contained in:
Nathan Guse 2013-09-30 18:31:26 -05:00
parent a6df011a10
commit 85ae55ca2d
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/security/extract_current_page_test.php
View file

@ -43,7 +43,7 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base
$symfony_request->expects($this->any()) $symfony_request->expects($this->any())
->method('getPathInfo') ->method('getPathInfo')
->will($this->returnValue('/')); ->will($this->returnValue('/'));
$result = phpbb_session::extract_current_page('./'); $result = \phpbb\session::extract_current_page('./');
$label = 'Running extract_current_page on ' . $query_string . ' with PHP_SELF filled.'; $label = 'Running extract_current_page on ' . $query_string . ' with PHP_SELF filled.';
$this->assertEquals($expected, $result['query_string'], $label); $this->assertEquals($expected, $result['query_string'], $label);

2
tests/session/extract_page_test.php
View file

@ -156,7 +156,7 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
->method('getPathInfo') ->method('getPathInfo')
->will($this->returnValue($getPathInfo)); ->will($this->returnValue($getPathInfo));
$output = phpbb_session::extract_current_page($root_path); $output = \phpbb\session::extract_current_page($root_path);
// This compares the result of the output. // This compares the result of the output.
// Any keys that are not in the expected array are overwritten by the output (aka not checked). // Any keys that are not in the expected array are overwritten by the output (aka not checked).

11
tests/test_framework/phpbb_session_test_case.php
View file

@ -20,11 +20,16 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case
{ {
parent::setUp(); parent::setUp();
global $symfony_request, $phpbb_filesystem, $request, $phpbb_root_path, $phpEx; global $symfony_request, $phpbb_path_helper, $request, $phpbb_root_path, $phpEx;
$symfony_request = new phpbb_symfony_request( $symfony_request = new \phpbb\symfony_request(
new phpbb_mock_request() new phpbb_mock_request()
); );
$phpbb_filesystem = new phpbb_filesystem($symfony_request, $phpbb_root_path, $phpEx); $phpbb_path_helper = new \phpbb\path_helper(
$symfony_request,
new \phpbb\filesystem(),
$phpbb_root_path,
$phpEx
);
$this->session_factory = new phpbb_session_testable_factory; $this->session_factory = new phpbb_session_testable_factory;
$this->db = $this->new_dbal(); $this->db = $this->new_dbal();