flush middleware callbacks

laravel · Dec 13, 2023 · bb49a72 · bb49a72
1 parent d97b526
commit bb49a72
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;