mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-23 15:59:49 +02:00
Code Issues Releases Wiki Activity

[task/functional] Change property visibility, remove globals, reword comment

Browse Source 
PHPBB3-10758
This commit is contained in:
David King 2012-05-22 10:46:36 -04:00
parent b82c77b38f
commit b96c050695
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_framework/phpbb_functional_test_case.php
View File

@ -14,14 +14,16 @@ class phpbb_functional_test_case extends phpbb_test_case
{ {
protected $client; protected $client;
protected $root_url; protected $root_url;
/** /**
* @var string Session ID for current test's session (each test makes its own) * @var string Session ID for current test's session (each test makes its own)
*/ */
protected $sid; protected $sid;
/** /**
* @var array Language array used by phpBB * @var array Language array used by phpBB
*/ */
private $lang = array(); protected $lang = array();
static protected $config = array(); static protected $config = array();
static protected $already_installed = false; static protected $already_installed = false;
@ -187,8 +189,8 @@ class phpbb_functional_test_case extends phpbb_test_case
$login = $this->client->submit($form, array('username' => 'admin', 'password' => 'admin')); $login = $this->client->submit($form, array('username' => 'admin', 'password' => 'admin'));
$cookies = $this->cookieJar->all(); $cookies = $this->cookieJar->all();
$sid = '';
// get the SID from the cookie // The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
foreach ($cookies as $key => $cookie); foreach ($cookies as $key => $cookie);
{ {
if (substr($key, -4) == '_sid') if (substr($key, -4) == '_sid')
@ -200,8 +202,6 @@ class phpbb_functional_test_case extends phpbb_test_case
protected function add_lang($lang_file) protected function add_lang($lang_file)
{ {
global $phpbb_root_path, $phpEx;
if (is_array($lang_file)) if (is_array($lang_file))
{ {
foreach ($lang_file as $file) foreach ($lang_file as $file)
@ -210,7 +210,7 @@ class phpbb_functional_test_case extends phpbb_test_case
} }
} }
$lang_path = "{$phpbb_root_path}language/en/$lang_file.$phpEx"; $lang_path = "./phpBB/language/en/$lang_file.php";
$lang = array(); $lang = array();