@@ -13,34 +13,34 @@ |
||
| 13 | 13 | |
| 14 | 14 | trait ResolvableObjectTrait { |
| 15 | 15 | |
| 16 | - public function resolve($value, array $args, ResolveInfo $info) |
|
| 17 | - { |
|
| 16 | + public function resolve($value, array $args, ResolveInfo $info) |
|
| 17 | + { |
|
| 18 | 18 | if ($this->resolveFunctionCache === null) { |
| 19 | - $this->resolveFunctionCache = $this->getConfig()->getResolveFunction(); |
|
| 19 | + $this->resolveFunctionCache = $this->getConfig()->getResolveFunction(); |
|
| 20 | 20 | |
| 21 | - if (!$this->resolveFunctionCache) { |
|
| 21 | + if (!$this->resolveFunctionCache) { |
|
| 22 | 22 | $this->resolveFunctionCache = false; |
| 23 | - } |
|
| 23 | + } |
|
| 24 | 24 | } |
| 25 | 25 | if ($this->resolveFunctionCache) { |
| 26 | - $resolveFunction = $this->resolveFunctionCache; |
|
| 26 | + $resolveFunction = $this->resolveFunctionCache; |
|
| 27 | 27 | |
| 28 | - return $resolveFunction($value, $args, $info); |
|
| 28 | + return $resolveFunction($value, $args, $info); |
|
| 29 | 29 | } else { |
| 30 | - if (is_array($value) && array_key_exists($this->getName(), $value)) { |
|
| 30 | + if (is_array($value) && array_key_exists($this->getName(), $value)) { |
|
| 31 | 31 | return $value[$this->getName()]; |
| 32 | - } elseif (is_object($value)) { |
|
| 32 | + } elseif (is_object($value)) { |
|
| 33 | 33 | return TypeService::getPropertyValue($value, $this->getName()); |
| 34 | - } elseif ($this->getType()->getNamedType()->getKind() == TypeMap::KIND_SCALAR) { |
|
| 34 | + } elseif ($this->getType()->getNamedType()->getKind() == TypeMap::KIND_SCALAR) { |
|
| 35 | 35 | return null; |
| 36 | - } else { |
|
| 36 | + } else { |
|
| 37 | 37 | throw new \Exception(sprintf('Property "%s" not found in resolve result', $this->getName())); |
| 38 | - } |
|
| 38 | + } |
|
| 39 | + } |
|
| 39 | 40 | } |
| 40 | - } |
|
| 41 | 41 | |
| 42 | 42 | |
| 43 | - public function getResolveFunction() { |
|
| 43 | + public function getResolveFunction() { |
|
| 44 | 44 | return $this->getConfig()->getResolveFunction(); |
| 45 | - } |
|
| 45 | + } |
|
| 46 | 46 | } |
@@ -191,12 +191,12 @@ |
||
| 191 | 191 | { |
| 192 | 192 | $fieldType = $field->getType(); |
| 193 | 193 | if (is_null($value)) { |
| 194 | - if ($fieldType->getKind() == TypeMap::KIND_NON_NULL) { |
|
| 194 | + if ($fieldType->getKind() == TypeMap::KIND_NON_NULL) { |
|
| 195 | 195 | $this->executionContext->addError(new ResolveException(sprintf('Cannot return null for non-nullable field %s', $field->getName()))); |
| 196 | 196 | return false; |
| 197 | - } |
|
| 197 | + } |
|
| 198 | 198 | |
| 199 | - return true; |
|
| 199 | + return true; |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | $fieldType = $this->resolveTypeIfAbstract($fieldType->getNullableType(), $value); |