[12.x] Test Improvements

composer.json

@@ -113,7 +113,7 @@
         "league/flysystem-read-only": "^3.25.1",
         "league/flysystem-sftp-v3": "^3.25.1",
         "mockery/mockery": "^1.6.10",
-        "orchestra/testbench-core": "^10.0.0",
+        "orchestra/testbench-core": "10.x-dev#57a17219",
         "pda/pheanstalk": "^5.0.6|^7.0.0",
         "php-http/discovery": "^1.15",
         "phpstan/phpstan": "^2.0",

src/Illuminate/Foundation/Application.php

@@ -45,7 +45,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '12.23.1';
+    const VERSION = '12.23.2';
 
     /**
      * The base path for the Laravel installation.

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 (get_exception_handler() !== null) {
             restore_exception_handler();
@@ -339,7 +343,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();
     }