[12.x] Test Improvements (#55307)

* [12.x] Test Improvements

fixes risky tests

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

* wip

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

---------

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

Author: crynobone

tests/Database/DatabaseEloquentCollectionTest.php

@@ -14,6 +14,8 @@
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
+use function Orchestra\Testbench\phpunit_version_compare;
+
 class DatabaseEloquentCollectionTest extends TestCase
 {
     /**
@@ -702,7 +704,12 @@ public function testLoadExistsShouldCastBool()
         $user = EloquentTestUserModel::with('articles')->first();
         $user->articles->loadExists('comments');
         $commentsExists = $user->articles->pluck('comments_exists')->toArray();
-        $this->assertContainsOnly('bool', $commentsExists);
+
+        if (phpunit_version_compare('11.5.0', '<')) {
+            $this->assertContainsOnly('bool', $commentsExists);
+        } else {
+            $this->assertContainsOnlyBool($commentsExists);
+        }
     }
 
     public function testWithNonScalarKey()

tests/Integration/Cache/Psr6RedisTest.php

@@ -14,16 +14,15 @@ class Psr6RedisTest extends TestCase
 
     protected function setUp(): void
     {
-        parent::setUp();
+        $this->afterApplicationCreated(function () {
+            $this->setUpRedis();
+        });
 
-        $this->setUpRedis();
-    }
+        $this->beforeApplicationDestroyed(function () {
+            $this->tearDownRedis();
+        });
 
-    protected function tearDown(): void
-    {
-        $this->tearDownRedis();
-
-        parent::tearDown();
+        parent::setUp();
     }
 
     #[DataProvider('redisClientDataProvider')]

tests/Integration/Cache/RedisStoreTest.php

@@ -16,18 +16,19 @@ class RedisStoreTest extends TestCase
 {
     use InteractsWithRedis;
 
+    /** {@inheritdoc} */
+    #[\Override]
     protected function setUp(): void
     {
-        parent::setUp();
+        $this->afterApplicationCreated(function () {
+            $this->setUpRedis();
+        });
 
-        $this->setUpRedis();
-    }
+        $this->beforeApplicationDestroyed(function () {
+            $this->tearDownRedis();
+        });
 
-    protected function tearDown(): void
-    {
-        $this->tearDownRedis();
-
-        parent::tearDown();
+        parent::setUp();
     }
 
     public function testCacheTtl(): void

tests/Integration/Queue/RedisQueueTest.php

@@ -31,18 +31,19 @@ class RedisQueueTest extends TestCase
      */
     private $container;
 
+    /** {@inheritdoc} */
+    #[\Override]
     protected function setUp(): void
     {
-        parent::setUp();
-
-        $this->setUpRedis();
-    }
+        $this->afterApplicationCreated(function () {
+            $this->setUpRedis();
+        });
 
-    protected function tearDown(): void
-    {
-        $this->tearDownRedis();
+        $this->beforeApplicationDestroyed(function () {
+            $this->tearDownRedis();
+        });
 
-        parent::tearDown();
+        parent::setUp();
     }
 
     /**