New language features (NamedType, directives rethinking)

Author: vladar

src/Error.php

@@ -41,7 +41,7 @@ class Error extends \Exception
      * @param array|null $nodes
      * @return Error
      */
-    public static function createLocatedError($error, array $nodes = null)
+    public static function createLocatedError($error, $nodes = null)
     {
         if ($error instanceof \Exception) {
             $message = $error->getMessage();
@@ -56,11 +56,11 @@ public static function createLocatedError($error, array $nodes = null)
 
     /**
      * @param Error $error
-     * @return FormattedError
+     * @return array
      */
     public static function formatError(Error $error)
     {
-        return new FormattedError($error->getMessage(), $error->getLocations());
+        return FormattedError::create($error->getMessage(), $error->getLocations());
     }
 
     /**
@@ -69,12 +69,17 @@ public static function formatError(Error $error)
      * @param Source $source
      * @param null $positions
      */
-    public function __construct($message, array $nodes = null, \Exception $previous = null, Source $source = null, $positions = null)
+    public function __construct($message, $nodes = null, \Exception $previous = null, Source $source = null, $positions = null)
     {
         parent::__construct($message, 0, $previous);
 
+        if ($nodes instanceof \Traversable) {
+            $nodes = iterator_to_array($nodes);
+        }
+
         $this->nodes = $nodes;
         $this->source = $source;
+        $this->positions = $positions;
     }
 
     /**

src/FormattedError.php

@@ -1,36 +1,25 @@
 <?php
 namespace GraphQL;
 
+use GraphQL\Language\SourceLocation;
+
 class FormattedError
 {
     /**
-     * @var string
-     */
-    public $message;
-
-    /**
-     * @var array<Language\SourceLocation>
-     */
-    public $locations;
-
-    /**
-     * @param $message
-     * @param array<Language\SourceLocation> $locations
-     */
-    public function __construct($message, $locations = [])
-    {
-        $this->message = $message;
-        $this->locations = array_map(function($loc) { return $loc->toArray();}, $locations);
-    }
-
-    /**
+     * @param $error
+     * @param SourceLocation[] $locations
      * @return array
      */
-    public function toArray()
+    public static function create($error, array $locations = [])
     {
-        return [
-            'message' => $this->message,
-            'locations' => $this->locations
+        $formatted = [
+            'message' => $error
         ];
+
+        if (!empty($locations)) {
+            $formatted['locations'] = array_map(function($loc) { return $loc->toArray();}, $locations);
+        }
+
+        return $formatted;
     }
 }

src/Language/AST/Argument.php

@@ -1,15 +1,10 @@
 <?php
 namespace GraphQL\Language\AST;
 
-class Argument extends Node
+class Argument extends NamedType
 {
     public $kind = Node::ARGUMENT;
 
-    /**
-     * @var Name
-     */
-    public $name;
-
     /**
      * @var Value
      */

src/Language/AST/Directive.php

@@ -11,7 +11,7 @@ class Directive extends Node
     public $name;
 
     /**
-     * @var Value
+     * @var Argument[]
      */
-    public $value;
+    public $arguments;
 }

src/Language/AST/Field.php

@@ -1,7 +1,7 @@
 <?php
 namespace GraphQL\Language\AST;
 
-class Field extends Node
+class Field extends NamedType
 {
     public $kind = Node::FIELD;
 
@@ -10,11 +10,6 @@ class Field extends Node
      */
     public $alias;
 
-    /**
-     * @var Name
-     */
-    public $name;
-
     /**
      * @var array<Argument>|null
      */

src/Language/AST/FragmentDefinition.php

@@ -2,17 +2,12 @@
 namespace GraphQL\Language\AST;
 
 
-class FragmentDefinition extends Node implements Definition
+class FragmentDefinition extends NamedType implements Definition
 {
     public $kind = Node::FRAGMENT_DEFINITION;
 
     /**
-     * @var Name
-     */
-    public $name;
-
-    /**
-     * @var Name
+     * @var NamedType
      */
     public $typeCondition;
 

src/Language/AST/FragmentSpread.php

@@ -1,15 +1,10 @@
 <?php
 namespace GraphQL\Language\AST;
 
-class FragmentSpread extends Node
+class FragmentSpread extends NamedType
 {
     public $kind = Node::FRAGMENT_SPREAD;
 
-    /**
-     * @var Name
-     */
-    public $name;
-
     /**
      * @var array<Directive>
      */

src/Language/AST/InlineFragment.php

@@ -6,7 +6,7 @@ class InlineFragment extends Node
     public $kind = Node::INLINE_FRAGMENT;
 
     /**
-     * @var Name
+     * @var NamedType
      */
     public $typeCondition;
 

src/Language/AST/ArrayValue.php renamed to src/Language/AST/ListValue.php

@@ -1,9 +1,9 @@
 <?php
 namespace GraphQL\Language\AST;
 
-class ArrayValue extends Node implements Value
+class ListValue extends Node implements Value
 {
-    public $kind = Node::ARR;
+    public $kind = Node::LST;
 
     /**
      * @var array<Value>

src/Language/AST/NamedType.php

@@ -0,0 +1,12 @@
+<?php
+namespace GraphQL\Language\AST;
+
+class NamedType extends Node
+{
+    public $kind = Node::NAMED_TYPE;
+
+    /**
+     * @var Name
+     */
+    public $name;
+}