RetailCRM-Mirror/graphql-php
1
0
Fork 0
mirror of https://github.com/retailcrm/graphql-php.git synced 2025-02-11 10:09:24 +03:00
Code Issues Projects Releases Wiki Activity

Ability to override internal types (using types option of Schema class) #174

Browse Source
This commit is contained in:
Vladimir Razuvaev 2017-09-22 23:08:51 +07:00
parent d46ad09108
commit f7248dec76
4 changed files with 68 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Type/Schema.php
View File

@ -110,7 +110,6 @@ class Schema
); );
$this->config = $config; $this->config = $config;
$this->resolvedTypes = Type::getInternalTypes() + Introspection::getTypes();
$this->resolvedTypes[$config->query->name] = $config->query; $this->resolvedTypes[$config->query->name] = $config->query;
if ($config->mutation) { if ($config->mutation) {
@ -119,6 +118,20 @@ class Schema
if ($config->subscription) { if ($config->subscription) {
$this->resolvedTypes[$config->subscription->name] = $config->subscription; $this->resolvedTypes[$config->subscription->name] = $config->subscription;
} }
if (is_array($this->config->types)) {
foreach ($this->resolveAdditionalTypes() as $type) {
if (isset($this->resolvedTypes[$type->name])) {
Utils::invariant(
$type === $this->resolvedTypes[$type->name],
"Schema must contain unique named types but contains multiple types named \"$type\" ".
"(see http://webonyx.github.io/graphql-php/type-system/#type-registry)."
);
}
$this->resolvedTypes[$type->name] = $type;
}
}
$this->resolvedTypes += Type::getInternalTypes() + Introspection::getTypes();
if (!$this->config->typeLoader) { if (!$this->config->typeLoader) {
// Perform full scan of the schema // Perform full scan of the schema
$this->getTypeMap(); $this->getTypeMap();
@ -209,9 +222,12 @@ class Schema
foreach ($this->resolvedTypes as $type) { foreach ($this->resolvedTypes as $type) {
$typeMap = TypeInfo::extractTypes($type, $typeMap); $typeMap = TypeInfo::extractTypes($type, $typeMap);
} }
// When types are set as array they are resolved in constructor
if (is_callable($this->config->types)) {
foreach ($this->resolveAdditionalTypes() as $type) { foreach ($this->resolveAdditionalTypes() as $type) {
$typeMap = TypeInfo::extractTypes($type, $typeMap); $typeMap = TypeInfo::extractTypes($type, $typeMap);
} }
}
return $typeMap; return $typeMap;
} }

12
tests/StarWarsIntrospectionTest.php
View File

@ -26,8 +26,13 @@ class StarWarsIntrospectionTest extends \PHPUnit_Framework_TestCase
$expected = [ $expected = [
'__schema' => [ '__schema' => [
'types' => [ 'types' => [
['name' => 'ID'], ['name' => 'Query'],
['name' => 'Episode'],
['name' => 'Character'],
['name' => 'String'], ['name' => 'String'],
['name' => 'Human'],
['name' => 'Droid'],
['name' => 'ID'],
['name' => 'Float'], ['name' => 'Float'],
['name' => 'Int'], ['name' => 'Int'],
['name' => 'Boolean'], ['name' => 'Boolean'],
@ -39,11 +44,6 @@ class StarWarsIntrospectionTest extends \PHPUnit_Framework_TestCase
['name' => '__EnumValue'], ['name' => '__EnumValue'],
['name' => '__Directive'], ['name' => '__Directive'],
['name' => '__DirectiveLocation'], ['name' => '__DirectiveLocation'],
['name' => 'Query'],
['name' => 'Episode'],
['name' => 'Character'],
['name' => 'Human'],
['name' => 'Droid'],
] ]
] ]
]; ];

19
tests/Type/DefinitionTest.php
View File

@ -3,6 +3,7 @@ namespace GraphQL\Tests\Type;
require_once __DIR__ . '/TestClasses.php'; require_once __DIR__ . '/TestClasses.php';
use GraphQL\Type\Definition\CustomScalarType;
use GraphQL\Type\Schema; use GraphQL\Type\Schema;
use GraphQL\Type\Definition\EnumType; use GraphQL\Type\Definition\EnumType;
use GraphQL\Type\Definition\InputObjectType; use GraphQL\Type\Definition\InputObjectType;
@ -713,5 +714,21 @@ class DefinitionTest extends \PHPUnit_Framework_TestCase
$otherCustom = new OtherCustom(); $otherCustom = new OtherCustom();
$this->assertEquals('OtherCustom', $otherCustom->name); $this->assertEquals('OtherCustom', $otherCustom->name);
} }
}
public function testAllowsOverridingInternalTypes()
{
$idType = new CustomScalarType([
'name' => 'ID',
'serialize' => function() {},
'parseValue' => function() {},
'parseLiteral' => function() {}
]);
$schema = new Schema([
'query' => new ObjectType(['name' => 'Query', 'fields' => []]),
'types' => [$idType]
]);
$this->assertSame($idType, $schema->getType('ID'));
}
}

50
tests/Type/IntrospectionTest.php
View File

@ -43,8 +43,31 @@ class IntrospectionTest extends \PHPUnit_Framework_TestCase
'types' => 'types' =>
array ( array (
array ( array (
'kind' => 'OBJECT',
'name' => 'QueryRoot',
'inputFields' => NULL,
'interfaces' =>
array (
),
'enumValues' => NULL,
'possibleTypes' => NULL,
'fields' => array (
array (
'name' => 'a',
'args' => array(),
'type' => array(
'kind' => 'SCALAR', 'kind' => 'SCALAR',
'name' => 'ID', 'name' => 'String',
'ofType' => null
),
'isDeprecated' => false,
'deprecationReason' => null,
)
)
),
array (
'kind' => 'SCALAR',
'name' => 'String',
'fields' => NULL, 'fields' => NULL,
'inputFields' => NULL, 'inputFields' => NULL,
'interfaces' => NULL, 'interfaces' => NULL,
@ -53,7 +76,7 @@ class IntrospectionTest extends \PHPUnit_Framework_TestCase
), ),
array ( array (
'kind' => 'SCALAR', 'kind' => 'SCALAR',
'name' => 'String', 'name' => 'ID',
'fields' => NULL, 'fields' => NULL,
'inputFields' => NULL, 'inputFields' => NULL,
'interfaces' => NULL, 'interfaces' => NULL,
@ -975,29 +998,6 @@ class IntrospectionTest extends \PHPUnit_Framework_TestCase
), ),
'possibleTypes' => NULL, 'possibleTypes' => NULL,
), ),
array (
'kind' => 'OBJECT',
'name' => 'QueryRoot',
'inputFields' => NULL,
'interfaces' =>
array (
),
'enumValues' => NULL,
'possibleTypes' => NULL,
'fields' => array (
array (
'name' => 'a',
'args' => array(),
'type' => array(
'kind' => 'SCALAR',
'name' => 'String',
'ofType' => null
),
'isDeprecated' => false,
'deprecationReason' => null,
)
)
),
), ),
'directives' => 'directives' =>
array ( array (