Skip to content

Feature/class with default method and json code return #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
php-rock wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/class with default method and json code return #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c948da
Return json with proper content-type
php-rock Aug 16, 2020
c4b5328
Allow use Procedures with default /handle/ method to simplify configu…
php-rock Aug 16, 2020
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
11 changes: 8 additions & 3 deletions src/Guide.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Sajya\Server;

use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use Illuminate\Support\Str;
use ReflectionClass;
Expand Down Expand Up @@ -40,9 +41,9 @@ public function __construct(array $procedures = [])
/**
* @param string $content
*
* @return string
* @return JsonResponse
*/
public function handle(string $content = ''): string
public function handle(string $content = ''): JsonResponse
{
$parser = new Parser($content);

Expand All @@ -55,7 +56,7 @@ public function handle(string $content = ''): string

$response = $parser->isBatch() ? $result->all() : $result->first();

return json_encode($response, JSON_THROW_ON_ERROR, 512);
return response()->json($response);
}

/**
Expand Down Expand Up @@ -109,6 +110,10 @@ public function findProcedure(Request $request): ?string
$class = Str::beforeLast($request->getMethod(), '@');
$method = Str::afterLast($request->getMethod(), '@');

if (Str::contains($request->getMethod(), '@') === false) {
$method = 'handle';
}

return $this->map
->filter(fn (string $procedure) => $this->getProcedureName($procedure) === $class)
->filter(fn (string $procedure) => $this->checkExistPublicMethod($procedure, $method))
Expand Down