mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/class-prefix] Rename user and session to phpbb_*

Browse Source 
PHPBB-10609
This commit is contained in:
Igor Wiedler
2012-03-31 02:50:19 +02:00
parent 0ae491c5fa
commit 6deb7b3671
14 changed files with 867 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/mock/session_testable.php
View File

@@ -8,7 +8,6 @@
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
/**
* Extends the session class to overwrite the setting of cookies.
@@ -17,7 +16,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
* test it without warnings about sent headers. This class only stores cookie
* data for later verification.
*/
class phpbb_mock_session_testable extends session
class phpbb_mock_session_testable extends phpbb_session
{
private $_cookies = array();

4
tests/security/base.php
View File

@@ -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()

5
tests/security/extract_current_page_test.php
View File

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

1
tests/security/redirect_test.php
View File

@@ -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
{

6
tests/user/lang_test.php
View File

@@ -7,13 +7,11 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
class phpbb_user_lang_test extends phpbb_test_case
{
public function test_user_lang_sprintf()
{
$user = new user;
$user = new phpbb_user;
$user->lang = array(
'FOO' => 'BAR',
'BARZ' => 'PENG',
@@ -95,7 +93,7 @@ class phpbb_user_lang_test extends phpbb_test_case
$this->assertEquals($user->lang('ARRY', 1, 's', 2), '1 post');
// ticket PHPBB3-10345 - different plural rules, not just 0/1/2+
$user = new user;
$user = new phpbb_user;
$user->lang = array(
'PLURAL_RULE' => 13,
'ARRY' => array(