Reverted DefinitionContainer (YAGNI)

Author: vladar

docs/type-system/index.md

@@ -26,7 +26,7 @@ $myType = new ObjectType([
 ]);
 ```
 
-Class per type, using inheritance:
+Class per type:
 ```php
 <?php
 namespace MyApp;
@@ -50,31 +50,6 @@ class MyType extends ObjectType
 }
 ```
 
-Class per type, using composition:
-```php
-<?php
-namespace MyApp;
-
-use GraphQL\Type\Definition\ObjectType;
-use GraphQL\Type\Definition\Type;
-use GraphQL\Type\DefinitionContainer;
-
-class MyType implements DefinitionContainer
-{
-    private $definition;
-
-    public function getDefinition()
-    {
-        return $this->definition ?: ($this->definition = new ObjectType([
-            'name' => 'MyType',
-            'fields' => [
-                'id' => Type::id()
-            ]
-        ]));
-    }
-}
-```
-
 You can also mix-and-match styles for convenience. For example:
 ```php
 <?php

docs/type-system/scalar-types.md

@@ -35,7 +35,7 @@ or hardcoded in source code) to **serialized** representation included in respon
 Those cases are covered by methods `serialize`, `parseValue` and `parseLiteral` of abstract `ScalarType` 
 class respectively.
 
-Here is an example of simple `Email` type (using inheritance):
+Here is an example of simple `Email` type:
 
 ```php
 <?php
@@ -109,30 +109,6 @@ class EmailType extends ScalarType
 }
 ```
 
