Merge branch 'master' of https://github.com/webonyx/graphql-php

Author: vladar

examples/00-hello-world/graphql.php

@@ -1,7 +1,9 @@
 <?php
 // Test this using following command
-// php -S localhost:8080 ./graphql.php
-require_once '../../vendor/autoload.php';
+// php -S localhost:8080 ./graphql.php &
+// curl http://localhost:8080 -d "query { echo(message: \"Hello\") }"
+// curl http://localhost:8080 -d "mutation { sum(x: 2, y: 2) }"
+require_once __DIR__ . '/../../vendor/autoload.php';
 
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;

examples/01-blog/graphql.php

@@ -1,7 +1,7 @@
 <?php
 // Test this using following command
-// php -S localhost:8080 ./index.php
-require_once '../../vendor/autoload.php';
+// php -S localhost:8080 ./graphql.php
+require_once __DIR__ . '/../../vendor/autoload.php';
 
 use \GraphQL\Examples\Blog\Types;
 use \GraphQL\Examples\Blog\AppContext;

src/Error/Error.php

@@ -89,6 +89,9 @@ public static function createLocatedError($error, $nodes = null, $path = null)
         } else if ($error instanceof \Exception) {
             $message = $error->getMessage();
             $originalError = $error;
+        } else if ($error instanceof \Error) {
+            $message = $error->getMessage();
+            $originalError = $error;
         } else {
             $message = (string) $error;
         }
@@ -119,9 +122,9 @@ public static function formatError(Error $error)
      * @param Source $source
      * @param array|null $positions
      * @param array|null $path
-     * @param \Exception $previous
+     * @param \Exception|\Error $previous
      */
-    public function __construct($message, $nodes = null, Source $source = null, $positions = null, $path = null, \Exception $previous = null)
+    public function __construct($message, $nodes = null, Source $source = null, $positions = null, $path = null, $previous = null)
     {
         parent::__construct($message, 0, $previous);
 

src/Executor/Executor.php

@@ -680,6 +680,8 @@ private function resolveOrError($fieldDef, $fieldNode, $resolveFn, $source, $con
             return $resolveFn($source, $args, $context, $info);
         } catch (\Exception $error) {
             return $error;
+        } catch (\Error $error) {
+            return $error;
         }
     }
 
@@ -778,6 +780,8 @@ public function completeValueWithLocatedError(
             return $completed;
         } catch (\Exception $error) {
             throw Error::createLocatedError($error, $fieldNodes, $path);
+        } catch (\Error $error) {
+            throw Error::createLocatedError($error, $fieldNodes, $path);
         }
     }
 
@@ -810,6 +814,7 @@ public function completeValueWithLocatedError(
      * @return array|null|Promise
      * @throws Error
      * @throws \Exception
+     * @throws \Error
      */
     private function completeValue(
         Type $returnType,
@@ -835,6 +840,10 @@ private function completeValue(
             throw $result;
         }
 
+        if ($result instanceof \Error) {
+            throw $result;
+        }
+
         // If field type is NonNull, complete for inner type, and throw field error
         // if result is null.
         if ($returnType instanceof NonNull) {