[10.x] Test Improvements for Cache tests (#50684)

* [10.x] Test Improvements for Cache tests

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* Update MemcachedTaggedCacheTestCase.php

* Update PhpRedisCacheLockTest.php

* wip

---------

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

tests/Integration/Cache/DynamoDbStoreTest.php

@@ -7,19 +7,12 @@
 use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
+use Orchestra\Testbench\Attributes\RequiresEnv;
 use Orchestra\Testbench\TestCase;
 
+#[RequiresEnv('DYNAMODB_CACHE_TABLE')]
 class DynamoDbStoreTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        if (! env('DYNAMODB_CACHE_TABLE')) {
-            $this->markTestSkipped('DynamoDB not configured.');
-        }
-
-        parent::setUp();
-    }
-
     public function testItemsCanBeStoredAndRetrieved()
     {
         Cache::driver('dynamodb')->put('name', 'Taylor', 10);

tests/Integration/Cache/FileCacheLockTest.php

@@ -4,21 +4,12 @@
 
 use Exception;
 use Illuminate\Support\Facades\Cache;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('cache.default', 'file')]
 class FileCacheLockTest extends TestCase
 {
-    /**
-     * Define environment setup.
-     *
-     * @param  \Illuminate\Foundation\Application  $app
-     * @return void
-     */
-    protected function getEnvironmentSetUp($app)
-    {
-        $app['config']->set('cache.default', 'file');
-    }
-
     public function testLocksCanBeAcquiredAndReleased()
     {
         Cache::lock('foo')->forceRelease();

tests/Integration/Cache/MemcachedCacheLockTestCase.php

@@ -4,10 +4,9 @@
 
 use Illuminate\Contracts\Cache\LockTimeoutException;
 use Illuminate\Support\Facades\Cache;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 
-/**
- * @requires extension memcached
- */
+#[RequiresPhpExtension('memcached')]
 class MemcachedCacheLockTestCase extends MemcachedIntegrationTestCase
 {
     public function testMemcachedLocksCanBeAcquiredAndReleased()

tests/Integration/Cache/MemcachedTaggedCacheTestCase.php

@@ -3,10 +3,9 @@
 namespace Illuminate\Tests\Integration\Cache;
 
 use Illuminate\Support\Facades\Cache;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 
-/**
- * @requires extension memcached
- */
+#[RequiresPhpExtension('memcached')]
 class MemcachedTaggedCacheTestCase extends MemcachedIntegrationTestCase
 {
     public function testMemcachedCanStoreAndRetrieveTaggedCacheItems()

tests/Integration/Cache/NoLockTest.php

@@ -3,27 +3,13 @@
 namespace Illuminate\Tests\Integration\Cache;
 
 use Illuminate\Support\Facades\Cache;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('cache.default', 'null')]
+#[WithConfig('cache.stores.null', ['driver' => 'null'])]
 class NoLockTest extends TestCase
 {
-    /**
-     * Define environment setup.
-     *
-     * @param  \Illuminate\Foundation\Application  $app
-     * @return void
-     */
-    protected function getEnvironmentSetUp($app)
-    {
-        $app['config']->set('cache.default', 'null');
-
-        $app['config']->set('cache.stores', [
-            'null' => [
-                'driver' => 'null',
-            ],
-        ]);
-    }
-
     public function testLocksCanAlwaysBeAcquiredAndReleased()
     {
         Cache::lock('foo')->forceRelease();

tests/Integration/Cache/PhpRedisCacheLockTest.php

@@ -5,6 +5,7 @@
 use Illuminate\Foundation\Testing\Concerns\InteractsWithRedis;
 use Illuminate\Support\Facades\Cache;
 use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use Redis;
 
 class PhpRedisCacheLockTest extends TestCase
@@ -138,9 +139,7 @@ public function testRedisLockCanBeAcquiredAndReleasedWithMsgpackSerialization()
         $this->assertNull($store->lockConnection()->get($store->getPrefix().'foo'));
     }
 
-    /**
-     * @requires extension lzf
-     */
+    #[RequiresPhpExtension('lzf')]
     public function testRedisLockCanBeAcquiredAndReleasedWithLzfCompression()
     {
         if (! defined('Redis::COMPRESSION_LZF')) {
@@ -167,9 +166,7 @@ public function testRedisLockCanBeAcquiredAndReleasedWithLzfCompression()
         $this->assertNull($store->lockConnection()->get($store->getPrefix().'foo'));
     }
 
-    /**
-     * @requires extension zstd
-     */
+    #[RequiresPhpExtension('zstd')]
     public function testRedisLockCanBeAcquiredAndReleasedWithZstdCompression()
     {
         if (! defined('Redis::COMPRESSION_ZSTD')) {
@@ -215,9 +212,7 @@ public function testRedisLockCanBeAcquiredAndReleasedWithZstdCompression()
         $this->assertNull($store->lockConnection()->get($store->getPrefix().'foo'));
     }
 
-    /**
-     * @requires extension lz4
-     */
+    #[RequiresPhpExtension('lz4')]
     public function testRedisLockCanBeAcquiredAndReleasedWithLz4Compression()
     {
         if (! defined('Redis::COMPRESSION_LZ4')) {
@@ -263,9 +258,7 @@ public function testRedisLockCanBeAcquiredAndReleasedWithLz4Compression()
         $this->assertNull($store->lockConnection()->get($store->getPrefix().'foo'));
     }
 
-    /**
-     * @requires extension Lzf
-     */
+    #[RequiresPhpExtension('Lzf')]
     public function testRedisLockCanBeAcquiredAndReleasedWithSerializationAndCompression()
     {
         if (! defined('Redis::COMPRESSION_LZF')) {

tests/Integration/Cache/Psr6RedisTest.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Tests\Integration\Cache\Fixtures\Unserializable;
 use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class Psr6RedisTest extends TestCase
 {
@@ -25,9 +26,7 @@ protected function tearDown(): void
         $this->tearDownRedis();
     }
 
-    /**
-     * @dataProvider redisClientDataProvider
-     */
+    #[DataProvider('redisClientDataProvider')]
     public function testTransactionIsNotOpenedWhenSerializationFails($redisClient): void
     {
         $this->app['config']['cache.default'] = 'redis';