aboutsummaryrefslogtreecommitdiffstats
path: root/tests/session
diff options
context:
space:
mode:
Diffstat (limited to 'tests/session')
-rw-r--r--tests/session/check_ban_test.php11
-rw-r--r--tests/session/check_isvalid_test.php1
2 files changed, 5 insertions, 7 deletions
diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php
index dfe971ea27..303751f54c 100644
--- a/tests/session/check_ban_test.php
+++ b/tests/session/check_ban_test.php
@@ -23,11 +23,11 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
{
return array(
array('All false values, should not be banned',
- false, false, false, false, /* ?: */ false),
+ false, false, false, false, /* should be banned? -> */ false),
array('Matching values in the database, should be banned',
- 4, '127.0.0.1', 'bar@example.org', true, /* ?: */ true),
+ 4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true),
array('IP Banned, should be banned',
- false, '127.1.1.1', false, false, /* ?: */ true),
+ false, '127.1.1.1', false, false, /* should be banned? -> */ true),
);
}
@@ -38,7 +38,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
// Change the global cache object for this test because
// the mock cache object does not hit the database as is
// needed for this test.
- global $cache, $config, $phpbb_root_path, $php_ext;
+ global $cache, $config, $phpbb_root_path, $php_ext;
$cache = new phpbb_cache_service(
new phpbb_cache_driver_file(),
$config,
@@ -49,8 +49,7 @@ class phpbb_session_check_ban_test extends phpbb_session_test_case
try
{
- $is_banned =
- $session->check_ban($user_id, $user_ips, $user_email, $return);
+ $is_banned = $session->check_ban($user_id, $user_ips, $user_email, $return);
} catch (PHPUnit_Framework_Error_Notice $e)
{
// User error was triggered, user must have been banned
diff --git a/tests/session/check_isvalid_test.php b/tests/session/check_isvalid_test.php
index 24dce7c9c4..c60770dad8 100644
--- a/tests/session/check_isvalid_test.php
+++ b/tests/session/check_isvalid_test.php
@@ -9,7 +9,6 @@
require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
-
class phpbb_session_check_isvalid_test extends phpbb_session_test_case
{
public function getDataSet()