1 files changed, 27 insertions, 75 deletions

diff --git a/apps/user_status/tests/Unit/Service/StatusServiceTest.php b/apps/user_status/tests/Unit/Service/StatusServiceTest.php
index 801d0cea0fc..7dfa5b0d064 100644
--- a/apps/user_status/tests/Unit/Service/StatusServiceTest.php
+++ b/apps/user_status/tests/Unit/Service/StatusServiceTest.php
@@ -31,27 +31,13 @@ use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class StatusServiceTest extends TestCase {
-
-	/** @var UserStatusMapper|MockObject */
-	private $mapper;
-
-	/** @var ITimeFactory|MockObject */
-	private $timeFactory;
-
-	/** @var PredefinedStatusService|MockObject */
-	private $predefinedStatusService;
-
-	/** @var IEmojiHelper|MockObject */
-	private $emojiHelper;
-
-	/** @var IConfig|MockObject */
-	private $config;
-
-	/** @var IUserManager|MockObject */
-	private $userManager;
-
-	/** @var LoggerInterface|MockObject */
-	private $logger;
+	private UserStatusMapper&MockObject $mapper;
+	private ITimeFactory&MockObject $timeFactory;
+	private PredefinedStatusService&MockObject $predefinedStatusService;
+	private IEmojiHelper&MockObject $emojiHelper;
+	private IConfig&MockObject $config;
+	private IUserManager&MockObject $userManager;
+	private LoggerInterface&MockObject $logger;
 
 	private StatusService $service;
 
@@ -235,21 +221,9 @@ class StatusServiceTest extends TestCase {
 		$this->assertNull($status->getMessageId());
 	}
 
-	/**
-	 * @param string $userId
-	 * @param string $status
-	 * @param int|null $statusTimestamp
-	 * @param bool $isUserDefined
-	 * @param bool $expectExisting
-	 * @param bool $expectSuccess
-	 * @param bool $expectTimeFactory
-	 * @param bool $expectException
-	 * @param string|null $expectedExceptionClass
-	 * @param string|null $expectedExceptionMessage
-	 *
-	 * @dataProvider setStatusDataProvider
-	 */
-	public function testSetStatus(string $userId,
+	#[\PHPUnit\Framework\Attributes\DataProvider('setStatusDataProvider')]
+	public function testSetStatus(
+		string $userId,
 		string $status,
 		?int $statusTimestamp,
 		bool $isUserDefined,
@@ -258,7 +232,8 @@ class StatusServiceTest extends TestCase {
 		bool $expectTimeFactory,
 		bool $expectException,
 		?string $expectedExceptionClass,
-		?string $expectedExceptionMessage): void {
+		?string $expectedExceptionMessage,
+	): void {
 		$userStatus = new UserStatus();
 
 		if ($expectExisting) {
@@ -309,7 +284,7 @@ class StatusServiceTest extends TestCase {
 		}
 	}
 
-	public function setStatusDataProvider(): array {
+	public static function setStatusDataProvider(): array {
 		return [
 			['john.doe', 'online', 50,   true,  true,  true, false, false, null, null],
 			['john.doe', 'online', 50,   true,  false, true, false, false, null, null],
@@ -367,20 +342,9 @@ class StatusServiceTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @param string $userId
-	 * @param string $messageId
-	 * @param bool $isValidMessageId
-	 * @param int|null $clearAt
-	 * @param bool $expectExisting
-	 * @param bool $expectSuccess
-	 * @param bool $expectException
-	 * @param string|null $expectedExceptionClass
-	 * @param string|null $expectedExceptionMessage
-	 *
-	 * @dataProvider setPredefinedMessageDataProvider
-	 */
-	public function testSetPredefinedMessage(string $userId,
+	#[\PHPUnit\Framework\Attributes\DataProvider('setPredefinedMessageDataProvider')]
+	public function testSetPredefinedMessage(
+		string $userId,
 		string $messageId,
 		bool $isValidMessageId,
 		?int $clearAt,
@@ -388,7 +352,8 @@ class StatusServiceTest extends TestCase {
 		bool $expectSuccess,
 		bool $expectException,
 		?string $expectedExceptionClass,
-		?string $expectedExceptionMessage): void {
+		?string $expectedExceptionMessage,
+	): void {
 		$userStatus = new UserStatus();
 
 		if ($expectExisting) {
@@ -451,7 +416,7 @@ class StatusServiceTest extends TestCase {
 		}
 	}
 
-	public function setPredefinedMessageDataProvider(): array {
+	public static function setPredefinedMessageDataProvider(): array {
 		return [
 			['john.doe', 'sick-leave', true, null, true,  true,  false, null, null],
 			['john.doe', 'sick-leave', true, null, false, true,  false, null, null],
@@ -464,21 +429,9 @@ class StatusServiceTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @param string $userId
-	 * @param string|null $statusIcon
-	 * @param bool $supportsEmoji
-	 * @param string $message
-	 * @param int|null $clearAt
-	 * @param bool $expectExisting
-	 * @param bool $expectSuccess
-	 * @param bool $expectException
-	 * @param string|null $expectedExceptionClass
-	 * @param string|null $expectedExceptionMessage
-	 *
-	 * @dataProvider setCustomMessageDataProvider
-	 */
-	public function testSetCustomMessage(string $userId,
+	#[\PHPUnit\Framework\Attributes\DataProvider('setCustomMessageDataProvider')]
+	public function testSetCustomMessage(
+		string $userId,
 		?string $statusIcon,
 		bool $supportsEmoji,
 		string $message,
@@ -487,7 +440,8 @@ class StatusServiceTest extends TestCase {
 		bool $expectSuccess,
 		bool $expectException,
 		?string $expectedExceptionClass,
-		?string $expectedExceptionMessage): void {
+		?string $expectedExceptionMessage,
+	): void {
 		$userStatus = new UserStatus();
 
 		if ($expectExisting) {
@@ -548,7 +502,7 @@ class StatusServiceTest extends TestCase {
 		}
 	}
 
-	public function setCustomMessageDataProvider(): array {
+	public static function setCustomMessageDataProvider(): array {
 		return [
 			['john.doe', '😁', true, 'Custom message', null, true,  true, false, null, null],
 			['john.doe', '😁', true, 'Custom message', null, false, true, false, null, null],
@@ -815,7 +769,7 @@ class StatusServiceTest extends TestCase {
 		$this->service->revertMultipleUserStatus(['john', 'nobackup', 'backuponly', 'nobackupanddnd'], 'call');
 	}
 
-	public function dataSetUserStatus(): array {
+	public static function dataSetUserStatus(): array {
 		return [
 			[IUserStatus::MESSAGE_CALENDAR_BUSY, '', false],
 
@@ -839,9 +793,7 @@ class StatusServiceTest extends TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider dataSetUserStatus
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataSetUserStatus')]
 	public function testSetUserStatus(string $messageId, string $oldMessageId, bool $expectedUpdateShortcut): void {
 		$previous = new UserStatus();
 		$previous->setId(1);