Move error handling after resolving promise (#335)

digiaonline · Nov 9, 2018 · 96b9518 · 96b9518
1 parent b1f5c00
commit 96b9518
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Execution/Execution.php b/src/Execution/Execution.php
@@ -52,18 +52,18 @@ public function execute(
 
         $data = $this->executeOperation($operationName, $context, $fieldCollector, $valuesResolver);
 
-        if (null !== $errorHandler) {
-            foreach ($context->getErrors() as $error) {
-                $errorHandler->handleError($error);
-            }
-        }
-
         if ($data instanceof PromiseInterface) {
             $data->then(function ($resolvedData) use (&$data) {
                 $data = $resolvedData;
             });
         }
 
+        if (null !== $errorHandler) {
+            foreach ($context->getErrors() as $error) {
+                $errorHandler->handleError($error);
+            }
+        }
+
         return new ExecutionResult($data, $context->getErrors());
     }