Remove unnecessary method `getSpiderIdentifier`

[GitHub/WoltLab/WCF.git] / wcfsetup / install / files / lib / system / session / SessionHandler.class.php

diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index bf6a61dc31fac788259ac3344fc0be44bc615c82..2d3078981ad67aea0a35aa80c8f3dcf0c2e99eae 100644 (file)
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -586,7 +586,7 @@ final class SessionHandler extends SingletonFactory
                 $condition->add('userID IS NULL');
                 $condition->add('(sessionID = ? OR spiderIdentifier = ?)', [
                     $row['sessionID'],
-                    $this->getSpiderIdentifier(UserUtil::getUserAgent()),
+                    SpiderHandler::getInstance()->getIdentifier(UserUtil::getUserAgent()),
                 ]);
             }
 
@@ -662,7 +662,7 @@ final class SessionHandler extends SingletonFactory
         if (!$this->isACP) {
             // Try to find an existing spider session. Order by lastActivityTime to maintain a
             // stable selection in case duplicates exist for some reason.
-            $spiderIdentifier = $this->getSpiderIdentifier(UserUtil::getUserAgent());
+            $spiderIdentifier = SpiderHandler::getInstance()->getIdentifier(UserUtil::getUserAgent());
             if ($spiderIdentifier) {
                 $sql = "SELECT      *
                         FROM        wcf1_session
@@ -684,7 +684,7 @@ final class SessionHandler extends SingletonFactory
     {
         $spiderIdentifier = null;
         if (!$this->user->userID) {
-            $spiderIdentifier = $this->getSpiderIdentifier(UserUtil::getUserAgent());
+            $spiderIdentifier = SpiderHandler::getInstance()->getIdentifier(UserUtil::getUserAgent());
         }
 
         // save session
@@ -1290,14 +1290,6 @@ final class SessionHandler extends SingletonFactory
         }
     }
 
-    /**
-     * Returns the spider identifier for given user agent.
-     */
-    private function getSpiderIdentifier(string $userAgent): ?string
-    {
-        return SpiderHandler::getInstance()->getIdentifier($userAgent);
-    }
-
     /**
      * Returns true if this is a new session.
      */