Merge branch 'master' into chore(ci)/use-specific-images

Author: tarlepp

src/Security/UserTypeIdentification.php

@@ -58,7 +58,7 @@ public function getUser(): ?User
     /**
      * Helper method to get user identity object via token storage.
      */
-    public function getIdentity(): ?UserInterface
+    public function getIdentity(): SecurityUser|ApiKeyUser|null
     {
         return $this->getSecurityUser() ?? $this->getApiKeyUser();
     }
@@ -88,10 +88,8 @@ public function getSecurityUser(): ?SecurityUser
      * object implementing a __toString method, or the username as a regular
      * string.
      */
-    private function getUserToken(): UserInterface | null
+    private function getUserToken(): UserInterface|null
     {
-        $token = $this->tokenStorage->getToken();
-
-        return $token?->getUser();
+        return $this->tokenStorage->getToken()?->getUser();
     }
 }