From: joshuaruesweg <ruesweg@woltlab.com>
Date: Mon, 26 Oct 2020 12:54:36 +0000 (+0100)
Subject: Import Session class and rename legacy session
X-Git-Tag: 5.4.0_Alpha_1~656^2~14
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b1b40099087eca5efa5a670e5d53c3358c52d42c;p=GitHub%2FWoltLab%2FWCF.git

Import Session class and rename legacy session
---

diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index 7868a451d4..1231daae98 100644
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -1,6 +1,6 @@
 <?php
 namespace wcf\system\session;
-use wcf\data\session\Session;
+use wcf\data\session\Session as LegacySession;
 use wcf\data\session\SessionEditor;
 use wcf\data\user\User;
 use wcf\data\user\UserEditor;
@@ -87,7 +87,7 @@ final class SessionHandler extends SingletonFactory {
 	protected $session = null;
 	
 	/**
-	 * @var \wcf\data\session\Session
+	 * @var LegacySession
 	 */
 	protected $legacySession = null;
 	
@@ -517,7 +517,7 @@ final class SessionHandler extends SingletonFactory {
 				".$condition;
 			$statement = WCF::getDB()->prepareStatement($sql);
 			$statement->execute($condition->getParameters());
-			$this->legacySession = $statement->fetchSingleObject(Session::class);
+			$this->legacySession = $statement->fetchSingleObject(LegacySession::class);
 			
 			if (!$this->legacySession) {
 				$this->createLegacySession();
@@ -988,7 +988,7 @@ final class SessionHandler extends SingletonFactory {
 	/**
 	 * Returns all user sessions for a specific user.
 	 *
-	 * @return      \wcf\system\session\Session[]
+	 * @return      Session[]
 	 * @since       5.4
 	 */
 	public function getUserSessions(User $user): array {
@@ -1005,7 +1005,7 @@ final class SessionHandler extends SingletonFactory {
 		$sessions = [];
 		
 		while ($row = $statement->fetchArray()) {
-			$sessions[] = new \wcf\system\session\Session($row);
+			$sessions[] = new Session($row);
 		} 
 		
 		return $sessions;
@@ -1014,7 +1014,7 @@ final class SessionHandler extends SingletonFactory {
 	/**
 	 * Returns all acp sessions for a specific user.
 	 * 
-	 * @return      \wcf\system\session\Session[]
+	 * @return      Session[]
 	 * @since       5.4
 	 */
 	public function getAcpSessions(User $user): array {
@@ -1031,7 +1031,7 @@ final class SessionHandler extends SingletonFactory {
 		$sessions = [];
 		
 		while ($row = $statement->fetchArray()) {
-			$sessions[] = new \wcf\system\session\Session($row, true);
+			$sessions[] = new Session($row, true);
 		}
 		
 		return $sessions;