fixed issue #10

youshido-php · Jul 13, 2016 · ea66d00 · ea66d00
1 parent fd10db6
commit ea66d00
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/Execution/Processor.php b/src/Execution/Processor.php
@@ -258,7 +258,7 @@ protected function getPreResolvedValue($contextValue, FieldAst $fieldAst, Abstra
         }
 
         if ($resolveFunction = $field->getConfig()->getResolveFunction()) {
-            $resolveInfo   = new ResolveInfo($field, [$fieldAst], $field->getType(), $this->executionContext);
+            $resolveInfo = new ResolveInfo($field, [$fieldAst], $field->getType(), $this->executionContext);
 
             $resolverValue = $resolveFunction($resolved ? $resolverValue : $contextValue, $fieldAst->getKeyValueArguments(), $resolveInfo);
         }
@@ -322,18 +322,22 @@ protected function processQueryFields($query, AbstractType $queryType, $resolved
 
                 if ($fieldAst->getName() == self::TYPE_NAME_QUERY) {
                     $fieldResolvedValue = [$alias => $queryType->getName()];
-                } elseif ($fieldAst instanceof Query) {
-                    $fieldValue         = $this->processQueryAST($fieldAst, $currentType->getField($fieldAst->getName()), $resolvedValue);
-                    $fieldResolvedValue = [$alias => $fieldValue];
-                } elseif ($fieldAst instanceof FieldAst) {
-
+                } else {
                     if (!$this->resolveValidator->objectHasField($currentType, $fieldAst)) {
                         $fieldResolvedValue = null;
                     } else {
-                        $fieldResolvedValue = [
-                            $alias => $this->processFieldAST($fieldAst, $currentType->getField($fieldAst->getName()), $resolvedValue)
-                        ];
+                        if ($fieldAst instanceof Query) {
+                            $queryAst           = $currentType->getField($fieldAst->getName());
+                            $fieldValue         = $queryAst ? $this->processQueryAST($fieldAst, $queryAst, $resolvedValue) : null;
+                            $fieldResolvedValue = [$alias => $fieldValue];
+                        } elseif ($fieldAst instanceof FieldAst) {
+                            $fieldResolvedValue = [
+                                $alias => $this->processFieldAST($fieldAst, $currentType->getField($fieldAst->getName()), $resolvedValue)
+                            ];
+                        }
                     }
+
+
                 }
             }