diff options
| author | rxu <rxu@mail.ru> | 2019-11-05 20:42:59 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2019-11-05 22:53:11 +0700 |
| commit | 7ea063100e23234bf0d6a79fd0411e956a1b6668 (patch) | |
| tree | df4a818d3228b68359a69b102e9bd7b4e8dc481a /tests | |
| parent | 56bff6380e9c9af8e7b97dbe240779950a3a88c6 (diff) | |
| download | forums-7ea063100e23234bf0d6a79fd0411e956a1b6668.tar forums-7ea063100e23234bf0d6a79fd0411e956a1b6668.tar.gz forums-7ea063100e23234bf0d6a79fd0411e956a1b6668.tar.bz2 forums-7ea063100e23234bf0d6a79fd0411e956a1b6668.tar.xz forums-7ea063100e23234bf0d6a79fd0411e956a1b6668.zip | |
[ticket/15294] Minor code adjusting
PHPBB3-15294
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/session/garbage_collection_test.php | 64 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_session_test_case.php | 2 |
2 files changed, 33 insertions, 33 deletions
diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php index 8eeffec2c0..ec248b2904 100644 --- a/tests/session/garbage_collection_test.php +++ b/tests/session/garbage_collection_test.php @@ -47,32 +47,32 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case $config['session_length'] = 3600; $this->check_expired_sessions_recent( - array( - array( + [ + [ 'session_user_id' => 4, 'recent_time' => 1500000000, - ), - array( + ], + [ 'session_user_id' => 5, 'recent_time' => 1500000000, - ), - ), + ], + ], 'Before test, should get recent expired sessions only.' ); $this->check_user_session_data( - array( - array( + [ + [ 'username_clean' => 'bar', 'user_lastvisit' => 1400000000, 'user_lastpage' => 'oldpage_user_bar.php', - ), - array( + ], + [ 'username_clean' => 'foo', 'user_lastvisit' => 1400000000, 'user_lastpage' => 'oldpage_user_foo.php', - ), - ), + ], + ], 'Before test, users session data is not updated yet.' ); @@ -80,23 +80,23 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case $config['captcha_plugin'] = 'core.captcha.plugins.nogd'; $this->session->session_gc(); $this->check_expired_sessions_recent( - array(), + [], 'After garbage collection, all expired sessions should be removed.' ); $this->check_user_session_data( - array( - array( + [ + [ 'username_clean' => 'bar', 'user_lastvisit' => '1500000000', 'user_lastpage' => 'newpage_user_bar.php', - ), - array( + ], + [ 'username_clean' => 'foo', 'user_lastvisit' => '1500000000', 'user_lastpage' => 'newpage_user_foo.php', - ), - ), + ], + ], 'After garbage collection, users session data should be updated to the recent expired sessions data.' ); } @@ -104,28 +104,28 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case public function test_cleanup_all() { $this->check_sessions_equals( - array( - array( + [ + [ 'session_id' => 'anon_session00000000000000000000', 'session_user_id' => 1, - ), - array( + ], + [ 'session_id' => 'bar_session000000000000000000000', 'session_user_id' => 4, - ), - array( + ], + [ 'session_id' => 'bar_session000000000000000000002', 'session_user_id' => 4, - ), - array( + ], + [ 'session_id' => 'foo_session000000000000000000000', 'session_user_id' => 5, - ), - array( + ], + [ 'session_id' => 'foo_session000000000000000000002', 'session_user_id' => 5, - ), - ), + ], + ], 'Before test, should have some sessions.' ); // Set session length so it clears all @@ -135,7 +135,7 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case $config['captcha_plugin'] = 'core.captcha.plugins.nogd'; $this->session->session_gc(); $this->check_sessions_equals( - array(), + [], 'After setting session time to 0, should remove all.' ); } diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index 3746a15280..530d8c6b48 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -61,7 +61,7 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case { global $config; $time_now = time(); - $sql= 'SELECT session_user_id, MAX(session_time) AS recent_time + $sql = 'SELECT session_user_id, MAX(session_time) AS recent_time FROM ' . SESSIONS_TABLE . ' WHERE session_time < ' . ($time_now - (int) $config['session_length']) . ' AND session_user_id <> ' . ANONYMOUS . ' |