Merge pull request #57 from simPod/bump-graphql-php

Upgrade to graphql-php v14

Author: simPod

composer.json

@@ -15,7 +15,7 @@
     "require": {
         "php": "^7.3||^8.0",
         "thecodingmachine/safe": "^1.0.2",
-        "webonyx/graphql-php": "^0.12||^0.13"
+        "webonyx/graphql-php": "^14.0"
     },
     "require-dev": {
         "doctrine/coding-standard": "^8.1",

src/Error/FormattedError.php

@@ -4,17 +4,20 @@
 
 namespace SimPod\GraphQLUtils\Error;
 
+use GraphQL\Error\DebugFlag;
+use Throwable;
+
 class FormattedError extends \GraphQL\Error\FormattedError
 {
     /**
      * {@inheritdoc}
      */
-    public static function createFromException($e, $debug = false, $internalErrorMessage = null): array
+    public static function createFromException(Throwable $exception, int $debug = DebugFlag::NONE, $internalErrorMessage = null): array
     {
-        $arrayError = parent::createFromException($e, $debug, $internalErrorMessage);
+        $arrayError = parent::createFromException($exception, $debug, $internalErrorMessage);
 
-        if ($e instanceof \GraphQL\Error\Error && $e->getPrevious() instanceof Error) {
-            $arrayError['extensions']['type'] = $e->getPrevious()->getType();
+        if ($exception instanceof \GraphQL\Error\Error && $exception->getPrevious() instanceof Error) {
+            $arrayError['extensions']['type'] = $exception->getPrevious()->getType();
         }
 
         return $arrayError;

tests/Error/FormattedErrorTest.php

@@ -5,6 +5,7 @@
 namespace SimPod\GraphQLUtils\Tests\Error;
 
 use Exception;
+use GraphQL\Error\DebugFlag;
 use GraphQL\Error\Error;
 use PHPUnit\Framework\TestCase;
 use SimPod\GraphQLUtils\Error\FormattedError;
@@ -38,7 +39,7 @@ public function testDebug() : void
                     'category' => 'internal',
                 ],
             ],
-            FormattedError::createFromException($exception, true)
+            FormattedError::createFromException($exception, DebugFlag::INCLUDE_DEBUG_MESSAGE)
         );
     }
 
@@ -55,7 +56,7 @@ public function testInternalMessageModification() : void
             ],
             FormattedError::createFromException(
                 $exception,
-                false,
+                DebugFlag::NONE,
                 'Try grilling smoothie jumbled with salad cream, decorateed with green curry.'
             )
         );
@@ -67,10 +68,11 @@ public function testGraphQLCustomError() : void
         {
             public function __construct()
             {
-                parent::__construct('Error Message',
-                    null,
+                parent::__construct(
+                    'Error Message',
                     null,
                     null,
+                    [],
                     null,
                     new CustomError(''));
             }
@@ -84,7 +86,7 @@ public function __construct()
                     'type'     => 'CUSTOM_ERROR',
                 ],
             ],
-            FormattedError::createFromException($error, false)
+            FormattedError::createFromException($error, DebugFlag::NONE)
         );
     }
 }