Verify that a type name is specified before overriding class's type name

Fixes folkloreinc#365
sburba · Aug 1, 2018 · 4d05023 · 4d05023
1 parent 171631a
commit 4d05023
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 18 deletions.
diff --git a/src/Folklore/GraphQL/GraphQL.php b/src/Folklore/GraphQL/GraphQL.php
@@ -67,7 +67,7 @@ public function schema($schema = null)
                 $this->typesInstances[$name] = $objectType;
                 $types[] = $objectType;
 
-                $this->addType($type, $name);
+                $this->addType($type, is_numeric($name) ? null : $name);
             }
         } else {
             foreach ($this->types as $name => $type) {

diff --git a/tests/GraphQLTest.php b/tests/GraphQLTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use GraphQL\Type\Schema;
-use GraphQL\Type\Definition\ObjectType;
-use GraphQL\Type\Definition\Type;
-use GraphQL\Error\Error;
 use Folklore\GraphQL\Error\ValidationError;
-use Folklore\GraphQL\Events\TypeAdded;
 use Folklore\GraphQL\Events\SchemaAdded;
+use Folklore\GraphQL\Events\TypeAdded;
+use GraphQL\Error\Error;
+use GraphQL\Type\Definition\ObjectType;
+use GraphQL\Type\Definition\Type;
+use GraphQL\Type\Schema;
 
 class GraphQLTest extends TestCase
 {
@@ -77,14 +77,21 @@ public function testSchemaWithArray()
                 'updateExampleCustom' => UpdateExampleMutation::class
             ],
             'types' => [
-                CustomExampleType::class
+                CustomExampleType::class,
+                AnotherCustomExampleType::class
             ]
         ]);
-
+
+        $graphql_types = GraphQL::getTypes();
+        $schema_types = $schema->getTypeMap();
+
         $this->assertGraphQLSchema($schema);
         $this->assertGraphQLSchemaHasQuery($schema, 'examplesCustom');
         $this->assertGraphQLSchemaHasMutation($schema, 'updateExampleCustom');
-        $this->assertArrayHasKey('CustomExample', $schema->getTypeMap());
+        $this->assertArrayHasKey('CustomExample', $schema_types);
+        $this->assertArrayHasKey('AnotherCustomExample', $schema_types);
+        $this->assertArrayHasKey('CustomExample', $graphql_types);
+        $this->assertArrayHasKey('AnotherCustomExample', $graphql_types);
     }
 
     /**
@@ -239,17 +246,17 @@ public function testAddType()
     public function testAddTypeWithName()
     {
         GraphQL::addType(ExampleType::class, 'CustomExample');
-        
+
         $types = GraphQL::getTypes();
         $this->assertArrayHasKey('CustomExample', $types);
-        
+
         $type = app($types['CustomExample']);
         $this->assertInstanceOf(ExampleType::class, $type);
-        
+
         $type = GraphQL::type('CustomExample');
         $this->assertInstanceOf(\GraphQL\Type\Definition\ObjectType::class, $type);
     }
-    
+
     /**
      * Test get types
      *
@@ -259,11 +266,11 @@ public function testGetTypes()
     {
         $types = GraphQL::getTypes();
         $this->assertArrayHasKey('Example', $types);
-        
+
         $type = app($types['Example']);
         $this->assertInstanceOf(\Folklore\GraphQL\Support\Type::class, $type);
     }
-    
+
     /**
      * Test add schema
      *
@@ -272,9 +279,9 @@ public function testGetTypes()
     public function testAddSchema()
     {
         $this->expectsEvents(SchemaAdded::class);
-	
+
 	    $this->app['events']->shouldReceive('listen')->with(SchemaAdded::class, Closure::class)->once();
-        
+
         GraphQL::addSchema('custom_add', [
             'query' => [
                 'examplesCustom' => ExamplesQuery::class
@@ -290,7 +297,7 @@ public function testAddSchema()
         $schemas = GraphQL::getSchemas();
         $this->assertArrayHasKey('custom_add', $schemas);
     }
-    
+
     /**
      * Test get schemas
      *

diff --git a/tests/Objects/AnotherCustomExampleType.php b/tests/Objects/AnotherCustomExampleType.php
@@ -0,0 +1,23 @@
+<?php
+
+use GraphQL\Type\Definition\Type;
+use Folklore\GraphQL\Support\Type as GraphQLType;
+
+class AnotherCustomExampleType extends GraphQLType
+{
+
+    protected $attributes = [
+        'name' => 'AnotherCustomExample',
+        'description' => 'An example'
+    ];
+
+    public function fields()
+    {
+        return [
+            'test' => [
+                'type' => Type::string(),
+                'description' => 'A test field'
+            ]
+        ];
+    }
+}