new resolve field logic

Author: portey

src/Execution/Processor.php

@@ -222,7 +222,13 @@ protected function resolveFieldValue(AbstractField $field, $contextValue, Query
     {
         $resolveInfo = new ResolveInfo($field, $query->getFields(), $field->getType(), $this->executionContext);
 
-        return $field->resolve($contextValue, $this->parseArgumentsValues($field, $query), $resolveInfo);
+        if ($resolveFunc = $field->getConfig()->getResolveFunction()) {
+            return $resolveFunc($contextValue, $this->parseArgumentsValues($field, $query), $resolveInfo);
+        } elseif ($propertyValue = TypeService::getPropertyValue($contextValue, $field->getName())) {
+            return $propertyValue;
+        } else {
+            return $field->resolve($contextValue, $this->parseArgumentsValues($field, $query), $resolveInfo);
+        }
     }
 
     /**
@@ -251,9 +257,10 @@ protected function getPreResolvedValue($contextValue, FieldAst $fieldAst, Abstra
             $resolved = true;
         }
 
-        if ($field->getConfig()->getResolveFunction()) {
+        if ($resolveFunction = $field->getConfig()->getResolveFunction()) {
             $resolveInfo   = new ResolveInfo($field, [$fieldAst], $field->getType(), $this->executionContext);
-            $resolverValue = $field->resolve($resolved ? $resolverValue : $contextValue, $fieldAst->getKeyValueArguments(), $resolveInfo);
+
+            $resolverValue = $resolveFunction($resolved ? $resolverValue : $contextValue, $fieldAst->getKeyValueArguments(), $resolveInfo);
         }
 
         if (!$resolverValue && !$resolved) {

src/Field/AbstractField.php

@@ -59,14 +59,6 @@ public function setType($type)
      */
     public function resolve($value, array $args, ResolveInfo $info)
     {
-        if ($resolveFunc = $this->getConfig()->getResolveFunction()) {
-            $info->setReturnType($this->getType());
-
-            return $resolveFunc($value, $args, $info);
-        } elseif ($propertyValue = TypeService::getPropertyValue($value, $this->getName())) {
-            return $propertyValue;
-        }
-
         return null;
     }