diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:50:19 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 18:14:07 +0200 |
| commit | 6deb7b3671c29ab7ce1db6e11b5c6be0950d265f (patch) | |
| tree | 01f69230e6d0c02827268975dc64af781f06b809 /tests/security | |
| parent | 0ae491c5fa9228304e17431ea7aa8ba9303cc193 (diff) | |
| download | forums-6deb7b3671c29ab7ce1db6e11b5c6be0950d265f.tar forums-6deb7b3671c29ab7ce1db6e11b5c6be0950d265f.tar.gz forums-6deb7b3671c29ab7ce1db6e11b5c6be0950d265f.tar.bz2 forums-6deb7b3671c29ab7ce1db6e11b5c6be0950d265f.tar.xz forums-6deb7b3671c29ab7ce1db6e11b5c6be0950d265f.zip | |
[feature/class-prefix] Rename user and session to phpbb_*
PHPBB-10609
Diffstat (limited to 'tests/security')
| -rw-r--r-- | tests/security/base.php | 4 | ||||
| -rw-r--r-- | tests/security/extract_current_page_test.php | 5 | ||||
| -rw-r--r-- | tests/security/redirect_test.php | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/tests/security/base.php b/tests/security/base.php index f7f3f9f661..82e4dda9d0 100644 --- a/tests/security/base.php +++ b/tests/security/base.php @@ -41,13 +41,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 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 = 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 00fc3b5841..b4a475ffb3 100644 --- a/tests/security/extract_current_page_test.php +++ b/tests/security/extract_current_page_test.php @@ -10,7 +10,6 @@ require_once dirname(__FILE__) . '/base.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/session.php'; class phpbb_security_extract_current_page_test extends phpbb_security_test_base { @@ -34,7 +33,7 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base 'QUERY_STRING' => $query_string, )); - $result = 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); @@ -52,7 +51,7 @@ class phpbb_security_extract_current_page_test extends phpbb_security_test_base 'QUERY_STRING' => $query_string, )); - $result = 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); diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php index 634a506ab9..da318209e2 100644 --- a/tests/security/redirect_test.php +++ b/tests/security/redirect_test.php @@ -10,7 +10,6 @@ require_once dirname(__FILE__) . '/base.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; -require_once dirname(__FILE__) . '/../../phpBB/includes/session.php'; class phpbb_security_redirect_test extends phpbb_security_test_base { |