1 files changed, 16 insertions, 17 deletions

diff --git a/tests/lib/Memcache/FactoryTest.php b/tests/lib/Memcache/FactoryTest.php
index fa0d80c5153..e16e079349f 100644
--- a/tests/lib/Memcache/FactoryTest.php
+++ b/tests/lib/Memcache/FactoryTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -7,7 +8,9 @@
 
 namespace Test\Memcache;
 
+use OC\Memcache\Factory;
 use OC\Memcache\NullCache;
+use OCP\HintException;
 use OCP\Profiler\IProfiler;
 use Psr\Log\LoggerInterface;
 
@@ -56,37 +59,37 @@ class FactoryTest extends \Test\TestCase {
 	public const UNAVAILABLE1 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache1';
 	public const UNAVAILABLE2 = '\\Test\\Memcache\\Test_Factory_Unavailable_Cache2';
 
-	public function cacheAvailabilityProvider() {
+	public static function cacheAvailabilityProvider(): array {
 		return [
 			[
 				// local and distributed available
 				self::AVAILABLE1, self::AVAILABLE2, null,
-				self::AVAILABLE1, self::AVAILABLE2, \OC\Memcache\Factory::NULL_CACHE
+				self::AVAILABLE1, self::AVAILABLE2, Factory::NULL_CACHE
 			],
 			[
 				// local and distributed null
 				null, null, null,
-				\OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE
+				Factory::NULL_CACHE, Factory::NULL_CACHE, Factory::NULL_CACHE
 			],
 			[
 				// local available, distributed null (most common scenario)
 				self::AVAILABLE1, null, null,
-				self::AVAILABLE1, self::AVAILABLE1, \OC\Memcache\Factory::NULL_CACHE
+				self::AVAILABLE1, self::AVAILABLE1, Factory::NULL_CACHE
 			],
 			[
 				// locking cache available
 				null, null, self::AVAILABLE1,
-				\OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE, self::AVAILABLE1
+				Factory::NULL_CACHE, Factory::NULL_CACHE, self::AVAILABLE1
 			],
 			[
 				// locking cache unavailable: no exception here in the factory
 				null, null, self::UNAVAILABLE1,
-				\OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE, \OC\Memcache\Factory::NULL_CACHE
+				Factory::NULL_CACHE, Factory::NULL_CACHE, Factory::NULL_CACHE
 			]
 		];
 	}
 
-	public function cacheUnavailableProvider() {
+	public static function cacheUnavailableProvider(): array {
 		return [
 			[
 				// local available, distributed unavailable
@@ -103,34 +106,30 @@ class FactoryTest extends \Test\TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider cacheAvailabilityProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('cacheAvailabilityProvider')]
 	public function testCacheAvailability($localCache, $distributedCache, $lockingCache,
 		$expectedLocalCache, $expectedDistributedCache, $expectedLockingCache): void {
 		$logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
 		$profiler = $this->getMockBuilder(IProfiler::class)->getMock();
-		$factory = new \OC\Memcache\Factory(fn () => 'abc', $logger, $profiler, $localCache, $distributedCache, $lockingCache);
+		$factory = new Factory(fn () => 'abc', $logger, $profiler, $localCache, $distributedCache, $lockingCache);
 		$this->assertTrue(is_a($factory->createLocal(), $expectedLocalCache));
 		$this->assertTrue(is_a($factory->createDistributed(), $expectedDistributedCache));
 		$this->assertTrue(is_a($factory->createLocking(), $expectedLockingCache));
 	}
 
-	/**
-	 * @dataProvider cacheUnavailableProvider
-	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('cacheUnavailableProvider')]
 	public function testCacheNotAvailableException($localCache, $distributedCache): void {
-		$this->expectException(\OCP\HintException::class);
+		$this->expectException(HintException::class);
 
 		$logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
 		$profiler = $this->getMockBuilder(IProfiler::class)->getMock();
-		new \OC\Memcache\Factory(fn () => 'abc', $logger, $profiler, $localCache, $distributedCache);
+		new Factory(fn () => 'abc', $logger, $profiler, $localCache, $distributedCache);
 	}
 
 	public function testCreateInMemory(): void {
 		$logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
 		$profiler = $this->getMockBuilder(IProfiler::class)->getMock();
-		$factory = new \OC\Memcache\Factory(fn () => 'abc', $logger, $profiler, null, null, null);
+		$factory = new Factory(fn () => 'abc', $logger, $profiler, null, null, null);
 
 		$cache = $factory->createInMemory();
 		$cache->set('test', 48);