Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Http/Middleware/RestifyInjector.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion src/Repositories/Repository.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions src/RestifyServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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');
});
});

Expand Down
3 changes: 1 addition & 2 deletions tests/Repositories/RepositoryCustomPrefixTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();

}
}