diff --git a/src/UserInterface/Http/Middlewares/DropInvalidLivewireRequests.php b/src/UserInterface/Http/Middlewares/DropInvalidLivewireRequests.php index f49e1f481..4ecae50f3 100644 --- a/src/UserInterface/Http/Middlewares/DropInvalidLivewireRequests.php +++ b/src/UserInterface/Http/Middlewares/DropInvalidLivewireRequests.php @@ -7,7 +7,7 @@ use Closure; use Illuminate\Http\Request; use Livewire\Exceptions\ComponentNotFoundException; -use Livewire\LivewireManager; +use Livewire\Livewire; final class DropInvalidLivewireRequests { @@ -41,7 +41,7 @@ public function handle(Request $request, Closure $next) private function isValidComponent(string $component) : bool { try { - return app(LivewireManager::class)->getClass($component) !== null; + return Livewire::getClass($component) !== null; } catch (ComponentNotFoundException $e) { return false; } diff --git a/tests/UserInterface/Livewire/DropInvalidLivewireRequestsTest.php b/tests/UserInterface/Livewire/DropInvalidLivewireRequestsTest.php index 6d06e3e5f..9ce139ed1 100644 --- a/tests/UserInterface/Livewire/DropInvalidLivewireRequestsTest.php +++ b/tests/UserInterface/Livewire/DropInvalidLivewireRequestsTest.php @@ -6,7 +6,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; use Livewire\Exceptions\ComponentNotFoundException; -use Livewire\LivewireManager; +use Livewire\Livewire; use Symfony\Component\HttpKernel\Exception\HttpException; function mockRequest(string $routeName = 'testing::dummy', array $payload = []) : Request @@ -49,9 +49,7 @@ function mockRequest(string $routeName = 'testing::dummy', array $payload = []) ], ]); - $this->mock(LivewireManager::class, function ($mock) { - $mock->shouldReceive('getClass')->with('dummy-name')->andThrow(ComponentNotFoundException::class); - }); + Livewire::shouldReceive('getClass')->with('dummy-name')->andThrow(ComponentNotFoundException::class); try { $response = (new DropInvalidLivewireRequests())->handle($request, fn () => 'Hello world'); @@ -77,9 +75,7 @@ function mockRequest(string $routeName = 'testing::dummy', array $payload = []) ], ]); - $this->mock(LivewireManager::class, function ($mock) { - $mock->shouldReceive('getClass')->with('dummy-name')->andReturn('done'); - }); + Livewire::shouldReceive('getClass')->with('dummy-name')->andReturn('done'); try { $response = (new DropInvalidLivewireRequests())->handle($request, fn () => 'Hello world'); @@ -105,9 +101,7 @@ function mockRequest(string $routeName = 'testing::dummy', array $payload = []) ], ]); - $this->mock(LivewireManager::class, function ($mock) { - $mock->shouldReceive('getClass')->with('dummy-name')->andReturn('done'); - }); + Livewire::shouldReceive('getClass')->with('dummy-name')->andReturn('done'); try { $response = (new DropInvalidLivewireRequests())->handle($request, fn () => 'Hello world'); @@ -133,9 +127,7 @@ function mockRequest(string $routeName = 'testing::dummy', array $payload = []) ], ]); - $this->mock(LivewireManager::class, function ($mock) { - $mock->shouldReceive('getClass')->with('dummy-name')->andReturn('done'); - }); + Livewire::shouldReceive('getClass')->with('dummy-name')->andReturn('done'); try { $response = (new DropInvalidLivewireRequests())->handle($request, fn () => 'Hello world'); @@ -161,9 +153,7 @@ function mockRequest(string $routeName = 'testing::dummy', array $payload = []) ], ]); - $this->mock(LivewireManager::class, function ($mock) { - $mock->shouldReceive('getClass')->with('dummy-name')->andReturn('done'); - }); + Livewire::shouldReceive('getClass')->with('dummy-name')->andReturn('done'); try { $response = (new DropInvalidLivewireRequests())->handle($request, fn () => 'Hello world'); @@ -189,9 +179,7 @@ function mockRequest(string $routeName = 'testing::dummy', array $payload = []) ], ]); - $this->mock(LivewireManager::class, function ($mock) { - $mock->shouldReceive('getClass')->with('dummy-name')->andReturn('done'); - }); + Livewire::shouldReceive('getClass')->with('dummy-name')->andReturn('done'); try { $response = (new DropInvalidLivewireRequests())->handle($request, fn () => 'Hello world'); @@ -217,9 +205,7 @@ function mockRequest(string $routeName = 'testing::dummy', array $payload = []) ], ]); - $this->mock(LivewireManager::class, function ($mock) { - $mock->shouldReceive('getClass')->with('dummy-name')->andReturn('done'); - }); + Livewire::shouldReceive('getClass')->with('dummy-name')->andReturn('done'); try { $response = (new DropInvalidLivewireRequests())->handle($request, fn () => 'Hello world');