Move Schema class

digiaonline · Feb 26, 2018 · 4a04fad · 4a04fad
1 parent 5d10252
commit 4a04fad
Show file tree

Hide file tree

Showing 10 changed files with 119 additions and 46 deletions.
diff --git a/src/Execution/Execution.php b/src/Execution/Execution.php
@@ -9,7 +9,7 @@
 use Digia\GraphQL\Language\AST\Node\SelectionSetNode;
 use Digia\GraphQL\Language\AST\NodeKindEnum;
 use Digia\GraphQL\Type\Definition\ObjectType;
-use Digia\GraphQL\Type\Schema\Schema;
+use Digia\GraphQL\Type\Schema;
 
 /**
  * Class Execution

diff --git a/src/Execution/ExecutionArguments.php b/src/Execution/ExecutionArguments.php
@@ -4,7 +4,7 @@
 
 use Digia\GraphQL\Language\AST\Node\DocumentNode;
 use Digia\GraphQL\Language\AST\Node\OperationDefinitionNode;
-use Digia\GraphQL\Type\Schema\Schema;
+use Digia\GraphQL\Type\Schema;
 
 class ExecutionArguments
 {

diff --git a/src/Execution/ExecutionContext.php b/src/Execution/ExecutionContext.php
@@ -5,7 +5,7 @@
 use Digia\GraphQL\Error\GraphQLError;
 use Digia\GraphQL\Language\AST\Node\FragmentDefinitionNode;
 use Digia\GraphQL\Language\AST\Node\OperationDefinitionNode;
-use Digia\GraphQL\Type\Schema\Schema;
+use Digia\GraphQL\Type\Schema;
 
 class ExecutionContext
 {

diff --git a/src/Type/Contract/SchemaInterface.php b/src/Type/Contract/SchemaInterface.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Digia\GraphQL\Type\Contract;
+
+use Digia\GraphQL\Type\Definition\Contract\AbstractTypeInterface;
+use Digia\GraphQL\Type\Definition\Contract\NamedTypeInterface;
+use Digia\GraphQL\Type\Definition\Contract\TypeInterface;
+use Digia\GraphQL\Type\Definition\ObjectType;
+
+interface SchemaInterface
+{
+    /**
+     * @return ObjectType
+     */
+    public function getQuery(): ObjectType;
+
+    /**
+     * @return ObjectType
+     */
+    public function getMutation(): ObjectType;
+
+    /**
+     * @return ObjectType
+     */
+    public function getSubscription(): ObjectType;
+
+    /**
+     * @return array
+     */
+    public function getDirectives(): array;
+
+    /**
+     * @return NamedTypeInterface[]
+     */
+    public function getTypeMap(): array;
+
+    /**
+     * @return bool
+     */
+    public function getAssumeValid(): bool;
+
+    /**
+     * @param AbstractTypeInterface $abstractType
+     * @param TypeInterface         $possibleType
+     * @return bool
+     */
+    public function isPossibleType(AbstractTypeInterface $abstractType, TypeInterface $possibleType): bool;
+
+    /**
+     * @param AbstractTypeInterface $abstractType
+     * @return null|TypeInterface[]
+     */
+    public function getPossibleTypes(AbstractTypeInterface $abstractType): ?array;
+
+    /**
+     * @param string $name
+     * @return TypeInterface|null
+     */
+    public function getType(string $name): ?TypeInterface;
+}
diff --git a/src/Type/Schema/Schema.php → src/Type/Schema.php b/src/Type/Schema/Schema.php → src/Type/Schema.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Digia\GraphQL\Type\Schema;
+namespace Digia\GraphQL\Type;
 
+use Digia\GraphQL\ConfigObject;
 use Digia\GraphQL\Language\AST\Node\NodeTrait;
 use Digia\GraphQL\Language\AST\Node\SchemaDefinitionNode;
-use Digia\GraphQL\ConfigObject;
+use Digia\GraphQL\Type\Contract\SchemaInterface;
 use Digia\GraphQL\Type\Definition\Argument;
 use Digia\GraphQL\Type\Definition\Contract\AbstractTypeInterface;
-use Digia\GraphQL\Type\Definition\Contract\NamedTypeInterface;
+use Digia\GraphQL\Type\Definition\Contract\DirectiveInterface;
 use Digia\GraphQL\Type\Definition\Contract\TypeInterface;
 use Digia\GraphQL\Type\Definition\Contract\WrappingTypeInterface;
 use Digia\GraphQL\Type\Definition\InputObjectType;
 use Digia\GraphQL\Type\Definition\InterfaceType;
 use Digia\GraphQL\Type\Definition\ObjectType;
 use Digia\GraphQL\Type\Definition\UnionType;
