diff --git a/config/scribe.php b/config/scribe.php index ca0cc386..b8086537 100644 --- a/config/scribe.php +++ b/config/scribe.php @@ -135,7 +135,7 @@ ], /* - * Name for the group of routes which do not have a @group set. + * Name for the group of endpoints which do not have a @group set. */ 'default_group' => 'Endpoints', diff --git a/resources/views/partials/endpoint.blade.php b/resources/views/partials/endpoint.blade.php index 4fd5485c..1667f92b 100644 --- a/resources/views/partials/endpoint.blade.php +++ b/resources/views/partials/endpoint.blade.php @@ -19,10 +19,13 @@ ```json @if(is_object($response['content']) || is_array($response['content'])) {!! json_encode($response['content'], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) !!} -@elseif(\Illuminate\Support\Str::startsWith($response['content'], "<>")) +@elseif(is_string($response['content']) && \Illuminate\Support\Str::startsWith($response['content'], "<>")) - {{ str_replace("<>","",$response['content']) }} @elseif($response['status'] == 204) +@elseif(is_string($response['content']) && json_decode($response['content']) == null && $response['content'] !== null) +{{-- If response is a non-JSON string, just print it --}} +{!! $response['content'] !!} @else {!! json_encode(json_decode($response['content']), JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) !!} @endif diff --git a/src/Extracting/Strategies/Responses/UseApiResourceTags.php b/src/Extracting/Strategies/Responses/UseApiResourceTags.php index fb4686d0..d7658507 100644 --- a/src/Extracting/Strategies/Responses/UseApiResourceTags.php +++ b/src/Extracting/Strategies/Responses/UseApiResourceTags.php @@ -97,8 +97,8 @@ public function getApiResourceResponse(array $tags) $perPage ); $list = $paginator; - } elseif (count($pagination) == 2 && $pagination[0] == 'simple') { - $perPage = $pagination[1]; + } elseif (count($pagination) == 2 && $pagination[1] == 'simple') { + $perPage = $pagination[0]; $paginator = new Paginator($models, $perPage); $list = $paginator; } else { diff --git a/tests/Strategies/Responses/UseApiResourceTagsTest.php b/tests/Strategies/Responses/UseApiResourceTagsTest.php index 4f3b20f3..a84e71b2 100644 --- a/tests/Strategies/Responses/UseApiResourceTagsTest.php +++ b/tests/Strategies/Responses/UseApiResourceTagsTest.php @@ -214,7 +214,7 @@ public function can_parse_apiresourcecollection_tags_with_collection_class_and_p $strategy = new UseApiResourceTags($config); $tags = [ new Tag('apiResourceCollection', 'Knuckles\Scribe\Tests\Fixtures\TestUserApiResourceCollection'), - new Tag('apiResourceModel', '\Knuckles\Scribe\Tests\Fixtures\TestUser paginate=simple,1'), + new Tag('apiResourceModel', '\Knuckles\Scribe\Tests\Fixtures\TestUser paginate=1,simple'), ]; $results = $strategy->getApiResourceResponse($tags);