RetailCRM-Mirror/graphql-php
1
0
Fork 0
mirror of https://github.com/retailcrm/graphql-php.git synced 2024-11-21 20:36:05 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into root-value-consistent-naming

Browse Source 
# Conflicts:
#	docs/data-fetching.md
#	src/Executor/Executor.php
#	tests/Executor/DeferredFieldsTest.php
This commit is contained in:
Benedikt Franke 2019-07-01 08:23:00 +02:00
commit d037ab7ec3
32 changed files with 232 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/data-fetching.md
View File

@ -118,7 +118,9 @@ function defaultFieldResolver($rootValue, $args, $context, \GraphQL\Type\Definit
}
}
return $property instanceof Closure ? $property($rootValue, $args, $context, $info) : $property;
return $property instanceof Closure
? $property($rootValue, $args, $context, $info)
: $property;
}
```

2
docs/reference.md
View File

@ -299,7 +299,7 @@ static function getNullableType($type)
```
# GraphQL\Type\Definition\ResolveInfo
Structure containing information useful for field resolution process.
Passed as 3rd argument to every field resolver. See [docs on field resolving (data fetching)](data-fetching.md).
Passed as 4th argument to every field resolver. See [docs on field resolving (data fetching)](data-fetching.md).
**Class Props:**
```php

10
src/Executor/ExecutionContext.php
View File

@ -14,7 +14,7 @@ use GraphQL\Type\Schema;
* Data that must be available at all points during query execution.
*
* Namely, schema of the type system that is currently executing,
* and the fragments defined in the query document
* and the fragments defined in the query document.
*
* @internal
*/
@ -45,7 +45,7 @@ class ExecutionContext
public $errors;
/** @var PromiseAdapter */
public $promises;
public $promiseAdapter;
public function __construct(
$schema,
@ -53,7 +53,7 @@ class ExecutionContext
$rootValue,
$contextValue,
$operation,
$variables,
$variableValues,
$errors,
$fieldResolver,
$promiseAdapter
@ -63,10 +63,10 @@ class ExecutionContext
$this->rootValue = $rootValue;
$this->contextValue = $contextValue;
$this->operation = $operation;
$this->variableValues = $variables;
$this->variableValues = $variableValues;
$this->errors = $errors ?: [];
$this->fieldResolver = $fieldResolver;
$this->promises = $promiseAdapter;
$this->promiseAdapter = $promiseAdapter;
}
public function addError(Error $error)

4
src/Executor/Executor.php
View File

@ -182,6 +182,8 @@ class Executor
}
}
return $property instanceof Closure ? $property($rootValue, $args, $context, $info) : $property;
return $property instanceof Closure
? $property($rootValue, $args, $context, $info)
: $property;
}
}

72
src/Executor/ReferenceExecutor.php
View File

@ -199,7 +199,7 @@ class ReferenceExecutor implements ExecutorImplementation
public function doExecute() : Promise
{
// Return a Promise that will eventually resolve to the data described by
// The "Response" section of the GraphQL specification.
// the "Response" section of the GraphQL specification.
//
// If errors are encountered while executing a GraphQL field, only that
// field and its descendants will be omitted, and sibling fields will still
@ -212,7 +212,7 @@ class ReferenceExecutor implements ExecutorImplementation
// But for the "sync" case it is always fulfilled
return $this->isPromise($result)
? $result
: $this->exeContext->promises->createFulfilled($result);
: $this->exeContext->promiseAdapter->createFulfilled($result);
}
/**
@ -252,9 +252,9 @@ class ReferenceExecutor implements ExecutorImplementation
//
// Similar to completeValueCatchingError.
try {
$result = $operation->operation === 'mutation' ?
$this->executeFieldsSerially($type, $rootValue, $path, $fields) :
$this->executeFields($type, $rootValue, $path, $fields);
$result = $operation->operation === 'mutation'
? $this->executeFieldsSerially($type, $rootValue, $path, $fields)
: $this->executeFields($type, $rootValue, $path, $fields);
if ($this->isPromise($result)) {
return $result->then(
null,
@ -262,7 +262,7 @@ class ReferenceExecutor implements ExecutorImplementation
if ($error instanceof Error) {
$this->exeContext->addError($error);
return $this->exeContext->promises->createFulfilled(null);
return $this->exeContext->promiseAdapter->createFulfilled(null);
}
}
);
@ -527,7 +527,11 @@ class ReferenceExecutor implements ExecutorImplementation
return self::$UNDEFINED;
}
$returnType = $fieldDef->getType();
// The resolve function's optional third argument is a collection of
// The resolve function's optional 3rd argument is a context value that
// is provided to every resolve function within an execution. It is commonly
// used to represent an authenticated user, or request-specific caches.
$context = $exeContext->contextValue;
// The resolve function's optional 4th argument is a collection of
// information about the current execution state.
$info = new ResolveInfo(
$fieldName,
@ -548,10 +552,6 @@ class ReferenceExecutor implements ExecutorImplementation
} else {
$resolveFn = $this->exeContext->fieldResolver;
}
// The resolve function's optional third argument is a context value that
// is provided to every resolve function within an execution. It is commonly
// used to represent an authenticated user, or request-specific caches.
$context = $exeContext->contextValue;
// Get the resolve function, regardless of if its result is normal
// or abrupt (error).
$result = $this->resolveOrError(
@ -575,6 +575,7 @@ class ReferenceExecutor implements ExecutorImplementation
/**
* This method looks up the field on the given type definition.
*
* It has special casing for the two introspection fields, __schema
* and __typename. __typename is special because it can always be
* queried as a field, even in situations where no other fields
@ -609,8 +610,8 @@ class ReferenceExecutor implements ExecutorImplementation
}
/**
* Isolates the "ReturnOrAbrupt" behavior to not de-opt the `resolveField`
* function. Returns the result of resolveFn or the abrupt-return Error object.
* Isolates the "ReturnOrAbrupt" behavior to not de-opt the `resolveField` function.
* Returns the result of resolveFn or the abrupt-return Error object.
*
* @param FieldDefinition $fieldDef
* @param FieldNode $fieldNode
@ -624,7 +625,7 @@ class ReferenceExecutor implements ExecutorImplementation
private function resolveOrError($fieldDef, $fieldNode, $resolveFn, $rootValue, $context, $info)
{
try {
// Build hash of arguments from the field.arguments AST, using the
// Build a map of arguments from the field.arguments AST, using the
// variables scope to fulfill any variable references.
$args = Values::getArgumentValues(
$fieldDef,
@ -686,7 +687,7 @@ class ReferenceExecutor implements ExecutorImplementation
function ($error) use ($exeContext) {
$exeContext->addError($error);
return $this->exeContext->promises->createFulfilled(null);
return $this->exeContext->promiseAdapter->createFulfilled(null);
}
);
}
@ -733,7 +734,7 @@ class ReferenceExecutor implements ExecutorImplementation
return $promise->then(
null,
function ($error) use ($fieldNodes, $path) {
return $this->exeContext->promises->createRejected(Error::createLocatedError(
return $this->exeContext->promiseAdapter->createRejected(Error::createLocatedError(
$error,
$fieldNodes,
$path
@ -865,7 +866,7 @@ class ReferenceExecutor implements ExecutorImplementation
*/
private function isPromise($value)
{
return $value instanceof Promise || $this->exeContext->promises->isThenable($value);
return $value instanceof Promise || $this->exeContext->promiseAdapter->isThenable($value);
}
/**
@ -881,12 +882,12 @@ class ReferenceExecutor implements ExecutorImplementation
if ($value === null || $value instanceof Promise) {
return $value;
}
if ($this->exeContext->promises->isThenable($value)) {
$promise = $this->exeContext->promises->convertThenable($value);
if ($this->exeContext->promiseAdapter->isThenable($value)) {
$promise = $this->exeContext->promiseAdapter->convertThenable($value);
if (! $promise instanceof Promise) {
throw new InvariantViolation(sprintf(
'%s::convertThenable is expected to return instance of GraphQL\Executor\Promise\Promise, got: %s',
get_class($this->exeContext->promises),
get_class($this->exeContext->promiseAdapter),
Utils::printSafe($promise)
));
}
@ -928,28 +929,27 @@ class ReferenceExecutor implements ExecutorImplementation
}
/**
* Complete a list value by completing each item in the list with the
* inner type
* Complete a list value by completing each item in the list with the inner type.
*
* @param FieldNode[] $fieldNodes
* @param mixed[] $path
* @param mixed $result
* @param FieldNode[] $fieldNodes
* @param mixed[] $path
* @param mixed[]|Traversable $results
*
* @return mixed[]|Promise
*
* @throws Exception
*/
private function completeListValue(ListOfType $returnType, $fieldNodes, ResolveInfo $info, $path, &$result)
private function completeListValue(ListOfType $returnType, $fieldNodes, ResolveInfo $info, $path, &$results)
{
$itemType = $returnType->getWrappedType();
Utils::invariant(
is_array($result) || $result instanceof Traversable,
is_array($results) || $results instanceof Traversable,
'User Error: expected iterable, but did not find one for field ' . $info->parentType . '.' . $info->fieldName . '.'
);
$containsPromise = false;
$i = 0;
$completedItems = [];
foreach ($result as $item) {
foreach ($results as $item) {
$fieldPath = $path;
$fieldPath[] = $i++;
$info->path = $fieldPath;
@ -960,7 +960,9 @@ class ReferenceExecutor implements ExecutorImplementation
$completedItems[] = $completedItem;
}
return $containsPromise ? $this->exeContext->promises->all($completedItems) : $completedItems;
return $containsPromise
? $this->exeContext->promiseAdapter->all($completedItems)
: $completedItems;
}
/**
@ -1102,7 +1104,7 @@ class ReferenceExecutor implements ExecutorImplementation
}
}
if (! empty($promisedIsTypeOfResults)) {
return $this->exeContext->promises->all($promisedIsTypeOfResults)
return $this->exeContext->promiseAdapter->all($promisedIsTypeOfResults)
->then(static function ($isTypeOfResults) use ($possibleTypes) {
foreach ($isTypeOfResults as $index => $result) {
if ($result) {
@ -1188,7 +1190,7 @@ class ReferenceExecutor implements ExecutorImplementation
/**
* @param FieldNode[] $fieldNodes
* @param mixed[] $path
* @param mixed[] $result
* @param mixed $result
*
* @return mixed[]|Promise|stdClass
*
@ -1300,7 +1302,7 @@ class ReferenceExecutor implements ExecutorImplementation
{
$keys = array_keys($assoc);
$valuesAndPromises = array_values($assoc);
$promise = $this->exeContext->promises->all($valuesAndPromises);
$promise = $this->exeContext->promiseAdapter->all($valuesAndPromises);
return $promise->then(static function ($values) use ($keys) {
$resolvedResults = [];
@ -1325,9 +1327,9 @@ class ReferenceExecutor implements ExecutorImplementation
ResolveInfo $info,
&$result
) {
$runtimeType = is_string($runtimeTypeOrName) ?
$this->exeContext->schema->getType($runtimeTypeOrName) :
$runtimeTypeOrName;
$runtimeType = is_string($runtimeTypeOrName)
? $this->exeContext->schema->getType($runtimeTypeOrName)
: $runtimeTypeOrName;
if (! $runtimeType instanceof ObjectType) {
throw new InvariantViolation(
sprintf(

3
src/Executor/Values.php
View File

@ -273,6 +273,7 @@ class Values
return $error->getMessage();
},
$errors
) : [];
)
: [];
}
}

5
src/Experimental/Executor/CoroutineExecutor.php
View File

@ -821,7 +821,10 @@ class CoroutineExecutor implements Runtime, ExecutorImplementation
} else {
$childContexts = [];
foreach ($this->collector->collectFields($objectType, $ctx->shared->mergedSelectionSet ?? $this->mergeSelectionSets($ctx)) as $childShared) {
foreach ($this->collector->collectFields(
$objectType,
$ctx->shared->mergedSelectionSet ?? $this->mergeSelectionSets($ctx)
) as $childShared) {
/** @var CoroutineContextShared $childShared */
$childPath = $path;

35
src/Language/Parser.php
View File

@ -512,15 +512,15 @@ class Parser
*/
private function parseVariableDefinitions()
{
return $this->peek(Token::PAREN_L) ?
$this->many(
return $this->peek(Token::PAREN_L)
? $this->many(
Token::PAREN_L,
function () {
return $this->parseVariableDefinition();
},
Token::PAREN_R
) :
new NodeList([]);
)
: new NodeList([]);
}
/**
@ -592,9 +592,9 @@ class Parser
*/
private function parseSelection()
{
return $this->peek(Token::SPREAD) ?
$this->parseFragment() :
$this->parseField();
return $this->peek(Token::SPREAD)
? $this->parseFragment()
: $this->parseField();
}
/**
@ -634,17 +634,17 @@ class Parser
*/
private function parseArguments($isConst)
{
$parseFn = $isConst ?
function () {
$parseFn = $isConst
? function () {
return $this->parseConstArgument();
} :
function () {
}
: function () {
return $this->parseArgument();
};
return $this->peek(Token::PAREN_L) ?
$this->many(Token::PAREN_L, $parseFn, Token::PAREN_R) :
new NodeList([]);
return $this->peek(Token::PAREN_L)
? $this->many(Token::PAREN_L, $parseFn, Token::PAREN_R)
: new NodeList([]);
}
/**
@ -1208,8 +1208,8 @@ class Parser
do {
$types[] = $this->parseNamedType();
} while ($this->skip(Token::AMP) ||
// Legacy support for the SDL?
(! empty($this->lexer->options['allowLegacySDLImplementsInterfaces']) && $this->peek(Token::NAME))
// Legacy support for the SDL?
(! empty($this->lexer->options['allowLegacySDLImplementsInterfaces']) && $this->peek(Token::NAME))
);
}
@ -1545,7 +1545,8 @@ class Parser
Token::BRACE_L,
[$this, 'parseOperationTypeDefinition'],
Token::BRACE_R
) : [];
)
: [];
if (count($directives) === 0 && count($operationTypes) === 0) {
$this->unexpected();
}

14
src/Language/Visitor.php
View File

@ -251,8 +251,18 @@ class Visitor
$inArray = $stack['inArray'];
$stack = $stack['prev'];
} else {
$key = $parent !== null ? ($inArray ? $index : $keys[$index]) : $UNDEFINED;
$node = $parent !== null ? ($parent instanceof NodeList || is_array($parent) ? $parent[$key] : $parent->{$key}) : $newRoot;
$key = $parent !== null
? ($inArray
? $index
: $keys[$index]
)
: $UNDEFINED;
$node = $parent !== null
? ($parent instanceof NodeList || is_array($parent)
? $parent[$key]
: $parent->{$key}
)
: $newRoot;
if ($node === null || $node === $UNDEFINED) {
continue;
}

12
src/Server/Helper.php
View File

@ -73,10 +73,14 @@ class Helper
}
if (stripos($contentType, 'application/graphql') !== false) {
$rawBody = $readRawBodyFn ? $readRawBodyFn() : $this->readRawBody();
$rawBody = $readRawBodyFn
? $readRawBodyFn()
: $this->readRawBody();
$bodyParams = ['query' => $rawBody ?: ''];
} elseif (stripos($contentType, 'application/json') !== false) {
$rawBody = $readRawBodyFn ? $readRawBodyFn() : $this->readRawBody();
$rawBody = $readRawBodyFn ?
$readRawBodyFn()
: $this->readRawBody();
$bodyParams = json_decode($rawBody ?: '', true);
if (json_last_error()) {
@ -272,7 +276,9 @@ class Helper
);
}
$doc = $op->queryId ? $this->loadPersistedQuery($config, $op) : $op->query;
$doc = $op->queryId
? $this->loadPersistedQuery($config, $op)
: $op->query;
if (! $doc instanceof DocumentNode) {
$doc = Parser::parse($doc);

9
src/Type/Definition/BooleanType.php
View File

@ -20,11 +20,14 @@ class BooleanType extends ScalarType
public $description = 'The `Boolean` scalar type represents `true` or `false`.';
/**
* @param mixed $value
* Coerce the given value to a boolean.
*
* @return bool
* The GraphQL spec leaves this up to the implementations, so we just do what
* PHP does natively to make this intuitive for developers.
*
* @param mixed $value
*/
public function serialize($value)
public function serialize($value) : bool
{
return (bool) $value;
}

4
src/Type/Definition/InputObjectType.php
View File

@ -69,7 +69,9 @@ class InputObjectType extends Type implements InputType, NullableType, NamedType
if ($this->fields === null) {
$this->fields = [];
$fields = $this->config['fields'] ?? [];
$fields = is_callable($fields) ? call_user_func($fields) : $fields;
$fields = is_callable($fields)
? call_user_func($fields)
: $fields;
if (! is_array($fields)) {
throw new InvariantViolation(

4
src/Type/Definition/ListOfType.php
View File

@ -31,6 +31,8 @@ class ListOfType extends Type implements WrappingType, OutputType, NullableType,
{
$type = $this->ofType;
return $recurse && $type instanceof WrappingType ? $type->getWrappedType($recurse) : $type;
return $recurse && $type instanceof WrappingType
? $type->getWrappedType($recurse)
: $type;
}
}

4
src/Type/Definition/NonNull.php
View File

@ -66,6 +66,8 @@ class NonNull extends Type implements WrappingType, OutputType, InputType
{
$type = $this->ofType;
return $recurse && $type instanceof WrappingType ? $type->getWrappedType($recurse) : $type;
return $recurse && $type instanceof WrappingType
? $type->getWrappedType($recurse)
: $type;
}
}

18
src/Type/Definition/ObjectType.php
View File

@ -185,7 +185,9 @@ class ObjectType extends Type implements OutputType, CompositeType, NullableType
{
if ($this->interfaces === null) {
$interfaces = $this->config['interfaces'] ?? [];
$interfaces = is_callable($interfaces) ? call_user_func($interfaces) : $interfaces;
$interfaces = is_callable($interfaces)
? call_user_func($interfaces)
: $interfaces;
if ($interfaces !== null && ! is_array($interfaces)) {
throw new InvariantViolation(
@ -207,12 +209,14 @@ class ObjectType extends Type implements OutputType, CompositeType, NullableType
*/
public function isTypeOf($value, $context, ResolveInfo $info)
{
return isset($this->config['isTypeOf']) ? call_user_func(
$this->config['isTypeOf'],
$value,
$context,
$info
) : null;
return isset($this->config['isTypeOf'])
? call_user_func(
$this->config['isTypeOf'],
$value,
$context,
$info
)
: null;
}
/**

30
src/Type/Definition/ResolveInfo.php
View File

@ -15,12 +15,13 @@ use function array_merge_recursive;
/**
* Structure containing information useful for field resolution process.
* Passed as 3rd argument to every field resolver. See [docs on field resolving (data fetching)](data-fetching.md).
*
* Passed as 4th argument to every field resolver. See [docs on field resolving (data fetching)](data-fetching.md).
*/
class ResolveInfo
{
/**
* The name of the field being resolved
* The name of the field being resolved.
*
* @api
* @var string
@ -36,7 +37,7 @@ class ResolveInfo
public $fieldNodes = [];
/**
* Expected return type of the field being resolved
* Expected return type of the field being resolved.
*
* @api
* @var ScalarType|ObjectType|InterfaceType|UnionType|EnumType|ListOfType|NonNull
@ -44,7 +45,7 @@ class ResolveInfo
public $returnType;
/**
* Parent type of the field being resolved
* Parent type of the field being resolved.
*
* @api
* @var ObjectType
@ -52,7 +53,7 @@ class ResolveInfo
public $parentType;
/**
* Path to this field from the very root value
* Path to this field from the very root value.
*
* @api
* @var string[][]
@ -60,7 +61,7 @@ class ResolveInfo
public $path;
/**
* Instance of a schema used for execution
* Instance of a schema used for execution.
*
* @api
* @var Schema
@ -68,7 +69,7 @@ class ResolveInfo
public $schema;
/**
* AST of all fragments defined in query
* AST of all fragments defined in query.
*
* @api
* @var FragmentDefinitionNode[]
@ -76,15 +77,15 @@ class ResolveInfo
public $fragments = [];
/**
* Root value passed to query execution
* Root value passed to query execution.
*
* @api
* @var mixed|null
* @var mixed
*/
public $rootValue;
/**
* AST of operation definition node (query, mutation)
* AST of operation definition node (query, mutation).
*
* @api
* @var OperationDefinitionNode|null
@ -92,7 +93,7 @@ class ResolveInfo
public $operation;
/**
* Array of variables passed to query execution
* Array of variables passed to query execution.
*
* @api
* @var mixed[]
@ -136,7 +137,7 @@ class ResolveInfo
/**
* Helper method that returns names of all fields selected in query for
* $this->fieldName up to $depth levels
* $this->fieldName up to $depth levels.
*
* Example:
* query MyQuery{
@ -177,7 +178,10 @@ class ResolveInfo
/** @var FieldNode $fieldNode */
foreach ($this->fieldNodes as $fieldNode) {
$fields = array_merge_recursive($fields, $this->foldSelectionSet($fieldNode->selectionSet, $depth));
$fields = array_merge_recursive(
$fields,
$this->foldSelectionSet($fieldNode->selectionSet, $depth)
);
}
return $fields;

4
src/Type/Definition/Type.php
View File

@ -345,7 +345,9 @@ abstract class Type implements JsonSerializable
*/
public static function getNullableType($type)
{
return $type instanceof NonNull ? $type->getWrappedType() : $type;
return $type instanceof NonNull
? $type->getWrappedType()
: $type;
}
/**

4
src/Type/Introspection.php
View File

@ -488,7 +488,9 @@ EOD;
'type' => [
'type' => Type::nonNull(self::_type()),
'resolve' => static function ($value) {
return method_exists($value, 'getType') ? $value->getType() : $value->type;
return method_exists($value, 'getType')
? $value->getType()
: $value->type;
},
],
'defaultValue' => [

10
src/Type/SchemaValidationContext.php
View File

@ -768,8 +768,9 @@ class SchemaValidationContext
);
}
return $union->astNode ?
$union->astNode->types : null;
return $union->astNode
? $union->astNode->types
: null;
}
private function validateEnumValues(EnumType $enumType)
@ -824,8 +825,9 @@ class SchemaValidationContext
);
}
return $enum->astNode ?
$enum->astNode->values : null;
return $enum->astNode
? $enum->astNode->values
: null;
}
private function validateInputFields(InputObjectType $inputObj)

4
src/Utils/ASTDefinitionBuilder.php
View File

@ -394,8 +394,8 @@ class ASTDefinitionBuilder
function ($typeNode) {
return $this->buildType($typeNode);
}
) :
[],
)
: [],
'astNode' => $def,
]);
}

2
src/Utils/MixedStore.php
View File

@ -21,7 +21,7 @@ use function is_string;
* Similar to PHP array, but allows any type of data to act as key (including arrays, objects, scalars)
*
* Note: unfortunately when storing array as key - access and modification is O(N)
* (yet this should be really rare case and should be avoided when possible)
* (yet this should rarely be the case and should be avoided when possible)
*/
class MixedStore implements ArrayAccess
{

4
src/Utils/SchemaExtender.php
View File

@ -609,7 +609,9 @@ class SchemaExtender
}
$schemaExtensionASTNodes = count($schemaExtensions) > 0
? ($schema->extensionASTNodes ? array_merge($schema->extensionASTNodes, $schemaExtensions) : $schemaExtensions)
? ($schema->extensionASTNodes
? array_merge($schema->extensionASTNodes, $schemaExtensions)
: $schemaExtensions)
: $schema->extensionASTNodes;
$types = array_merge(

7
src/Utils/SchemaPrinter.php
View File

@ -353,8 +353,8 @@ class SchemaPrinter
private static function printObject(ObjectType $type, array $options) : string
{
$interfaces = $type->getInterfaces();
$implementedInterfaces = ! empty($interfaces) ?
' implements ' . implode(
$implementedInterfaces = ! empty($interfaces)
? ' implements ' . implode(
' & ',
array_map(
static function ($i) {
@ -362,7 +362,8 @@ class SchemaPrinter
},
$interfaces
)
) : '';
)
: '';
return self::printDescription($options, $type) .
sprintf("type %s%s {\n%s\n}", $type->name, $implementedInterfaces, self::printFields($options, $type));

10
src/Utils/TypeInfo.php
View File

@ -302,10 +302,12 @@ class TypeInfo
case $node instanceof InlineFragmentNode:
case $node instanceof FragmentDefinitionNode:
$typeConditionNode = $node->typeCondition;
$outputType = $typeConditionNode ? self::typeFromAST(
$schema,
$typeConditionNode
) : Type::getNamedType($this->getType());
$outputType = $typeConditionNode
? self::typeFromAST(
$schema,
$typeConditionNode
)
: Type::getNamedType($this->getType());
$this->typeStack[] = Type::isOutputType($outputType) ? $outputType : null;
break;

14
src/Validator/Rules/LoneSchemaDefinition.php
View File

@ -19,12 +19,14 @@ class LoneSchemaDefinition extends ValidationRule
public function getVisitor(ValidationContext $context)
{
$oldSchema = $context->getSchema();
$alreadyDefined = $oldSchema !== null ? (
$oldSchema->getAstNode() ||
$oldSchema->getQueryType() ||
$oldSchema->getMutationType() ||
$oldSchema->getSubscriptionType()
) : false;
$alreadyDefined = $oldSchema !== null
? (
$oldSchema->getAstNode() ||
$oldSchema->getQueryType() ||
$oldSchema->getMutationType() ||
$oldSchema->getSubscriptionType()
)
: false;
$schemaDefinitionsCount = 0;

24
src/Validator/Rules/OverlappingFieldsCanBeMerged.php
View File

@ -473,24 +473,24 @@ class OverlappingFieldsCanBeMerged extends ValidationRule
private function doTypesConflict(OutputType $type1, OutputType $type2)
{
if ($type1 instanceof ListOfType) {
return $type2 instanceof ListOfType ?
$this->doTypesConflict($type1->getWrappedType(), $type2->getWrappedType()) :
true;
return $type2 instanceof ListOfType
? $this->doTypesConflict($type1->getWrappedType(), $type2->getWrappedType())
: true;
}
if ($type2 instanceof ListOfType) {
return $type1 instanceof ListOfType ?
$this->doTypesConflict($type1->getWrappedType(), $type2->getWrappedType()) :
true;
return $type1 instanceof ListOfType
? $this->doTypesConflict($type1->getWrappedType(), $type2->getWrappedType())
: true;
}
if ($type1 instanceof NonNull) {
return $type2 instanceof NonNull ?
$this->doTypesConflict($type1->getWrappedType(), $type2->getWrappedType()) :
true;
return $type2 instanceof NonNull
? $this->doTypesConflict($type1->getWrappedType(), $type2->getWrappedType())
: true;
}
if ($type2 instanceof NonNull) {
return $type1 instanceof NonNull ?
$this->doTypesConflict($type1->getWrappedType(), $type2->getWrappedType()) :
true;
return $type1 instanceof NonNull
? $this->doTypesConflict($type1->getWrappedType(), $type2->getWrappedType())
: true;
}
if (Type::isLeafType($type1) || Type::isLeafType($type2)) {
return $type1 !== $type2;

16
src/Validator/Rules/ProvidedRequiredArgumentsOnDirectives.php
View File

@ -66,13 +66,15 @@ class ProvidedRequiredArgumentsOnDirectives extends ValidationRule
}
$requiredArgsMap[$def->name->value] = Utils::keyMap(
$arguments ? array_filter($arguments, static function (Node $argument) : bool {
return $argument instanceof NonNullTypeNode &&
(
! isset($argument->defaultValue) ||
$argument->defaultValue === null
);
}) : [],
$arguments
? array_filter($arguments, static function (Node $argument) : bool {
return $argument instanceof NonNullTypeNode &&
(
! isset($argument->defaultValue) ||
$argument->defaultValue === null
);
})
: [],
static function (NamedTypeNode $argument) : string {
return $argument->name->value;
}

8
tests/Executor/DeferredFieldsTest.php
View File

@ -401,7 +401,7 @@ class DeferredFieldsTest extends TestCase
return [
'sync' => [
'type' => Type::string(),
'resolve' => function ($rootValue, $a, $c, ResolveInfo $info) {
'resolve' => function ($rootValue, $args, $context, ResolveInfo $info) {
$this->paths[] = $info->path;
return 'sync';
@ -409,7 +409,7 @@ class DeferredFieldsTest extends TestCase
],
'deferred' => [
'type' => Type::string(),
'resolve' => function ($rootValue, $a, $c, ResolveInfo $info) {
'resolve' => function ($rootValue, $args, $context, ResolveInfo $info) {
$this->paths[] = $info->path;
return new Deferred(function () use ($info) {
@ -421,7 +421,7 @@ class DeferredFieldsTest extends TestCase
],
'nest' => [
'type' => $complexType,
'resolve' => function ($rootValue, $a, $c, ResolveInfo $info) {
'resolve' => function ($rootValue, $args, $context, ResolveInfo $info) {
$this->paths[] = $info->path;
return [];
@ -429,7 +429,7 @@ class DeferredFieldsTest extends TestCase
],
'deferredNest' => [
'type' => $complexType,
'resolve' => function ($rootValue, $a, $c, ResolveInfo $info) {
'resolve' => function ($rootValue, $args, $context, ResolveInfo $info) {
$this->paths[] = $info->path;
return new Deferred(function () use ($info) {

11
tests/Language/VisitorTest.php
View File

@ -70,7 +70,12 @@ class VisitorTest extends ValidatorTestCase
/** @var Node $node */
[$node, $key, $parent, $path, $ancestors] = $args;
$parentArray = $parent && ! is_array($parent) ? ($parent instanceof NodeList ? iterator_to_array($parent) : $parent->toArray()) : $parent;
$parentArray = $parent && ! is_array($parent)
? ($parent instanceof NodeList
? iterator_to_array($parent)
: $parent->toArray()
)
: $parent;
self::assertInstanceOf(Node::class, $node);
self::assertContains($node->kind, array_keys(NodeKind::$classMap));
@ -114,7 +119,9 @@ class VisitorTest extends ValidatorTestCase
{
$result = $ast;
foreach ($path as $key) {
$resultArray = $result instanceof NodeList ? iterator_to_array($result) : $result->toArray();
$resultArray = $result instanceof NodeList
? iterator_to_array($result)
: $result->toArray();
self::assertArrayHasKey($key, $resultArray);
$result = $resultArray[$key];
}

34
tests/Type/ScalarSerializationTest.php
View File

@ -13,9 +13,9 @@ class ScalarSerializationTest extends TestCase
{
// Type System: Scalar coercion
/**
* @see it('serializes output int')
* @see it('serializes output as Int')
*/
public function testSerializesOutputInt() : void
public function testSerializesOutputAsInt() : void
{
$intType = Type::int();
@ -114,9 +114,9 @@ class ScalarSerializationTest extends TestCase
}
/**
* @see it('serializes output float')
* @see it('serializes output as Float')
*/
public function testSerializesOutputFloat() : void
public function testSerializesOutputAsFloat() : void
{
$floatType = Type::float();
@ -149,9 +149,9 @@ class ScalarSerializationTest extends TestCase
}
/**
* @see it('serializes output strings')
* @see it('serializes output as String')
*/
public function testSerializesOutputStrings() : void
public function testSerializesOutputAsString() : void
{
$stringType = Type::string();
@ -181,23 +181,27 @@ class ScalarSerializationTest extends TestCase
}
/**
* @see it('serializes output boolean')
* @see it('serializes output as Boolean')
*/
public function testSerializesOutputBoolean() : void
public function testSerializesOutputAsBoolean() : void
{
$boolType = Type::boolean();
self::assertTrue($boolType->serialize('string'));
self::assertFalse($boolType->serialize(''));
self::assertTrue($boolType->serialize('1'));
self::assertTrue($boolType->serialize(1));
self::assertFalse($boolType->serialize(0));
self::assertTrue($boolType->serialize(true));
self::assertTrue($boolType->serialize(1));
self::assertTrue($boolType->serialize('1'));
self::assertTrue($boolType->serialize('string'));
self::assertFalse($boolType->serialize(false));
// TODO: how should it behave on '0'?
self::assertFalse($boolType->serialize(0));
self::assertFalse($boolType->serialize('0'));
self::assertFalse($boolType->serialize(''));
}
public function testSerializesOutputID() : void
/**
* @see it('serializes output as ID')
*/
public function testSerializesOutputAsID() : void
{
$idType = Type::id();

4
tests/Utils/SchemaExtenderTest.php
View File

@ -219,7 +219,9 @@ class SchemaExtenderTest extends TestCase
{
$ast = Parser::parse(SchemaPrinter::doPrint($extendedSchema));
$ast->definitions = array_values(array_filter(
$ast->definitions instanceof NodeList ? iterator_to_array($ast->definitions->getIterator()) : $ast->definitions,
$ast->definitions instanceof NodeList
? iterator_to_array($ast->definitions->getIterator())
: $ast->definitions,
function (Node $node) : bool {
return ! in_array(Printer::doPrint($node), $this->testSchemaDefinitions, true);
}

4
tools/gendocs.php
View File

@ -40,7 +40,9 @@ function renderClassMethod(ReflectionMethod $method) {
$def = $type . '$' . $p->getName();
if ($p->isDefaultValueAvailable()) {
$val = $p->isDefaultValueConstant() ? $p->getDefaultValueConstantName() : $p->getDefaultValue();
$val = $p->isDefaultValueConstant()
? $p->getDefaultValueConstantName()
: $p->getDefaultValue();
$def .= " = " . Utils::printSafeJson($val);
}