Refactored facade to simplify custom output formatting

Author: vladar

src/Executor/ExecutionResult.php

@@ -25,6 +25,9 @@ public function __construct(array $data = null, array $errors = [])
         $this->errors = $errors;
     }
 
+    /**
+     * @return array
+     */
     public function toArray()
     {
         $result = ['data' => $this->data];

src/GraphQL.php

@@ -1,6 +1,7 @@
 <?php
 namespace GraphQL;
 
+use GraphQL\Executor\ExecutionResult;
 use GraphQL\Executor\Executor;
 use GraphQL\Language\Parser;
 use GraphQL\Language\Source;
@@ -17,19 +18,32 @@ class GraphQL
      * @return array
      */
     public static function execute(Schema $schema, $requestString, $rootValue = null, $variableValues = null, $operationName = null)
+    {
+        return self::executeAndReturnResult($schema, $requestString, $rootValue, $variableValues, $operationName)->toArray();
+    }
+
+    /**
+     * @param Schema $schema
+     * @param $requestString
+     * @param null $rootValue
+     * @param null $variableValues
+     * @param null $operationName
+     * @return array|ExecutionResult
+     */
+    public static function executeAndReturnResult(Schema $schema, $requestString, $rootValue = null, $variableValues = null, $operationName = null)
     {
         try {
             $source = new Source($requestString ?: '', 'GraphQL request');
             $documentAST = Parser::parse($source);
             $validationErrors = DocumentValidator::validate($schema, $documentAST);
 
             if (!empty($validationErrors)) {
-                return ['errors' => array_map(['GraphQL\Error', 'formatError'], $validationErrors)];
+                return new ExecutionResult(null, $validationErrors);
             } else {
-                return Executor::execute($schema, $documentAST, $rootValue, $variableValues, $operationName)->toArray();
+                return Executor::execute($schema, $documentAST, $rootValue, $variableValues, $operationName);
             }
         } catch (Error $e) {
-            return ['errors' => [Error::formatError($e)]];
+            return new ExecutionResult(null, [$e]);
         }
     }
 }

tests/Type/IntrospectionTest.php

@@ -1358,6 +1358,7 @@ public function testFailsAsExpectedOnThe__typeRootFieldWithoutAnArg()
       }
     ';
         $expected = [
+            'data' => null,
             'errors' => [
                 FormattedError::create(
                     ProvidedNonNullArguments::missingFieldArgMessage('__type', 'name', 'String!'), [new SourceLocation(3, 9)]