Merge a774db4 into ac986bd

thecodingmachine · Oct 16, 2019 · 1226b96 · 1226b96
2 parents ac986bd + a774db4
commit 1226b96
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/Resources/config/container/graphqlite.xml b/Resources/config/container/graphqlite.xml
@@ -57,6 +57,18 @@
             <call method="setSchema">
                 <argument type="service" id="TheCodingMachine\GraphQLite\Schema"/>
             </call>
+            <call method="setErrorFormatter">
+                <argument type="collection">
+                    <argument>\TheCodingMachine\GraphQLite\Exceptions\WebonyxErrorHandler</argument>
+                    <argument>errorFormatter</argument>
+                </argument>
+            </call>
+            <call method="setErrorsHandler">
+                <argument type="collection">
+                    <argument>\TheCodingMachine\GraphQLite\Exceptions\WebonyxErrorHandler</argument>
+                    <argument>errorHandler</argument>
+                </argument>
+            </call>
         </service>
 
         <service id="TheCodingMachine\GraphQLite\Mappers\StaticTypeMapper">

diff --git a/Tests/Fixtures/Controller/TestGraphqlController.php b/Tests/Fixtures/Controller/TestGraphqlController.php
@@ -14,6 +14,8 @@
 use TheCodingMachine\Graphqlite\Bundle\Tests\Fixtures\Entities\Product;
 use TheCodingMachine\GraphQLite\Annotations\Mutation;
 use TheCodingMachine\GraphQLite\Annotations\Query;
+use TheCodingMachine\GraphQLite\Exceptions\GraphQLAggregateException;
+use TheCodingMachine\GraphQLite\Exceptions\GraphQLException;
 
 class TestGraphqlController
 {
@@ -71,6 +73,17 @@ public function triggerException(int $code = 0): string
         throw new MyException('Boom', $code);
     }
 
+    /**
+     * @Query()
+     * @return string
+     */
+    public function triggerAggregateException(): string
+    {
+        $exception1 = new GraphQLException('foo', 401);
+        $exception2 = new GraphQLException('bar', 404, null, 'MyCat', ['field' => 'baz']);
+        throw new GraphQLAggregateException([$exception1, $exception2]);
+    }
+
     /**
      * @Query()
      * @Logged()

diff --git a/Tests/FunctionalTest.php b/Tests/FunctionalTest.php
@@ -137,6 +137,27 @@ public function testErrors(): void
         $this->assertSame(404, $response->getStatusCode(), $response->getContent());
     }
 
+    public function testExceptionHandler(): void
+    {
+        $kernel = new GraphqliteTestingKernel();
+        $kernel->boot();
+
+        $request = Request::create('/graphql', 'GET', ['query' => '
+        { 
+          triggerAggregateException
+        }']);
+
+        $response = $kernel->handle($request);
+
+        $this->assertSame(404, $response->getStatusCode());
+
+        $result = json_decode($response->getContent(), true);
+        var_dump($result);
+
+        //$this->assertSame('Cannot query field "me" on type "Query".', $result['errors'][0]['message']);
+
+    }
+
     public function testLoggedMiddleware(): void
     {
         $kernel = new GraphqliteTestingKernel();