the exception can be called with null $entity

rrd108 · Jan 21, 2023 · 8408dec · 8408dec
1 parent 21e23f3
commit 8408dec
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/Error/Exception/JsonApiException.php b/src/Error/Exception/JsonApiException.php
@@ -9,14 +9,17 @@ class JsonApiException extends BadRequestException
 {
     protected  $requestErrors;
 
-    public function __construct(EntityInterface|array $entity, $message = null, $code = 400)
+    public function __construct(EntityInterface|array|null $entity, $message = null, $code = 400)
     {
+        if (is_null($entity)) {
+            $this->requestErrors = [];
+        }
         if (is_array($entity)) {
             foreach ($entity as $ent) {
                 $this->requestErrors[] = $ent->getErrors();
             }
         }
-        if (!is_array($entity)) {
+        if ($entity instanceof EntityInterface) {
             $this->requestErrors = $entity->getErrors();
         }
 

diff --git a/tests/TestCase/JsonApiExceptionRendererTest.php b/tests/TestCase/JsonApiExceptionRendererTest.php
@@ -79,4 +79,19 @@ public function testJsonApiWithErrorCode()
 
         $this->assertEquals(406, $response->getStatusCode());
     }
+
+    public function testJsonApiWithNull()
+    {
+        $message = 'Response on null';
+        $exception = new JsonApiException(null, $message);
+
+        $request = (new ServerRequest())
+            ->withParam('controller', 'Foo')
+            ->withParam('action', 'bar');
+        $exceptionRenderer = new JsonApiExceptionRenderer($exception, $request);
+
+        $response = $exceptionRenderer->render();
+        $responseBody = json_decode($response->__toString());
+        $this->assertEquals($message, $responseBody->message);
+    }
 }