Merge 3f7f2a9 into 652aed8

Controller/GraphqliteController.php

@@ -117,25 +117,22 @@ private function handlePsr7Request(ServerRequestInterface $request): JsonRespons
     private function decideHttpStatusCode(ExecutionResult $result): int
     {
         // If the data entry in the response has any value other than null (when the operation has successfully executed without error) then the response should use the 200 (OK) status code.
-        if ($result->data !== null) {
-            return 200;
-        }
-
-        if (empty($result->errors)) {
+        if ($result->data !== null || empty($result->errors)) {
             return 200;
         }
 
         $status = 0;
         // There might be many errors. Let's return the highest code we encounter.
         foreach ($result->errors as $error) {
-            if ($error->getCategory() === Error::CATEGORY_GRAPHQL) {
-                $code = 400;
-            } else {
-                $code = $error->getCode();
+            $wrappedException = $error->getPrevious();
+            if ($wrappedException !== null) {
+                $code = $wrappedException->getCode();
                 if (!isset(Response::$statusTexts[$code])) {
                     // The exception code is not a valid HTTP code. Let's ignore it
                     continue;
                 }
+            } else {
+                $code = 400;
             }
             $status = max($status, $code);
         }

Tests/Fixtures/Controller/TestGraphqlController.php

@@ -4,6 +4,7 @@
 namespace TheCodingMachine\Graphqlite\Bundle\Tests\Fixtures\Controller;
 
 
+use GraphQL\Error\Error;
 use Porpaginas\Arrays\ArrayResult;
 use TheCodingMachine\Graphqlite\Bundle\Tests\Fixtures\Entities\Contact;
 use TheCodingMachine\Graphqlite\Bundle\Tests\Fixtures\Entities\Product;
@@ -61,8 +62,8 @@ public function contacts(): ArrayResult
      * @Query()
      * @return string
      */
-    public function triggerError(): string
+    public function triggerException(int $code = 0): string
     {
-        throw new MyException('Boom');
+        throw new MyException('Boom', $code);
     }
 }

Tests/FunctionalTest.php

@@ -106,12 +106,23 @@ public function testErrors()
 
         $request = Request::create('/graphql', 'GET', ['query' => '
         { 
-          triggerError
+          triggerException
         }']);
 
         $response = $kernel->handle($request);
 
         $this->assertSame(500, $response->getStatusCode());
 
+        // Let's test that the highest exception code compatible with an HTTP is kept.
+        $request = Request::create('/graphql', 'GET', ['query' => '
+        { 
+          triggerError1: triggerException(code: 404) 
+          triggerError2: triggerException(code: 401)
+          triggerError3: triggerException(code: 10245)
+        }']);
+
+        $response = $kernel->handle($request);
+
+        $this->assertSame(404, $response->getStatusCode(), $response->getContent());
     }
 }