-Same example, using composition over inheritance:
-```php
-<?php
-namespace MyApp;
-
-use GraphQL\Type\DefinitionContainer;
-use GraphQL\Type\Definition\CustomScalarType;
-
-class EmailType implements DefinitionContainer
-{
-    private $definition;
-
-    public function getDefinition()
-    {
-        return $this->definition ?: ($this->definition = new CustomScalarType([
-            'name' => 'Email',
-            'serialize' => function($value) {/* See function body above */},
-            'parseValue' => function($value) {/* See function body above */},
-            'parseLiteral' => function($valueNode) {/* See function body above */},
-        ]));
-    }
-}
-```
-
 Or with inline style:
 
 ```php

examples/01-blog/Blog/Type/BaseType.php

@@ -8,12 +8,11 @@
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\ResolveInfo;
 
-class CommentType extends BaseType
+class CommentType extends ObjectType
 {
     public function __construct()
     {
-        // Option #1: using composition over inheritance to define type, see ImageType for inheritance example
-        $this->definition = new ObjectType([
+        $config = [
             'name' => 'Comment',
             'fields' => function() {
                 return [
@@ -43,7 +42,8 @@ public function __construct()
                     return $value->{$info->fieldName};
                 }
             }
-        ]);
+        ];
+        parent::__construct($config);
     }
 
     public function author(Comment $comment)

examples/01-blog/Blog/Type/CommentType.php

@@ -1,20 +1,19 @@
 <?php
 namespace GraphQL\Examples\Blog\Type\Enum;
 
-use GraphQL\Examples\Blog\Type\BaseType;
 use GraphQL\Type\Definition\EnumType;
 
-class ContentFormatEnum extends BaseType
+class ContentFormatEnum extends EnumType
 {
     const FORMAT_TEXT = 'TEXT';
     const FORMAT_HTML = 'HTML';
 
     public function __construct()
     {
-        // Option #1: Define type using composition over inheritance, see ImageSizeEnumType for inheritance option
-        $this->definition = new EnumType([
+        $config = [
             'name' => 'ContentFormatEnum',
             'values' => [self::FORMAT_TEXT, self::FORMAT_HTML]
-        ]);
+        ];
+        parent::__construct($config);
     }
 }

examples/01-blog/Blog/Type/Enum/ContentFormatEnum.php

@@ -8,7 +8,6 @@ class ImageSizeEnumType extends EnumType
 {
     public function __construct()
     {
-        // Option #2: Define enum type using inheritance
         $config = [
             // Note: 'name' option is not needed in this form - it will be inferred from className
             'values' => [

examples/01-blog/Blog/Type/Enum/ImageSizeEnumType.php

@@ -11,7 +11,6 @@ class ImageType extends ObjectType
 {
     public function __construct()
     {
-        // Option #2: define type using inheritance, see any other object type for compositional example
         $config = [
             'name' => 'ImageType',
             'fields' => [

examples/01-blog/Blog/Type/ImageType.php

@@ -7,21 +7,21 @@
 use GraphQL\Examples\Blog\Types;
 use GraphQL\Type\Definition\InterfaceType;
 
-class NodeType extends BaseType
+class NodeType extends InterfaceType
 {
     public function __construct()
     {
-        // Option #1: using composition over inheritance to define type, see ImageType for inheritance example
-        $this->definition = new InterfaceType([
+        $config = [
             'name' => 'Node',
             'fields' => [
                 'id' => Types::id()
             ],
-            'resolveType' => [$this, 'resolveType']
-        ]);
+            'resolveType' => [$this, 'resolveNodeType']
+        ];
+        parent::__construct($config);
     }
 
-    public function resolveType($object, Types $types)
+    public function resolveNodeType($object)
     {
         if ($object instanceof User) {
             return Types::user();

examples/01-blog/Blog/Type/NodeType.php

@@ -8,12 +8,11 @@
 use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type;
 
-class QueryType extends BaseType
+class QueryType extends ObjectType
 {
     public function __construct()
     {
-        // Option #1: using composition over inheritance to define type, see ImageType for inheritance example
-        $this->definition = new ObjectType([
+        $config = [
             'name' => 'Query',
             'fields' => [
                 'user' => [
@@ -61,7 +60,8 @@ public function __construct()
             'resolveField' => function($val, $args, $context, ResolveInfo $info) {
                 return $this->{$info->fieldName}($val, $args, $context, $info);
             }
-        ]);
+        ];
+        parent::__construct($config);
     }
 
     public function user($rootValue, $args)

examples/01-blog/Blog/Type/QueryType.php

@@ -2,21 +2,19 @@
 namespace GraphQL\Examples\Blog\Type\Scalar;
 
 use GraphQL\Error\Error;
-use GraphQL\Examples\Blog\Type\BaseType;
 use GraphQL\Language\AST\StringValueNode;
 use GraphQL\Type\Definition\CustomScalarType;
 use GraphQL\Utils;
 
-class EmailType extends BaseType
+class EmailType
 {
-    public function __construct()
+    public static function create()
     {
-        // Option #1: define scalar types using composition (see UrlType fo option #2 using inheritance)
-        $this->definition = new CustomScalarType([
+        return new CustomScalarType([
             'name' => 'Email',
-            'serialize' => [$this, 'serialize'],
-            'parseValue' => [$this, 'parseValue'],
-            'parseLiteral' => [$this, 'parseLiteral'],
+            'serialize' => [__CLASS__, 'serialize'],
+            'parseValue' => [__CLASS__, 'parseValue'],
+            'parseLiteral' => [__CLASS__, 'parseLiteral'],
         ]);
     }
 
@@ -26,7 +24,7 @@ public function __construct()
      * @param string $value
      * @return string
      */
-    public function serialize($value)
+    public static function serialize($value)
     {
         // Assuming internal representation of email is always correct:
         return $value;
@@ -42,7 +40,7 @@ public function serialize($value)
      * @param mixed $value
      * @return mixed
      */
-    public function parseValue($value)
+    public static function parseValue($value)
     {
         if (!filter_var($value, FILTER_VALIDATE_EMAIL)) {
             throw new \UnexpectedValueException("Cannot represent value as email: " . Utils::printSafe($value));
@@ -57,7 +55,7 @@ public function parseValue($value)
      * @return string
      * @throws Error
      */
-    public function parseLiteral($valueNode)
+    public static function parseLiteral($valueNode)
     {
         // Note: throwing GraphQL\Error\Error vs \UnexpectedValueException to benefit from GraphQL
         // error location in query: