[11.x] Test Improvements (#56630)

* Test Improvements

- Fix integration with PHPUnit 12.3.4
- Fix PHPStan

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

* Apply fixes from StyleCI

* wip

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

* wip

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]>
Co-authored-by: StyleCI Bot <[email protected]>

Author: crynobone

composer.json

@@ -111,7 +111,7 @@
         "league/flysystem-read-only": "^3.25.1",
         "league/flysystem-sftp-v3": "^3.25.1",
         "mockery/mockery": "^1.6.10",
-        "orchestra/testbench-core": "^9.13.2",
+        "orchestra/testbench-core": "9.x-dev#78a641cf",
         "pda/pheanstalk": "^5.0.6",
         "php-http/discovery": "^1.15",
         "phpstan/phpstan": "^2.0",

src/Illuminate/Foundation/Bootstrap/HandleExceptions.php

@@ -9,7 +9,9 @@
 use Illuminate\Log\LogManager;
 use Illuminate\Support\Env;
 use Monolog\Handler\NullHandler;
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Runner\ErrorHandler;
+use PHPUnit\Runner\Version;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\ErrorHandler\Error\FatalError;
 use Throwable;
@@ -304,15 +306,16 @@ public static function forgetApp()
     /**
      * Flush the bootstrapper's global state.
      *
+     * @param  \PHPUnit\Framework\TestCase|null  $testCase
      * @return void
      */
-    public static function flushState()
+    public static function flushState(?TestCase $testCase = null)
     {
         if (is_null(static::$app)) {
             return;
         }
 
-        static::flushHandlersState();
+        static::flushHandlersState($testCase);
 
         static::$app = null;
 
@@ -322,9 +325,10 @@ public static function flushState()
     /**
      * Flush the bootstrapper's global handlers state.
      *
+     * @param  \PHPUnit\Framework\TestCase|null  $testCase
      * @return void
      */
-    public static function flushHandlersState()
+    public static function flushHandlersState(?TestCase $testCase = null)
     {
         while (true) {
             $previousHandler = set_exception_handler(static fn () => null);
@@ -355,7 +359,12 @@ public static function flushHandlersState()
 
             if ((fn () => $this->enabled ?? false)->call($instance)) {
                 $instance->disable();
-                $instance->enable();
+
+                if (version_compare(Version::id(), '12.3.4', '>=')) {
+                    $instance->enable($testCase);
+                } else {
+                    $instance->enable();
+                }
             }
         }
     }

src/Illuminate/Foundation/Testing/Concerns/InteractsWithRedis.php

@@ -105,6 +105,10 @@ public function setUpRedis()
      */
     public function tearDownRedis()
     {
+        if (static::$connectionFailedOnceWithDefaultsSkip === true) {
+            return;
+        }
+
         if (isset($this->redis['phpredis'])) {
             $this->redis['phpredis']->connection()->flushdb();
         }

src/Illuminate/Foundation/Testing/Concerns/InteractsWithTestCaseLifecycle.php

@@ -175,7 +175,7 @@ protected function tearDownTheTestEnvironment(): void
         Factory::flushState();
         EncodedHtmlString::flushState();
         EncryptCookies::flushState();
-        HandleExceptions::flushState();
+        HandleExceptions::flushState($this);
         Markdown::flushState();
         Migrator::withoutMigrations([]);
         Once::flush();

tests/Foundation/Bootstrap/HandleExceptionsTest.php

@@ -38,7 +38,7 @@ protected function handleExceptions()
     protected function tearDown(): void
     {
         Application::setInstance(null);
-        HandleExceptions::flushState();
+        HandleExceptions::flushState($this);
 
         m::close();
     }

types/Support/Helpers.php

@@ -43,8 +43,8 @@
 
 function testThrowIf(float|int $foo, ?DateTime $bar = null): void
 {
-    assertType('never', throw_if(true, Exception::class));
-    assertType('false', throw_if(false, Exception::class));
+    rescue(fn () => assertType('never', throw_if(true, Exception::class)));
+    assertType('false', throw_if(false, Exception::class)); // @phpstan-ignore deadCode.unreachable
     assertType('false', throw_if(empty($foo)));
     throw_if(is_float($foo));
     assertType('int', $foo);
@@ -62,8 +62,8 @@ function testThrowIf(float|int $foo, ?DateTime $bar = null): void
 function testThrowUnless(float|int $foo, ?DateTime $bar = null): void
 {
     assertType('true', throw_unless(true, Exception::class));
-    assertType('never', throw_unless(false, Exception::class));
-    assertType('true', throw_unless(empty($foo)));
+    rescue(fn () => assertType('never', throw_unless(false, Exception::class)));
+    assertType('true', throw_unless(empty($foo))); // @phpstan-ignore deadCode.unreachable
     throw_unless(is_int($foo));
     assertType('int', $foo);
     throw_unless($foo == false);