diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-10 14:01:09 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-16 00:25:27 +0200 |
| commit | b95fdacdd378877d277e261465da73deb06e50da (patch) | |
| tree | 01d55340b37f412cecd2d898c302e101b8a0ed19 /tests/security | |
| parent | 196e1813cd37c47965eb6f254ce6a55210a1b751 (diff) | |
| download | forums-b95fdacdd378877d277e261465da73deb06e50da.tar forums-b95fdacdd378877d277e261465da73deb06e50da.tar.gz forums-b95fdacdd378877d277e261465da73deb06e50da.tar.bz2 forums-b95fdacdd378877d277e261465da73deb06e50da.tar.xz forums-b95fdacdd378877d277e261465da73deb06e50da.zip | |
[ticket/11700] Move all recent code to namespaces
PHPBB3-11700
Diffstat (limited to 'tests/security')
| -rw-r--r-- | tests/security/base.php | 4 | ||||
| -rw-r--r-- | tests/security/extract_current_page_test.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/security/base.php b/tests/security/base.php index 08878ad60d..8cd24ff145 100644 --- a/tests/security/base.php +++ b/tests/security/base.php @@ -39,13 +39,13 @@ abstract class phpbb_security_test_base extends phpbb_test_case $request = new phpbb_mock_request(array(), array(), array(), $server); // Set no user and trick a bit to circumvent errors - $user = new phpbb_user(); + $user = new \phpbb\user(); $user->lang = true; $user->browser = $server['HTTP_USER_AGENT']; $user->referer = ''; $user->forwarded_for = ''; $user->host = $server['HTTP_HOST']; - $user->page = phpbb_session::extract_current_page($phpbb_root_path); + $user->page = \phpbb\session::extract_current_page($phpbb_root_path); } protected function tearDown() diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php index 1bf471d04f..e42f446b31 100644 --- a/tests/security/extract_current_page_test.php +++ b/tests/security/extract_current_page_test.php @@ -28,12 +28,12 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base { global $request; - $request->merge(phpbb_request_request_interface::SERVER, array( + $request->merge(\phpbb\request\request_interface::SERVER, array( 'PHP_SELF' => $url, 'QUERY_STRING' => $query_string, )); - $result = phpbb_session::extract_current_page('./'); + $result = \phpbb\session::extract_current_page('./'); $label = 'Running extract_current_page on ' . $query_string . ' with PHP_SELF filled.'; $this->assertEquals($expected, $result['query_string'], $label); @@ -46,12 +46,12 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base { global $request; - $request->merge(phpbb_request_request_interface::SERVER, array( + $request->merge(\phpbb\request\request_interface::SERVER, array( 'PHP_SELF' => $url, 'QUERY_STRING' => $query_string, )); - $result = phpbb_session::extract_current_page('./'); + $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); |