-use Digia\GraphQL\Type\Definition\Contract\DirectiveInterface;
 use function Digia\GraphQL\Util\invariant;
 
 /**
@@ -44,7 +44,7 @@
  * @package Digia\GraphQL\Type
  * @property SchemaDefinitionNode $astNode
  */
-class Schema extends ConfigObject
+class Schema extends ConfigObject implements SchemaInterface
 {
 
     use NodeTrait;
@@ -95,66 +95,55 @@ class Schema extends ConfigObject
     private $_possibleTypeMap = [];
 
     /**
-     * @return ObjectType
+     * @inheritdoc
      */
     public function getQuery(): ObjectType
     {
         return $this->query;
     }
 
     /**
-     * @return ObjectType
+     * @inheritdoc
      */
     public function getMutation(): ObjectType
     {
         return $this->mutation;
     }
 
     /**
-     * @return ObjectType
+     * @inheritdoc
      */
     public function getSubscription(): ObjectType
     {
         return $this->subscription;
     }
 
     /**
-     * @return NamedTypeInterface[]
-     */
-    public function getTypeMap(): array
-    {
-        return $this->_typeMap;
-    }
-
-    /**
-     * @return bool
+     * @inheritdoc
      */
-    public function getAssumeValid(): bool
+    public function getDirectives(): array
     {
-        return $this->assumeValid;
+        return $this->directives;
     }
 
     /**
      * @inheritdoc
      */
-    protected function beforeConfig(): void
+    public function getTypeMap(): array
     {
-        $this->setDirectives(specifiedDirectives());
+        return $this->_typeMap;
     }
 
     /**
-     * @throws \Exception
+     * @inheritdoc
      */
-    protected function afterConfig(): void
+    public function getAssumeValid(): bool
     {
-        $this->buildTypeMap();
-        $this->buildImplementations();
+        return $this->assumeValid;
     }
 
     /**
-     * @param AbstractTypeInterface $abstractType
-     * @param TypeInterface         $possibleType
-     * @return bool
+     * @inheritdoc
      * @throws \Exception
      */
     public function isPossibleType(AbstractTypeInterface $abstractType, TypeInterface $possibleType): bool
@@ -185,11 +174,10 @@ public function isPossibleType(AbstractTypeInterface $abstractType, TypeInterfac
     }
 
     /**
-     * @param AbstractTypeInterface $abstractType
-     * @return null|TypeInterface[]
+     * @inheritdoc
      * @throws \Exception
      */
-    protected function getPossibleTypes(AbstractTypeInterface $abstractType): ?array
+    public function getPossibleTypes(AbstractTypeInterface $abstractType): ?array
     {
         if ($abstractType instanceof UnionType) {
             return $abstractType->getTypes();
@@ -198,6 +186,31 @@ protected function getPossibleTypes(AbstractTypeInterface $abstractType): ?array
         return $this->_implementations[$abstractType->getName()] ?? null;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getType(string $name): ?TypeInterface
+    {
+        return $this->_typeMap[$name] ?? null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function beforeConfig(): void
+    {
+        $this->setDirectives(specifiedDirectives());
+    }
+
+    /**
+     * @throws \Exception
+     */
+    protected function afterConfig(): void
+    {
+        $this->buildTypeMap();
+        $this->buildImplementations();
+    }
+
     /**
      *
      */
@@ -217,10 +230,10 @@ protected function buildTypeMap(): void
         $typeMap = [];
 
         // First by deeply visiting all initial types.
-        $typeMap = array_reduce($initialTypes, 'Digia\GraphQL\Type\Schema\typeMapReducer', $typeMap);
+        $typeMap = array_reduce($initialTypes, 'Digia\GraphQL\Type\typeMapReducer', $typeMap);
 
         // Then by deeply visiting all directive types.
-        $typeMap = array_reduce($this->directives, 'Digia\GraphQL\Type\Schema\typeMapDirectiveReducer', $typeMap);
+        $typeMap = array_reduce($this->directives, 'Digia\GraphQL\Type\typeMapDirectiveReducer', $typeMap);
 
         // Storing the resulting map for reference by the schema.
         $this->_typeMap = $typeMap;
@@ -232,7 +245,7 @@ protected function buildTypeMap(): void
     protected function buildImplementations()
     {
         $implementations = [];
-        
+
         // Keep track of all implementations by interface name.
         foreach ($this->_typeMap as $typeName => $type) {
             if ($type instanceof ObjectType) {
@@ -288,7 +301,7 @@ protected function setSubscription(ObjectType $subscription): Schema
      * @param array $types
      * @return Schema
      */
-    public function setTypes(array $types): Schema
+    protected function setTypes(array $types): Schema
     {
         $this->types = $types;
 
@@ -353,11 +366,11 @@ function typeMapReducer(array $map, ?TypeInterface $type): array
     $reducedMap = $map;
 
     if ($type instanceof UnionType) {
-        $reducedMap = array_reduce($type->getTypes(), 'Digia\GraphQL\Type\Schema\typeMapReducer', $reducedMap);
+        $reducedMap = array_reduce($type->getTypes(), 'Digia\GraphQL\Type\typeMapReducer', $reducedMap);
     }
 
     if ($type instanceof ObjectType) {
-        $reducedMap = array_reduce($type->getInterfaces(), 'Digia\GraphQL\Type\Schema\typeMapReducer', $reducedMap);
+        $reducedMap = array_reduce($type->getInterfaces(), 'Digia\GraphQL\Type\typeMapReducer', $reducedMap);
     }
 
     if ($type instanceof ObjectType || $type instanceof InterfaceType) {
@@ -367,7 +380,7 @@ function typeMapReducer(array $map, ?TypeInterface $type): array
                     return $argument->getType();
                 }, $field->getArgs());
 
-                $reducedMap = array_reduce($fieldArgTypes, 'Digia\GraphQL\Type\Schema\typeMapReducer', $reducedMap);
+                $reducedMap = array_reduce($fieldArgTypes, 'Digia\GraphQL\Type\typeMapReducer', $reducedMap);
             }
 
             $reducedMap = typeMapReducer($reducedMap, $field->getType());

diff --git a/src/Type/definition.php b/src/Type/definition.php
@@ -20,7 +20,7 @@
 use Digia\GraphQL\Type\Definition\UnionType;
 use Digia\GraphQL\Type\Definition\Directive;
 use Digia\GraphQL\Type\Definition\Contract\DirectiveInterface;
-use Digia\GraphQL\Type\Schema\Schema;
+use Digia\GraphQL\Type\Schema;
 use function Digia\GraphQL\Util\invariant;
 use function Digia\GraphQL\Util\toString;
 

diff --git a/tests/Functional/Excecution/ExecutionTest.php b/tests/Functional/Excecution/ExecutionTest.php
@@ -17,7 +17,7 @@
 use Digia\GraphQL\Language\SourceLocation;
 use Digia\GraphQL\Test\TestCase;
 use Digia\GraphQL\Type\Definition\ObjectType;
-use Digia\GraphQL\Type\Schema\Schema;
+use Digia\GraphQL\Type\Schema;
 use function Digia\GraphQL\Type\GraphQLInt;
 use function Digia\GraphQL\Type\GraphQLList;
 use function Digia\GraphQL\Type\GraphQLString;

diff --git a/tests/Functional/Type/DefinitionTest.php b/tests/Functional/Type/DefinitionTest.php
@@ -13,7 +13,7 @@
 use Digia\GraphQL\Type\Definition\ScalarType;
 use Digia\GraphQL\Type\Definition\TypeNameEnum;
 use Digia\GraphQL\Type\Definition\UnionType;
-use Digia\GraphQL\Type\Schema\Schema;
+use Digia\GraphQL\Type\Schema;
 
 class DefinitionTest extends TestCase
 {

diff --git a/tests/Functional/Type/EnumTypeTest.php b/tests/Functional/Type/EnumTypeTest.php
@@ -11,7 +11,7 @@
 use function Digia\GraphQL\Type\GraphQLObjectType;
 use function Digia\GraphQL\Type\GraphQLSchema;
 use function Digia\GraphQL\Type\GraphQLString;
-use Digia\GraphQL\Type\Schema\Schema;
+use Digia\GraphQL\Type\Schema;
 
 class EnumTypeTest extends TestCase
 {

diff --git a/tests/Functional/Type/SchemaTest.php b/tests/Functional/Type/SchemaTest.php
@@ -14,7 +14,7 @@
 use function Digia\GraphQL\Type\GraphQLObjectType;
 use function Digia\GraphQL\Type\GraphQLSchema;
 use function Digia\GraphQL\Type\GraphQLString;
-use Digia\GraphQL\Type\Schema\Schema;
+use Digia\GraphQL\Type\Schema;
 
 class SchemaTest extends TestCase
 {