File tree Expand file tree Collapse file tree 2 files changed +26
-1
lines changed Expand file tree Collapse file tree 2 files changed +26
-1
lines changed Original file line number Diff line number Diff line change 14
14
use Illuminate \Queue \Events \WorkerStopping ;
15
15
use Illuminate \Routing \Router ;
16
16
use Illuminate \Support \ServiceProvider ;
17
+ use Illuminate \Support \Str ;
17
18
use Illuminate \View \Compilers \BladeCompiler ;
18
19
use Illuminate \View \Factory as ViewFactory ;
19
20
use Laravel \Pulse \Contracts \Ingest ;
@@ -167,7 +168,13 @@ protected function registerComponents(): void
167
168
});
168
169
169
170
$ this ->callAfterResolving ('livewire ' , function (LivewireManager $ livewire , Application $ app ) {
170
- $ livewire ->addPersistentMiddleware ($ app ->make ('config ' )->get ('pulse.middleware ' , []));
171
+ $ middleware = collect ($ app ->make ('config ' )->get ('pulse.middleware ' ))
172
+ ->map (fn ($ middleware ) => is_string ($ middleware )
173
+ ? Str::before ($ middleware , ': ' )
174
+ : $ middleware )
175
+ ->all ();
176
+
177
+ $ livewire ->addPersistentMiddleware ($ middleware );
171
178
172
179
$ livewire ->component ('pulse.cache ' , Livewire \Cache::class);
173
180
$ livewire ->component ('pulse.usage ' , Livewire \Usage::class);
Original file line number Diff line number Diff line change 5
5
use Illuminate \Support \Facades \App ;
6
6
use Illuminate \Support \Facades \Auth ;
7
7
use Illuminate \Support \Facades \Config ;
8
+ use Illuminate \Support \Facades \Facade ;
8
9
use Laravel \Pulse \Contracts \ResolvesUsers ;
9
10
use Laravel \Pulse \Contracts \Storage ;
10
11
use Laravel \Pulse \Entry ;
11
12
use Laravel \Pulse \Facades \Pulse ;
12
13
use Laravel \Pulse \Value ;
14
+ use Livewire \LivewireManager ;
13
15
use Tests \StorageFake ;
14
16
use Tests \User ;
15
17
@@ -221,3 +223,19 @@ public function find(int|string|null $key): object
221
223
222
224
expect ($ handled )->toBe (true );
223
225
});
226
+
227
+ it ('strips arguments from persistent middleware ' , function () {
228
+ App::forgetInstance (LivewireManager::class);
229
+ Facade::clearResolvedInstance ('livewire ' );
230
+ Config::set ('pulse.middleware ' , [MyTestMiddleware::class.':admin ' ]);
231
+
232
+ $ persistentMiddleware = Livewire::getPersistentMiddleware ();
233
+
234
+ expect ($ persistentMiddleware )->toContain (MyTestMiddleware::class);
235
+ expect ($ persistentMiddleware )->not ->toContain (MyTestMiddleware::class.':admin ' );
236
+ });
237
+
238
+ class MyTestMiddleware
239
+ {
240
+ //
241
+ }
You can’t perform that action at this time.
0 commit comments