3 files changed, 51 insertions, 51 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 42ee509df4..6851bc8188 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -960,10 +960,10 @@ class session
 		}
 
 		/**
-		* Get expired sessions for registered users, only most recent for each user
-		* Inner SELECT gets most recent expired sessions for unique session_user_id
-		* Outer SELECT gets data for them
-		*/
+		 * Get expired sessions for registered users, only most recent for each user
+		 * Inner SELECT gets most recent expired sessions for unique session_user_id
+		 * Outer SELECT gets data for them
+		 */
 		$sql_select = 'SELECT s1.session_page, s1.session_user_id, s1.session_time AS recent_time
 			FROM ' . SESSIONS_TABLE . ' AS s1
 			INNER JOIN (
@@ -979,8 +979,7 @@ class session
 		switch ($db->get_sql_layer())
 		{
 			case 'sqlite3':
-			case 'oracle':
-				if ($db->get_sql_layer() === 'sqlite3' && phpbb_version_compare($db->sql_server_info(true), '3.8.3', '>='))
+				if (phpbb_version_compare($db->sql_server_info(true), '3.8.3', '>='))
 				{
 					// For SQLite versions 3.8.3+ which support Common Table Expressions (CTE)
 					$sql = "WITH s3 (session_page, session_user_id, session_time) AS ($sql_select)
@@ -988,20 +987,21 @@ class session
 						SET (user_lastpage, user_lastvisit) = (SELECT session_page, session_time FROM s3 WHERE session_user_id = user_id)
 						WHERE EXISTS (SELECT session_user_id FROM s3 WHERE session_user_id = user_id)';
 					$db->sql_query($sql);
+
+					break;
 				}
-				else
+
+			// No break, for SQLite versions prior to 3.8.3 and Oracle
+			case 'oracle':
+				$result = $db->sql_query($sql_select);
+				while ($row = $db->sql_fetchrow($result))
 				{
-					// For SQLite versions prior to 3.8.3 and Oracle
-					$result = $db->sql_query($sql_select);
-					while ($row = $db->sql_fetchrow($result))
-					{
-						$sql = 'UPDATE ' . USERS_TABLE . '
-							SET user_lastvisit = ' . (int) $row['recent_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "'
-							WHERE user_id = " . (int) $row['session_user_id'];
-						$db->sql_query($sql);
-					}
-					$db->sql_freeresult($result);
+					$sql = 'UPDATE ' . USERS_TABLE . '
+						SET user_lastvisit = ' . (int) $row['recent_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "'
+						WHERE user_id = " . (int) $row['session_user_id'];
+					$db->sql_query($sql);
 				}
+				$db->sql_freeresult($result);
 			break;
 
 			case 'mysqli':
@@ -1037,7 +1037,7 @@ class session
 		}
 
 		// only called from CRON; should be a safe workaround until the infrastructure gets going
-		/* @var $captcha_factory \phpbb\captcha\factory */
+		/* @var \phpbb\captcha\factory $captcha_factory */
 		$captcha_factory = $phpbb_container->get('captcha.factory');
 		$captcha_factory->garbage_collect($config['captcha_plugin']);
 
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 . '