Skip to content

Commit 5ccd0ca

Browse files
authored
Merge pull request #20 from dotkernel/issue-19
Issue #19: Resources in routes must be singular
2 parents e0724e7 + dbd9281 commit 5ccd0ca

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

src/Type/OpenApi.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ public function render(
153153

154154
if ($apiGetCollectionHandler->exists()) {
155155
$class
156-
->useClass($apiDeleteResourceHandler->getComponent()->getFqcn())
156+
->useClass($apiGetCollectionHandler->getComponent()->getFqcn())
157157
->useClass($collection->getFqcn());
158158

159159
// phpcs:disable Generic.Files.LineLength.TooLong
160160
$comments[] = <<<COMM
161161
/**
162-
* @see {$apiDeleteResourceHandler->getComponent()->getClassName()}::handle()
162+
* @see {$apiGetCollectionHandler->getComponent()->getClassName()}::handle()
163163
*/
164164
#[OA\Get(
165165
path: '/{$entity->toKebabCase()}',

src/Type/RoutesDelegator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ public function render(
140140
$invoke->appendBody(
141141
sprintf(
142142
'->get(\'/%s\', %s, \'%s::list-%s\')',
143-
Component::pluralize($entity->toKebabCase()),
143+
$entity->toKebabCase(),
144144
$apiGetCollectionHandler->getComponent()->getClassString(),
145145
$entity->toKebabCase(),
146-
Component::pluralize($entity->toKebabCase()),
146+
$entity->toKebabCase(),
147147
),
148148
12
149149
);

test/Type/OpenApiTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ private function dataProviderRenderedOpenApi(): string
155155
use Api\ModuleName\Collection\ModuleNameCollection;
156156
use Api\ModuleName\Entity\ModuleName;
157157
use Api\ModuleName\Handler\ModuleName\DeleteModuleNameResourceHandler;
158+
use Api\ModuleName\Handler\ModuleName\GetModuleNameCollectionHandler;
158159
use Api\ModuleName\Handler\ModuleName\GetModuleNameResourceHandler;
159160
use Api\ModuleName\Handler\ModuleName\PatchModuleNameResourceHandler;
160161
use Api\ModuleName\Handler\ModuleName\PostModuleNameResourceHandler;
@@ -225,7 +226,7 @@ private function dataProviderRenderedOpenApi(): string
225226
)]
226227
227228
/**
228-
* @see DeleteModuleNameResourceHandler::handle()
229+
* @see GetModuleNameCollectionHandler::handle()
229230
*/
230231
#[OA\Get(
231232
path: '/module-name',

test/Type/RoutesDelegatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public function __invoke(
224224
\$routeCollector
225225
->delete('/book-store/' . \$uuid, DeleteBookStoreResourceHandler::class, 'book-store::delete-book-store')
226226
->get('/book-store/' . \$uuid, GetBookStoreResourceHandler::class, 'book-store::view-book-store')
227-
->get('/book-stores', GetBookStoreCollectionHandler::class, 'book-store::list-book-stores')
227+
->get('/book-store', GetBookStoreCollectionHandler::class, 'book-store::list-book-store')
228228
->patch('/book-store/' . \$uuid, PatchBookStoreResourceHandler::class, 'book-store::update-book-store')
229229
->post('/book-store', PostBookStoreResourceHandler::class, 'book-store::create-book-store')
230230
->put('/book-store/' . \$uuid, PutBookStoreResourceHandler::class, 'book-store::replace-book-store');

0 commit comments

Comments
 (0)