diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 18:31:26 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 18:31:26 -0500 |
| commit | 85ae55ca2d6a99bfc0eaf66bf7bb710050b0cb1e (patch) | |
| tree | 79312a87dc19e3a23ea8a177fcc45bf5a8d650ae | |
| parent | a6df011a107132390ecc35b80ab0e88bc31fd103 (diff) | |
| download | forums-85ae55ca2d6a99bfc0eaf66bf7bb710050b0cb1e.tar forums-85ae55ca2d6a99bfc0eaf66bf7bb710050b0cb1e.tar.gz forums-85ae55ca2d6a99bfc0eaf66bf7bb710050b0cb1e.tar.bz2 forums-85ae55ca2d6a99bfc0eaf66bf7bb710050b0cb1e.tar.xz forums-85ae55ca2d6a99bfc0eaf66bf7bb710050b0cb1e.zip | |
[ticket/11850] Update for namespaces
PHPBB3-11850
| -rw-r--r-- | tests/security/extract_current_page_test.php | 2 | ||||
| -rw-r--r-- | tests/session/extract_page_test.php | 2 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_session_test_case.php | 11 |
3 files changed, 10 insertions, 5 deletions
diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php index a7560f0d15..9980530dbe 100644 --- a/tests/security/extract_current_page_test.php +++ b/tests/security/extract_current_page_test.php @@ -43,7 +43,7 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base $symfony_request->expects($this->any()) ->method('getPathInfo') ->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.'; $this->assertEquals($expected, $result['query_string'], $label); diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php index 1834eddebc..123ae591c6 100644 --- a/tests/session/extract_page_test.php +++ b/tests/session/extract_page_test.php @@ -156,7 +156,7 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case ->method('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. // Any keys that are not in the expected array are overwritten by the output (aka not checked). diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index cfa8399c96..36b4ff025f 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -20,11 +20,16 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case { parent::setUp(); - global $symfony_request, $phpbb_filesystem, $request, $phpbb_root_path, $phpEx; - $symfony_request = new phpbb_symfony_request( + global $symfony_request, $phpbb_path_helper, $request, $phpbb_root_path, $phpEx; + $symfony_request = new \phpbb\symfony_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->db = $this->new_dbal(); |