diff --git a/src/Http/Middleware/RestifyInjector.php b/src/Http/Middleware/RestifyInjector.php index 50992c90a..1e31bb5c7 100644 --- a/src/Http/Middleware/RestifyInjector.php +++ b/src/Http/Middleware/RestifyInjector.php @@ -26,11 +26,11 @@ public function handle($request, Closure $next) $path = trim(Restify::path(), '/') ?: '/'; $isRestify = $request->is($path) || - $request->is(trim($path . '/*', '/')) || + $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().'/*')); app()->register(RestifyCustomRoutesProvider::class); diff --git a/src/Repositories/Repository.php b/src/Repositories/Repository.php index dab90d74d..658e014ec 100644 --- a/src/Repositories/Repository.php +++ b/src/Repositories/Repository.php @@ -25,7 +25,6 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; use JsonSerializable; -use phpDocumentor\Reflection\Types\Static_; /** * This class serve as repository collection and repository single model diff --git a/src/RestifyServiceProvider.php b/src/RestifyServiceProvider.php index 38c5a0541..7d65d2938 100644 --- a/src/RestifyServiceProvider.php +++ b/src/RestifyServiceProvider.php @@ -2,8 +2,6 @@ namespace Binaryk\LaravelRestify; -use Binaryk\LaravelRestify\Http\Controllers\RepositoryIndexController; -use Binaryk\LaravelRestify\Repositories\Repository; use Illuminate\Contracts\Debug\ExceptionHandler; use Illuminate\Support\Facades\Route; use Illuminate\Support\ServiceProvider; @@ -48,7 +46,7 @@ protected function registerRoutes() public function defaultRoutes($config) { Route::group($config, function () { - $this->loadRoutesFrom(__DIR__ . '/../routes/api.php'); + $this->loadRoutesFrom(__DIR__.'/../routes/api.php'); }); return $this; @@ -61,11 +59,11 @@ public function defaultRoutes($config) public function registerPrefixed($config) { collect(Restify::$repositories) - ->filter(fn($repository) => $repository::prefix()) + ->filter(fn ($repository) => $repository::prefix()) ->each(function ($repository) use ($config) { $config['prefix'] = $repository::prefix(); Route::group($config, function () { - $this->loadRoutesFrom(__DIR__ . '/../routes/api.php'); + $this->loadRoutesFrom(__DIR__.'/../routes/api.php'); }); }); diff --git a/tests/Repositories/RepositoryCustomPrefixTest.php b/tests/Repositories/RepositoryCustomPrefixTest.php index 0fe46fe33..4523b8365 100644 --- a/tests/Repositories/RepositoryCustomPrefixTest.php +++ b/tests/Repositories/RepositoryCustomPrefixTest.php @@ -16,9 +16,8 @@ protected function setUp(): void public function test_repository_can_have_custom_prefix() { - $this->getJson('api/restify-api/v1/' . PostRepository::uriKey()) + $this->getJson('api/restify-api/v1/'.PostRepository::uriKey()) ->dump() ->assertSuccessful(); - } }