From bb49a72c1a839b2b19d0fcea4e8b203a122454ef Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Wed, 13 Dec 2023 09:07:28 -0600
Subject: [PATCH] flush middleware callbacks

---
 .../Http/Middleware/ConvertEmptyStringsToNull.php      | 10 ++++++++++
 .../Foundation/Http/Middleware/TrimStrings.php         | 10 ++++++++++
 src/Illuminate/Foundation/Testing/TestCase.php         |  6 +++++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php b/src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php
index 3fb0ee22c19d..89707d7e4dd6 100644
--- a/src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php
+++ b/src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php
@@ -53,4 +53,14 @@ public static function skipWhen(Closure $callback)
     {
         static::$skipCallbacks[] = $callback;
     }
+
+    /**
+     * Flush the middleware's global state.
+     *
+     * @return void
+     */
+    public static function flushState()
+    {
+        static::$skipCallbacks = [];
+    }
 }
diff --git a/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php b/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php
index 7ffcd5eaa1f7..3b7c6c4ff268 100644
--- a/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php
+++ b/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php
@@ -66,4 +66,14 @@ public static function skipWhen(Closure $callback)
     {
         static::$skipCallbacks[] = $callback;
     }
+
+    /**
+     * Flush the middleware's global state.
+     *
+     * @return void
+     */
+    public static function flushState()
+    {
+        static::$skipCallbacks = [];
+    }
 }
diff --git a/src/Illuminate/Foundation/Testing/TestCase.php b/src/Illuminate/Foundation/Testing/TestCase.php
index a7315a2c5124..b9b76bf2a50c 100644
--- a/src/Illuminate/Foundation/Testing/TestCase.php
+++ b/src/Illuminate/Foundation/Testing/TestCase.php
@@ -6,6 +6,8 @@
 use Illuminate\Console\Application as Artisan;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Bootstrap\HandleExceptions;
+use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
+use Illuminate\Foundation\Http\Middleware\TrimStrings;
 use Illuminate\Queue\Queue;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Facade;
@@ -244,9 +246,11 @@ protected function tearDown(): void
         Component::flushCache();
         Component::forgetComponentsResolver();
         Component::forgetFactory();
-        Queue::createPayloadUsing(null);
+        ConvertEmptyStringsToNull::flushState();
         HandleExceptions::forgetApp();
+        Queue::createPayloadUsing(null);
         Sleep::fake(false);
+        TrimStrings::flushState();
 
         if ($this->callbackException) {
             throw $this->callbackException;