Add support for ^0.13 webonyx/graphql-php

simPod · Nov 27, 2018 · 8a50d70 · 8a50d70
1 parent fcd8e17
commit 8a50d70
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -182,8 +182,12 @@ Error types will then be provided in your response so client can easier identify
 {
   "errors": [
     {
-      "type": "INVALID_CUSTOMER_ID_PROVIDED",
       "message": "No CustomerId provided",
-      "category": "graphql",
-      ...
+      "extensions": {
+          "type": "INVALID_CUSTOMER_ID_PROVIDED",
+          "category": "graphql"
+      }
+    }
+  ]
+}
 ```
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     },
     "require": {
         "php": "^7.2",
-        "webonyx/graphql-php": "^0.12"
+        "webonyx/graphql-php": "^0.12 || ^0.13"
     },
     "require-dev": {
         "doctrine/coding-standard": "^5.0",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -3,9 +3,9 @@ parameters:
     paths:
         - %currentWorkingDirectory%/src
         - %currentWorkingDirectory%/tests
-    tmpDir: %currentWorkingDirectory%/var/phpstan
     ignoreErrors:
-        - "~Method SimPod\\\\GraphQLUtils\\\\Error\\\\FormattedError::createFromException\\(\\) has parameter \\$\\w+ with no typehint specified~"
+        # https://github.com/webonyx/graphql-php/pull/406
+        - "~Parameter \\#1 \\$vars of class GraphQL\\\\Language\\\\AST\\\\BooleanValueNode constructor expects array<GraphQL\\\\Language\\\\AST\\\\Location\\|GraphQL\\\\Language\\\\AST\\\\NameNode\\|GraphQL\\\\Language\\\\AST\\\\NodeList\\|GraphQL\\\\Language\\\\AST\\\\SelectionSetNode\\|string\\|null>, array<string, false> given~"
 
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon

diff --git a/src/Error/Error.php b/src/Error/Error.php
@@ -5,7 +5,7 @@
 namespace SimPod\GraphQLUtils\Error;
 
 /**
- * @inheritdoc
+ * {@inheritdoc}
  */
 abstract class Error extends \GraphQL\Error\Error
 {

diff --git a/src/Error/FormattedError.php b/src/Error/FormattedError.php
@@ -5,20 +5,19 @@
 namespace SimPod\GraphQLUtils\Error;
 
 /**
- * @inheritdoc
+ * {@inheritdoc}
  */
 class FormattedError extends \GraphQL\Error\FormattedError
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public static function createFromException($e, $debug = false, $internalErrorMessage = null) : array
     {
         $arrayError = parent::createFromException($e, $debug, $internalErrorMessage);
 
         if ($e instanceof \GraphQL\Error\Error && $e->getPrevious() instanceof Error) {
-            $type       = ['type' => $e->getPrevious()->getType()];
-            $arrayError = $type + $arrayError;
+            $arrayError['extensions']['type'] = $e->getPrevious()->getType();
         }
 
         return $arrayError;

diff --git a/tests/Error/FormattedErrorTest.php b/tests/Error/FormattedErrorTest.php
@@ -17,8 +17,10 @@ public function testNonDebug() : void
 
         self::assertSame(
             [
-                'message'  => 'Internal server error',
-                'category' => 'internal',
+                'message'    => 'Internal server error',
+                'extensions' => [
+                    'category' => 'internal',
+                ],
             ],
             FormattedError::createFromException($exception)
         );
@@ -32,7 +34,9 @@ public function testDebug() : void
             [
                 'debugMessage' => 'When smashing sun-dried shrimps, be sure they are room temperature.',
                 'message'      => 'Internal server error',
-                'category'     => 'internal',
+                'extensions'   => [
+                    'category' => 'internal',
+                ],
             ],
             FormattedError::createFromException($exception, true)
         );
@@ -44,8 +48,10 @@ public function testInternalMessageModification() : void
 
         self::assertSame(
             [
-                'message'  => 'Try grilling smoothie jumbled with salad cream, decorateed with green curry.',
-                'category' => 'internal',
+                'message'    => 'Try grilling smoothie jumbled with salad cream, decorateed with green curry.',
+                'extensions' => [
+                    'category' => 'internal',
+                ],
             ],
             FormattedError::createFromException(
                 $exception,
@@ -72,9 +78,11 @@ public function __construct()
 
         self::assertSame(
             [
-                'type'     => 'CUSTOM_ERROR',
-                'message'  => 'Error Message',
-                'category' => 'graphql',
+                'message'    => 'Error Message',
+                'extensions' => [
+                    'category' => 'graphql',
+                    'type'     => 'CUSTOM_ERROR',
+                ],
             ],
             FormattedError::createFromException($error, false)
         );