Skip to content

Handle JsonSchemaRequestException as 400 Bad Request in ThrowableHandler #189

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
koriym wants to merge 1 commit into
base: 1.x
Choose a base branch
from
+25 −1
Open

Handle JsonSchemaRequestException as 400 Bad Request in ThrowableHandler #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
],
"require": {
"php": "^8.2",
"bear/resource": "^1.16",
"bear/resource": "^1.33",
"psr/log": "^1.1 || ^2.0 || ^3.0",
"ray/aop": "^2.12.3",
"ray/di": "^2.13",
Expand Down
6 changes: 6 additions & 0 deletions src/Provide/Error/ThrowableHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace BEAR\Sunday\Provide\Error;

use BEAR\Resource\Exception\BadRequestException;
use BEAR\Resource\Exception\JsonSchemaRequestException;
use BEAR\Sunday\Extension\Error\ErrorInterface;
use BEAR\Sunday\Extension\Error\ThrowableHandlerInterface;
use BEAR\Sunday\Extension\Router\RouterMatch as Request;
Expand All @@ -29,6 +31,10 @@ public function handle(Throwable $e, Request $request): ThrowableHandlerInterfac
$e = new ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine(), $e);
}

if ($e instanceof JsonSchemaRequestException) {
$e = new BadRequestException($e->getMessage(), $e->getCode(), $e);
}

/** @var Exception $e */
$this->error->handle($e, $request);

Expand Down
18 changes: 18 additions & 0 deletions tests/Provide/Error/ThrowableHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace BEAR\Sunday\Provide\Error;

use BEAR\Resource\Exception\JsonSchemaRequestException;
use BEAR\Resource\Exception\JsonSchemaResponseException;
use BEAR\Resource\Exception\ResourceNotFoundException;
use BEAR\Sunday\Extension\Router\RouterMatch;
use BEAR\Sunday\Provide\Transfer\ConditionalResponse;
Expand Down Expand Up @@ -36,12 +38,28 @@
$this->assertSame('{"message":"Not Found"}', FakeHttpResponder::$body);
}

public function testJsonSchemaRequestException(): void
{
$e = new JsonSchemaRequestException('title is required');
$this->throableHandler->handle($e, new RouterMatch())->transfer();
$this->assertSame(400, FakeHttpResponder::$code);
$this->assertSame([['Content-Type: application/vnd.error+json', false]], FakeHttpResponder::$headers);
$this->assertSame('{"message":"Bad Request"}', FakeHttpResponder::$body);
}

public function testJsonSchemaResponseException(): void
{
$e = new JsonSchemaResponseException('response does not match schema');
$this->throableHandler->handle($e, new RouterMatch())->transfer();
$this->assertSame(500, FakeHttpResponder::$code);
}

public function testError(): void
{
$e = null;
try {
echo HELLO; // @phpstan-ignore-line
} catch (Throwable $e) { // @phpstan-ignore-line create $e

Check failure on line 62 in tests/Provide/Error/ThrowableHandlerTest.php

View workflow job for this annotation

GitHub Actions / sa / PHPStan 

No error to ignore is reported on line 62.

Check failure on line 62 in tests/Provide/Error/ThrowableHandlerTest.php

View workflow job for this annotation

GitHub Actions / sa / PHPStan 

No error to ignore is reported on line 62.
}

$this->throableHandler->handle($e, new RouterMatch())->transfer(); // @phpstan-ignore-line
Expand Down
Loading