Call resolveValue before calling resolveType

In hindsight it makes more sense to first resolve the value to the desired type before calling
`resolveType`.

Related to webonyx#1776

Author: ruudk

src/Executor/ReferenceExecutor.php

@@ -1082,8 +1082,8 @@ protected function completeAbstractValue(
         &$result,
         $contextValue
     ) {
-        $typeCandidate = $returnType->resolveType($result, $contextValue, $info);
         $result = $returnType->resolveValue($result, $contextValue, $info);
+        $typeCandidate = $returnType->resolveType($result, $contextValue, $info);
 
         if ($typeCandidate === null) {
             $runtimeType = static::defaultTypeResolver($result, $contextValue, $info, $returnType);

src/Type/Definition/AbstractType.php

@@ -25,6 +25,7 @@ public function resolveType($objectValue, $context, ResolveInfo $info);
 
     /**
      * Receives the original resolved value and transforms it if necessary.
+     * This will be called before calling `resolveType`.
      *
      * @param mixed $objectValue The resolved value for the object type
      * @param mixed $context The context that was passed to GraphQL::execute()

tests/Executor/AbstractTest.php

@@ -792,20 +792,20 @@ public function testResolveValueAllowsModifyingObjectValueForInterfaceType(): vo
     {
         $PetType = new InterfaceType([
             'name' => 'Pet',
-            'resolveType' => static function (PetEntity $objectValue): string {
-                if ($objectValue->type === 'dog') {
-                    return 'Dog';
-                }
-
-                return 'Cat';
-            },
             'resolveValue' => static function (PetEntity $objectValue): object {
                 if ($objectValue->type === 'dog') {
                     return new Dog($objectValue->name, $objectValue->vocalizes);
                 }
 
                 return new Cat($objectValue->name, $objectValue->vocalizes);
             },
+            'resolveType' => static function ($objectValue): string {
+                if ($objectValue instanceof Dog) {
+                    return 'Dog';
+                }
+
+                return 'Cat';
+            },
             'fields' => [
                 'name' => Type::string(),
             ],
@@ -916,20 +916,20 @@ public function testResolveValueAllowsModifyingObjectValueForUnionType(): void
         $PetType = new UnionType([
             'name' => 'Pet',
             'types' => [$DogType, $CatType],
-            'resolveType' => static function (PetEntity $objectValue): string {
-                if ($objectValue->type === 'dog') {
-                    return 'Dog';
-                }
-
-                return 'Cat';
-            },
             'resolveValue' => static function (PetEntity $objectValue): object {
                 if ($objectValue->type === 'dog') {
                     return new Dog($objectValue->name, $objectValue->vocalizes);
                 }
 
                 return new Cat($objectValue->name, $objectValue->vocalizes);
             },
+            'resolveType' => static function ($objectValue): string {
+                if ($objectValue instanceof Dog) {
+                    return 'Dog';
+                }
+
+                return 'Cat';
+            },
         ]);
 
         $schema = new Schema([