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

(Potentially Breaking) Allow serializing scalars as null.

Browse Source 
This changes the check for null/undefined to a check for undefined to determine if scalar serialization was successful or not, allowing `null` to be returned from serialize() without indicating error.

This is potentially breaking for any existing custom scalar which returned `null` from `serialize()` to indicate failure. To account for this change, it should either throw an error or return `undefined`.

ref: graphql/graphql-js#1104
This commit is contained in:
Daniel Tschinder 2018-02-09 14:30:05 +01:00
parent 27ce24b5fe
commit 48c33302a8
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Executor/Executor.php
View File

@ -1187,7 +1187,7 @@ class Executor
{ {
$serializedResult = $returnType->serialize($result); $serializedResult = $returnType->serialize($result);
if ($serializedResult === null) { if (Utils::isInvalid($serializedResult)) {
throw new InvariantViolation( throw new InvariantViolation(
'Expected a value of type "'. Utils::printSafe($returnType) . '" but received: ' . Utils::printSafe($result) 'Expected a value of type "'. Utils::printSafe($returnType) . '" but received: ' . Utils::printSafe($result)
); );

6
src/Type/Definition/EnumType.php
View File

@ -108,7 +108,11 @@ class EnumType extends Type implements InputType, OutputType, LeafType
public function serialize($value) public function serialize($value)
{ {
$lookup = $this->getValueLookup(); $lookup = $this->getValueLookup();
return isset($lookup[$value]) ? $lookup[$value]->name : null; if (isset($lookup[$value])) {
return $lookup[$value]->name;
}
return Utils::undefined();
} }
/** /**

14
src/Utils/AST.php
View File

@ -205,15 +205,15 @@ class AST
return new ObjectValueNode(['fields' => $fieldNodes]); return new ObjectValueNode(['fields' => $fieldNodes]);
} }
Utils::invariant(
$type instanceof ScalarType || $type instanceof EnumType,
"Must provide Input Type, cannot use: " . Utils::printSafe($type)
);
// Since value is an internally represented value, it must be serialized // Since value is an internally represented value, it must be serialized
// to an externally represented value before converting into an AST. // to an externally represented value before converting into an AST.
if ($type instanceof LeafType) { $serialized = $type->serialize($value);
$serialized = $type->serialize($value); if (null === $serialized || Utils::isInvalid($serialized)) {
} else {
throw new InvariantViolation("Must provide Input Type, cannot use: " . Utils::printSafe($type));
}
if (null === $serialized) {
return null; return null;
} }