3 files changed, 19 insertions, 32 deletions

diff --git a/apps/settings/tests/Activity/SecurityFilterTest.php b/apps/settings/tests/Activity/SecurityFilterTest.php
index f3f94df3d21..b07c1e825b4 100644
--- a/apps/settings/tests/Activity/SecurityFilterTest.php
+++ b/apps/settings/tests/Activity/SecurityFilterTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -12,15 +13,9 @@ use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class SecurityFilterTest extends TestCase {
-
-	/** @var IURLGenerator|MockObject */
-	private $urlGenerator;
-
-	/** @var IL10N|MockObject */
-	private $l10n;
-
-	/** @var SecurityFilter */
-	private $filter;
+	private IURLGenerator&MockObject $urlGenerator;
+	private IL10N&MockObject $l10n;
+	private SecurityFilter $filter;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/apps/settings/tests/Activity/SecurityProviderTest.php b/apps/settings/tests/Activity/SecurityProviderTest.php
index 35526995a67..ed9de362a87 100644
--- a/apps/settings/tests/Activity/SecurityProviderTest.php
+++ b/apps/settings/tests/Activity/SecurityProviderTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -16,27 +17,19 @@ use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class SecurityProviderTest extends TestCase {
-
-	/** @var IFactory|MockObject */
-	private $l10n;
-
-	/** @var IURLGenerator|MockObject */
-	private $urlGenerator;
-
-	/** @var IManager|MockObject */
-	private $activityManager;
-
-	/** @var SecurityProvider */
-	private $provider;
+	private IFactory&MockObject $l10nFactory;
+	private IURLGenerator&MockObject $urlGenerator;
+	private IManager&MockObject $activityManager;
+	private SecurityProvider $provider;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->l10n = $this->createMock(IFactory::class);
+		$this->l10nFactory = $this->createMock(IFactory::class);
 		$this->urlGenerator = $this->createMock(IURLGenerator::class);
 		$this->activityManager = $this->createMock(IManager::class);
 
-		$this->provider = new SecurityProvider($this->l10n, $this->urlGenerator, $this->activityManager);
+		$this->provider = new SecurityProvider($this->l10nFactory, $this->urlGenerator, $this->activityManager);
 	}
 
 	public function testParseUnrelated(): void {
@@ -50,17 +43,15 @@ class SecurityProviderTest extends TestCase {
 		$this->provider->parse($lang, $event);
 	}
 
-	public function subjectData() {
+	public static function subjectData(): array {
 		return [
 			['twofactor_success'],
 			['twofactor_failed'],
 		];
 	}
 
-	/**
-	 * @dataProvider subjectData
-	 */
-	public function testParse($subject): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('subjectData')]
+	public function testParse(string $subject): void {
 		$lang = 'ru';
 		$event = $this->createMock(IEvent::class);
 		$l = $this->createMock(IL10N::class);
@@ -68,7 +59,7 @@ class SecurityProviderTest extends TestCase {
 		$event->expects($this->once())
 			->method('getType')
 			->willReturn('security');
-		$this->l10n->expects($this->once())
+		$this->l10nFactory->expects($this->once())
 			->method('get')
 			->with('settings', $lang)
 			->willReturn($l);
@@ -104,7 +95,7 @@ class SecurityProviderTest extends TestCase {
 		$event->expects($this->once())
 			->method('getType')
 			->willReturn('security');
-		$this->l10n->expects($this->once())
+		$this->l10nFactory->expects($this->once())
 			->method('get')
 			->with('settings', $lang)
 			->willReturn($l);
diff --git a/apps/settings/tests/Activity/SecuritySettingTest.php b/apps/settings/tests/Activity/SecuritySettingTest.php
index 1b2b0e3361c..ca11e38caa8 100644
--- a/apps/settings/tests/Activity/SecuritySettingTest.php
+++ b/apps/settings/tests/Activity/SecuritySettingTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -12,8 +13,8 @@ use Test\TestCase;
 class SecuritySettingTest extends TestCase {
 	private $l10n;
 
-	/** @var SecuritySetting */
-	private $setting;
+	/** @var  */
+	private SecuritySetting $setting;
 
 	protected function setUp(): void {
 		parent::setUp();