Preserve extended methods from class-based types in SchemaExtender::extend()

CHANGELOG.md

@@ -41,6 +41,7 @@ You can find and compare releases at the [GitHub release page](https://github.co
 - Handle `null` parent of list in `ValuesOfCorrectType::getVisitor`
 - Allow sending both `query` and `queryId`, ignore `queryId` in that case
 - Fix `extend()` to preserve `repeatable` (#931)
+- Preserve extended methods from class-based types in `SchemaExtender::extend()`
 
 ### Removed
 

UPGRADE.md

@@ -810,7 +810,7 @@ Starting from v0.7.0 the signature has changed to (note the new `$context` argum
 /**
  * @param mixed $object The parent resolved object
  * @param array $args Input arguments
- * @param mixed $context The context object hat was passed to GraphQL::execute
+ * @param mixed $context The context object that was passed to GraphQL::execute
  * @param ResolveInfo $info ResolveInfo object
  * @return mixed
  */

phpstan-baseline.neon

@@ -56,12 +56,12 @@ parameters:
 			path: src/Language/AST/Node.php
 
 		-
-			message: "#^Variable property access on GraphQL\\\\Language\\\\AST\\\\Node\\|null\\.$#"
+			message: "#^Variable property access on GraphQL\\\\Language\\\\AST\\\\Node\\.$#"
 			count: 1
 			path: src/Language/Visitor.php
 
 		-
-			message: "#^Variable property access on GraphQL\\\\Language\\\\AST\\\\Node\\.$#"
+			message: "#^Variable property access on GraphQL\\\\Language\\\\AST\\\\Node\\|null\\.$#"
 			count: 1
 			path: src/Language/Visitor.php
 
@@ -80,6 +80,11 @@ parameters:
 			count: 2
 			path: src/Utils/AST.php
 
+		-
+			message: "#^Method GraphQL\\\\Utils\\\\SchemaExtender\\:\\:extendType\\(\\) should return GraphQL\\\\Type\\\\Definition\\\\ListOfType\\|\\(GraphQL\\\\Type\\\\Definition\\\\NamedType&GraphQL\\\\Type\\\\Definition\\\\Type\\)\\|GraphQL\\\\Type\\\\Definition\\\\NonNull but returns GraphQL\\\\Type\\\\Definition\\\\Type\\.$#"
+			count: 1
+			path: src/Utils/SchemaExtender.php
+
 		-
 			message: "#^Variable property access on object\\.$#"
 			count: 1

src/Type/Definition/AbstractType.php

@@ -12,12 +12,12 @@
 interface AbstractType
 {
     /**
-     * Resolves concrete ObjectType for given object value
+     * Resolves the concrete ObjectType for the given value.
      *
-     * @param object  $objectValue
-     * @param mixed[] $context
+     * @param mixed $objectValue The resolved value for the object type
+     * @param mixed $context     The context that was passed to GraphQL::execute()
      *
-     * @return mixed
+     * @return ObjectType|callable(): ObjectType|null
      */
     public function resolveType($objectValue, $context, ResolveInfo $info);
 }

src/Type/Definition/InterfaceType.php

@@ -116,14 +116,6 @@ public function getInterfaces(): array
         return $this->interfaces;
     }
 
-    /**
-     * Resolves concrete ObjectType for given object value
-     *
-     * @param object $objectValue
-     * @param mixed  $context
-     *
-     * @return Type|mixed|null
-     */
     public function resolveType($objectValue, $context, ResolveInfo $info)
     {
         if (isset($this->config['resolveType'])) {

src/Type/Definition/ObjectType.php

@@ -161,16 +161,16 @@ public function getInterfaces(): array
     }
 
     /**
-     * @param mixed $value
-     * @param mixed $context
+     * @param mixed $objectValue The resolved value for the object type
+     * @param mixed $context     The context that was passed to GraphQL::execute()
      *
      * @return bool|Deferred|null
      */
-    public function isTypeOf($value, $context, ResolveInfo $info)
+    public function isTypeOf($objectValue, $context, ResolveInfo $info)
     {
         return isset($this->config['isTypeOf'])
             ? $this->config['isTypeOf'](
-                $value,
+                $objectValue,
                 $context,
                 $info
             )

src/Type/Definition/UnionType.php

@@ -110,14 +110,6 @@ public function getTypes(): array
         return $this->types;
     }
 
-    /**
-     * Resolves concrete ObjectType for given object value
-     *
-     * @param object $objectValue
-     * @param mixed  $context
-     *
-     * @return callable|mixed|null
-     */
     public function resolveType($objectValue, $context, ResolveInfo $info)
     {
         if (isset($this->config['resolveType'])) {