From 89be25a3af2f374bbe15294ef774acabbfacda4b Mon Sep 17 00:00:00 2001 From: Noah Wilderom <61543656+Noah-Wilderom@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:50:56 +0200 Subject: [PATCH] bug: added null check on middleware onFail in UniversalRoutes --- src/Features/UniversalRoutes.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Features/UniversalRoutes.php b/src/Features/UniversalRoutes.php index 40acbeae..ea7e1416 100644 --- a/src/Features/UniversalRoutes.php +++ b/src/Features/UniversalRoutes.php @@ -23,13 +23,15 @@ class UniversalRoutes implements Feature public function bootstrap(Tenancy $tenancy): void { foreach (static::$identificationMiddlewares as $middleware) { - $middleware::$onFail = function ($exception, $request, $next) { - if (static::routeHasMiddleware($request->route(), static::$middlewareGroup)) { - return $next($request); - } + if (is_null($middleware::$onFail)) { + $middleware::$onFail = function ($exception, $request, $next) { + if (static::routeHasMiddleware($request->route(), static::$middlewareGroup)) { + return $next($request); + } - throw $exception; - }; + throw $exception; + }; + } } }