Merge a66a285 into 5289a54

webonyx · Jan 14, 2021 · 6eff041 · 6eff041
2 parents 5289a54 + a66a285
commit 6eff041
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/src/Executor/ExecutionResult.php b/src/Executor/ExecutionResult.php
@@ -142,10 +142,15 @@ public function toArray(int $debug = DebugFlag::NONE) : array
                 return array_map($formatter, $errors);
             };
 
-            $result['errors'] = $errorsHandler(
+            $handledErrors = $errorsHandler(
                 $this->errors,
                 FormattedError::prepareFormatter($this->errorFormatter, $debug)
             );
+
+            // While we know that there were errors initially, they might have been discarded
+            if ($handledErrors) {
+                $result['errors'] = $handledErrors;
+            }
         }
 
         if ($this->data !== null) {

diff --git a/tests/Executor/ExecutionResultTest.php b/tests/Executor/ExecutionResultTest.php
@@ -4,6 +4,7 @@
 
 namespace GraphQL\Tests\Executor;
 
+use GraphQL\Error\Error;
 use GraphQL\Executor\ExecutionResult;
 use PHPUnit\Framework\TestCase;
 
@@ -13,17 +14,29 @@ public function testToArrayWithoutExtensions() : void
     {
         $executionResult = new ExecutionResult();
 
-        self::assertEquals([], $executionResult->toArray());
+        self::assertSame([], $executionResult->toArray());
     }
 
     public function testToArrayExtensions() : void
     {
         $executionResult = new ExecutionResult(null, [], ['foo' => 'bar']);
 
-        self::assertEquals(['extensions' => ['foo' => 'bar']], $executionResult->toArray());
+        self::assertSame(['extensions' => ['foo' => 'bar']], $executionResult->toArray());
 
         $executionResult->extensions = ['bar' => 'foo'];
 
-        self::assertEquals(['extensions' => ['bar' => 'foo']], $executionResult->toArray());
+        self::assertSame(['extensions' => ['bar' => 'foo']], $executionResult->toArray());
+    }
+
+    public function testNoEmptyErrors() : void
+    {
+        $executionResult = new ExecutionResult(null, [new Error()]);
+        $executionResult->setErrorsHandler(
+            static function () : array {
+                return [];
+            }
+        );
+
+        self::assertSame([], $executionResult->toArray());
     }
 }