diff options
| author | David King <imkingdavid@gmail.com> | 2012-05-22 10:46:36 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-05-22 10:46:36 -0400 |
| commit | b96c05069569dd1db48a5bffa15c2fcd69369e6b (patch) | |
| tree | 63e0989c9bf5944489b996b9139733d5990bbdee /tests | |
| parent | b82c77b38f69aa2d8030ee848042a0169592878b (diff) | |
| download | forums-b96c05069569dd1db48a5bffa15c2fcd69369e6b.tar forums-b96c05069569dd1db48a5bffa15c2fcd69369e6b.tar.gz forums-b96c05069569dd1db48a5bffa15c2fcd69369e6b.tar.bz2 forums-b96c05069569dd1db48a5bffa15c2fcd69369e6b.tar.xz forums-b96c05069569dd1db48a5bffa15c2fcd69369e6b.zip | |
[task/functional] Change property visibility, remove globals, reword comment
PHPBB3-10758
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 177f93cf3b..59579c1c33 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -14,14 +14,16 @@ class phpbb_functional_test_case extends phpbb_test_case { protected $client; protected $root_url; + /** * @var string Session ID for current test's session (each test makes its own) */ protected $sid; + /** * @var array Language array used by phpBB */ - private $lang = array(); + protected $lang = array(); static protected $config = array(); 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')); $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); { if (substr($key, -4) == '_sid') @@ -200,8 +202,6 @@ class phpbb_functional_test_case extends phpbb_test_case protected function add_lang($lang_file) { - global $phpbb_root_path, $phpEx; - if (is_array($lang_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(); |