From 1b282d0fc3303c2ecfed9073bc60497012ac078a Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 17 May 2024 07:28:29 +0000
Subject: [PATCH] set correct return type, fixes #4180
Closes #4180
Merge request studip/studip!3020
---
lib/classes/JsonApi/JsonApiController.php | 6 +++---
lib/classes/JsonApi/NonJsonApiController.php | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/classes/JsonApi/JsonApiController.php b/lib/classes/JsonApi/JsonApiController.php
index 1718c52f86a..614650d6d93 100644
--- a/lib/classes/JsonApi/JsonApiController.php
+++ b/lib/classes/JsonApi/JsonApiController.php
@@ -375,12 +375,12 @@ class JsonApiController
*
* @param Request $request Request der eingehende Request
*
- * @return mixed entweder null oder das User-Objekt des
- * "eingeloggten" Nutzers
+ * @return null|\User entweder null oder das User-Objekt des "eingeloggten"
+ * Nutzers
*/
public function getUser(Request $request)
{
- return $request->getAttribute(Authentication::USER_KEY, null);
+ return $request->getAttribute(Authentication::USER_KEY);
}
/**
diff --git a/lib/classes/JsonApi/NonJsonApiController.php b/lib/classes/JsonApi/NonJsonApiController.php
index 8384b54fdd1..bfc51af3cba 100644
--- a/lib/classes/JsonApi/NonJsonApiController.php
+++ b/lib/classes/JsonApi/NonJsonApiController.php
@@ -49,11 +49,11 @@ class NonJsonApiController
}
/**
- * @return mixed
+ * @return null|\User
*/
protected function getUser(Request $request)
{
- return $request->getAttribute(Authentication::USER_KEY, null);
+ return $request->getAttribute(Authentication::USER_KEY);
}
/**
--
GitLab