diff --git a/src/Http/Middleware/RestifyInjector.php b/src/Http/Middleware/RestifyInjector.php index bb8b0e421..f6b450ce9 100644 --- a/src/Http/Middleware/RestifyInjector.php +++ b/src/Http/Middleware/RestifyInjector.php @@ -29,11 +29,11 @@ public function handle($request, Closure $next) $request->is(trim($path.'/*', '/')) || $request->is('restify-api/*') || collect(Restify::$repositories) - ->filter(fn($repository) => $repository::prefix()) - ->some(fn($repository) => $request->is($repository::prefix() . '/*')) || + ->filter(fn ($repository) => $repository::prefix()) + ->some(fn ($repository) => $request->is($repository::prefix().'/*')) || collect(Restify::$repositories) - ->filter(fn($repository) => $repository::indexPrefix()) - ->some(fn($repository) => $request->is($repository::indexPrefix() . '/*')); + ->filter(fn ($repository) => $repository::indexPrefix()) + ->some(fn ($repository) => $request->is($repository::indexPrefix().'/*')); app()->register(RestifyCustomRoutesProvider::class); diff --git a/src/Http/Requests/InteractWithRepositories.php b/src/Http/Requests/InteractWithRepositories.php index 466c0163e..4ae055fda 100644 --- a/src/Http/Requests/InteractWithRepositories.php +++ b/src/Http/Requests/InteractWithRepositories.php @@ -53,7 +53,7 @@ public function repository($key = null): ?Repository if (! $repository::authorizedToUseRoute($this)) { throw new UnauthorizedException(__('Unauthorized to use the route :name. Check prefix.', [ - 'name' => $this->getRequestUri() + 'name' => $this->getRequestUri(), ]), 403); } diff --git a/src/Repositories/WithRoutePrefix.php b/src/Repositories/WithRoutePrefix.php index f00c7b043..237203031 100644 --- a/src/Repositories/WithRoutePrefix.php +++ b/src/Repositories/WithRoutePrefix.php @@ -1,9 +1,7 @@ is(static::indexPrefix() . '/*'); + return $request->is(static::indexPrefix().'/*'); } else { // the rest - return $request->is(static::prefix() . '/*'); + return $request->is(static::prefix().'/*'); } - } protected static function shouldAuthorizeRouteUsage(): bool @@ -74,6 +71,6 @@ protected static function shouldAuthorizeRouteUsage(): bool return collect([ static::prefix(), static::indexPrefix(), - ])->some(fn($prefix) => (bool) $prefix); + ])->some(fn ($prefix) => (bool) $prefix); } } diff --git a/src/RestifyServiceProvider.php b/src/RestifyServiceProvider.php index d9b678523..a0dc833e7 100644 --- a/src/RestifyServiceProvider.php +++ b/src/RestifyServiceProvider.php @@ -74,7 +74,7 @@ public function registerPrefixed($config) public function registerIndexPrefixed($config) { collect(Restify::$repositories) - ->filter(fn($repository) => $repository::indexPrefix()) + ->filter(fn ($repository) => $repository::indexPrefix()) ->each(function ($repository) use ($config) { $config['prefix'] = $repository::indexPrefix(); Route::group($config, function () {