Merge d2cdb29 into 57e2845

composer.json

@@ -20,6 +20,7 @@
     },
     "autoload": {
         "files": [
+            "./src/Error/formatError.php",
             "./src/Execution/values.php",
             "./src/Language/blockStringValue.php",
             "./src/Language/helpers.php",
@@ -30,8 +31,12 @@
             "./src/Util/coercers.php",
             "./src/Util/helpers.php",
             "./src/Util/invariant.php",
+            "./src/Util/orList.php",
+            "./src/Util/suggestionList.php",
             "./src/Util/typeFromAST.php",
             "./src/Util/valueFromAST.php",
+            "./src/Validation/rules.php",
+            "./src/Validation/Rule/messages.php",
             "./src/facades.php"
         ],
         "psr-4": {
@@ -47,7 +52,11 @@
     "autoload-dev": {
         "files": [
             "./tests/Functional/Language/SchemaParserTest.php",
-            "./tests/Functional/Language/testSchema.php"
+            "./tests/Functional/Validation/Rule/ExecutableDefinitionsRuleTest.php",
+            "./tests/Functional/Validation/Rule/FieldOnCorrectTypeRuleTest.php",
+            "./tests/Functional/Validation/Rule/FragmentsOnCompositeTypesRuleTest.php",
+            "./tests/Functional/Validation/Rule/KnownArgumentNamesRuleTest.php",
+            "./tests/Functional/Validation/harness.php"
         ],
         "psr-4": {
             "Digia\\GraphQL\\Test\\": "./tests"

src/Error/ValidationException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Digia\GraphQL\Error;
+
+class ValidationException extends GraphQLException
+{
+}

src/Error/formatError.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Digia\GraphQL\Error;
+
+use function Digia\GraphQL\Util\invariant;
+
+/**
+ * @param GraphQLException $error
+ * @return array
+ * @throws InvariantException
+ */
+function formatError(GraphQLException $error): array
+{
+    invariant(null !== $error, 'Received null error.');
+
+    return array_merge($error->getExtensions() ?? [], [
+        'message'   => $error->getMessage(),
+        'locations' => $error->getLocations(),
+        'path'      => $error->getPath(),
+    ]);
+}

src/GraphQL.php

@@ -7,8 +7,10 @@
 use Digia\GraphQL\Provider\IntrospectionTypesProvider;
 use Digia\GraphQL\Provider\ParserProvider;
 use Digia\GraphQL\Provider\PrinterProvider;
+use Digia\GraphQL\Provider\RulesProvider;
 use Digia\GraphQL\Provider\ScalarTypesProvider;
 use Digia\GraphQL\Provider\SchemaBuilderProvider;
+use Digia\GraphQL\Provider\ValidationProvider;
 use League\Container\Container;
 use League\Container\ContainerInterface;
 
@@ -45,6 +47,8 @@ class GraphQL
         IntrospectionTypesProvider::class,
         ScalarTypesProvider::class,
         DirectivesProvider::class,
+        ValidationProvider::class,
+        RulesProvider::class,
     ];
 
     /**

src/Language/AST/Node/ExecutableDefinitionNodeInterface.php

@@ -4,5 +4,8 @@
 
 interface ExecutableDefinitionNodeInterface extends DefinitionNodeInterface
 {
-
+    /**
+     * @return null|string
+     */
+    public function getNameValue(): ?string;
 }

src/Language/AST/Node/NameTrait.php

@@ -43,4 +43,12 @@ public function setName(?NameNode $name)
         $this->name = $name;
         return $this;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function __toString(): string
+    {
+        return $this->getNameValue() ?? '';
+    }
 }

src/Language/AST/Visitor/AcceptVisitorTrait.php

@@ -13,37 +13,57 @@ trait AcceptVisitorTrait
      */
     protected $visitor;
 
+    /**
+     * @var string|int|null
+     */
+    protected $key;
+
+    /**
+     * @var NodeInterface|null
+     */
+    protected $parent;
+
     /**
      * @var array
      */
     protected $path;
 
+    /**
+     * @var array
+     */
+    protected $ancestors = [];
+
     /**
      * @var boolean
      */
     protected $isEdited = false;
 
     /**
-     * @param VisitorInterface   $visitor
-     * @param string|int||null $key
-     * @param NodeInterface|null $parent
-     * @param array              $path
+     * @param VisitorInterface      $visitor
+     * @param string|int|null       $key
+     * @param NodeInterface|null    $parent
+     * @param array                 $path
+     * @param array|NodeInterface[] $ancestors
      * @return NodeInterface|AcceptVisitorTrait|SerializationInterface|null
      */
     public function accept(
         VisitorInterface $visitor,
         $key = null,
         ?NodeInterface $parent = null,
-        array $path = []
+        array $path = [],
+        array $ancestors = []
     ): ?NodeInterface {
-        $this->visitor = $visitor;
-        $this->path    = $path;
+        $this->visitor   = $visitor;
+        $this->key       = $key;
+        $this->parent    = $parent;
+        $this->path      = $path;
+        $this->ancestors = $ancestors;
 
         /** @var NodeInterface|AcceptVisitorTrait|null $newNode */
         $newNode = clone $this; // TODO: Benchmark cloning
 
         // If the result was null, it means that we should not traverse this branch.
-        if (null === ($newNode = $visitor->enterNode($newNode, $key, $parent, $this->path))) {
+        if (null === ($newNode = $visitor->enterNode($newNode))) {
             return null;
         }
 
@@ -73,7 +93,11 @@ public function accept(
             }
         }
 
-        return $visitor->leaveNode($newNode, $key, $parent, $this->path);
+        if (null !== $parent) {
+            $this->removeAncestor();
+        }
+
+        return $visitor->leaveNode($newNode);
     }
 
     /**
@@ -94,6 +118,38 @@ public function setIsEdited(bool $isEdited)
         return $this;
     }
 
+    /**
+     * @return NodeInterface|null
+     */
+    public function getClosestAncestor(): ?NodeInterface
+    {
+        return !empty($this->ancestors) ? $this->ancestors[\count($this->ancestors) - 1] : null;
+    }
+
+    /**
+     * @return int|null|string
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * @return NodeInterface|null
+     */
+    public function getParent(): ?NodeInterface
+    {
+        return $this->parent;
+    }
+
+    /**
+     * @return array
+     */
+    public function getPath(): array
+    {
+        return $this->path;
+    }
+
     /**
      * @param string|int $key
      * @return array|NodeInterface|NodeInterface[]|null
@@ -110,14 +166,21 @@ protected function getNodeOrNodes($key)
      */
     protected function visitNodeOrNodes($nodeOrNodes, $key)
     {
-        return \is_array($nodeOrNodes)
+        $this->addAncestor($this);
+
+        $newNodeOrNodes = \is_array($nodeOrNodes)
             ? $this->visitNodes($nodeOrNodes, $key)
             : $this->visitNode($nodeOrNodes, $key, $this);
+
+        $this->removeAncestor();
+
+        return $newNodeOrNodes;
     }
 
     /**
-     * @param NodeInterface[] $nodes
-     * @param string|int      $key
+     * @param NodeInterface[]    $nodes
+     * @param string|int         $key
+     * @param NodeInterface|null $parent
      * @return NodeInterface[]
      */
     protected function visitNodes(array $nodes, $key): array
@@ -151,12 +214,12 @@ protected function visitNode(NodeInterface $node, $key, ?NodeInterface $parent):
     {
         $this->addOneToPath($key);
 
-        $newNode = $node->accept($this->visitor, $key, $parent, $this->path);
+        $newNode = $node->accept($this->visitor, $key, $parent, $this->path, $this->ancestors);
 
         // If the node was edited, we need to revisit it
         // to produce the expected result.
         if (null !== $newNode && $newNode->isEdited()) {
-            $newNode = $newNode->accept($this->visitor, $key, $parent, $this->path);
+            $newNode = $newNode->accept($this->visitor, $key, $parent, $this->path, $this->ancestors);
         }
 
         $this->removeOneFromPath();
@@ -198,7 +261,24 @@ protected function addOneToPath(string $key)
      */
     protected function removeOneFromPath()
     {
-        $this->path = \array_slice($this->path, 0, count($this->path) - 1);
+        $this->path = \array_slice($this->path, 0, -1);
+    }
+
+    /**
+     * Adds an ancestor.
+     * @param NodeInterface $node
+     */
+    protected function addAncestor(NodeInterface $node)
+    {
+        $this->ancestors[] = $node;
+    }
+
+    /**
+     *  Removes the last ancestor.
+     */
+    protected function removeAncestor()
+    {
+        $this->ancestors = \array_slice($this->ancestors, 0, -1);
     }
 
     /**

src/Language/AST/Visitor/ParallelVisitor.php

@@ -3,7 +3,6 @@
 namespace Digia\GraphQL\Language\AST\Visitor;
 
 use Digia\GraphQL\Language\AST\Node\NodeInterface;
-use Digia\GraphQL\Util\SerializationInterface;
 
 class ParallelVisitor implements VisitorInterface
 {
@@ -27,24 +26,16 @@ public function __construct($visitors)
     }
 
     /**
-     * @param NodeInterface|AcceptVisitorTrait $node
-     * @param string|int|null                  $key
-     * @param NodeInterface|null               $parent
-     * @param array                            $path
-     * @return NodeInterface|SerializationInterface|null
+     * @inheritdoc
      */
-    public function enterNode(
-        NodeInterface $node,
-        $key = null,
-        ?NodeInterface $parent = null,
-        array $path = []
-    ): ?NodeInterface {
+    public function enterNode(NodeInterface $node): ?NodeInterface
+    {
         $newNode = null;
 
         foreach ($this->visitors as $i => $visitor) {
             if (!isset($this->_skipping[$i])) {
                 try {
-                    $newNode = $visitor->enterNode($node, $key, $parent, $path);
+                    $newNode = $visitor->enterNode($node);
                 } catch (VisitorBreak $break) {
                     $this->_skipping[$i] = $break;
                     continue;
@@ -62,24 +53,16 @@ public function enterNode(
     }
 
     /**
-     * @param NodeInterface|AcceptVisitorTrait $node
-     * @param string|int|null                  $key
-     * @param NodeInterface|null               $parent
-     * @param array                            $path
-     * @return NodeInterface|SerializationInterface|null
+     * @inheritdoc
      */
-    public function leaveNode(
-        NodeInterface $node,
-        $key = null,
-        ?NodeInterface $parent = null,
-        array $path = []
-    ): ?NodeInterface {
+    public function leaveNode(NodeInterface $node): ?NodeInterface
+    {
         $newNode = null;
 
         foreach ($this->visitors as $i => $visitor) {
             if (!isset($this->_skipping[$i])) {
                 try {
-                    $newNode = $visitor->leaveNode($node, $key, $parent, $path);
+                    $newNode = $visitor->leaveNode($node);
                 } catch (VisitorBreak $break) {
                     $this->_skipping[$i] = $break;
                     continue;