Skip to content

Commit bb49a72

Browse files
committed
flush middleware callbacks
1 parent d97b526 commit bb49a72

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

Diff for: src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php

+10
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,14 @@ public static function skipWhen(Closure $callback)
5353
{
5454
static::$skipCallbacks[] = $callback;
5555
}
56+
57+
/**
58+
* Flush the middleware's global state.
59+
*
60+
* @return void
61+
*/
62+
public static function flushState()
63+
{
64+
static::$skipCallbacks = [];
65+
}
5666
}

Diff for: src/Illuminate/Foundation/Http/Middleware/TrimStrings.php

+10
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,14 @@ public static function skipWhen(Closure $callback)
6666
{
6767
static::$skipCallbacks[] = $callback;
6868
}
69+
70+
/**
71+
* Flush the middleware's global state.
72+
*
73+
* @return void
74+
*/
75+
public static function flushState()
76+
{
77+
static::$skipCallbacks = [];
78+
}
6979
}

Diff for: src/Illuminate/Foundation/Testing/TestCase.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
use Illuminate\Console\Application as Artisan;
77
use Illuminate\Database\Eloquent\Model;
88
use Illuminate\Foundation\Bootstrap\HandleExceptions;
9+
use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
10+
use Illuminate\Foundation\Http\Middleware\TrimStrings;
911
use Illuminate\Queue\Queue;
1012
use Illuminate\Support\Carbon;
1113
use Illuminate\Support\Facades\Facade;
@@ -244,9 +246,11 @@ protected function tearDown(): void
244246
Component::flushCache();
245247
Component::forgetComponentsResolver();
246248
Component::forgetFactory();
247-
Queue::createPayloadUsing(null);
249+
ConvertEmptyStringsToNull::flushState();
248250
HandleExceptions::forgetApp();
251+
Queue::createPayloadUsing(null);
249252
Sleep::fake(false);
253+
TrimStrings::flushState();
250254

251255
if ($this->callbackException) {
252256
throw $this->callbackException;

0 commit comments

Comments
 (0)