Improve interface extension related typehints

Co-authored-by: Benedikt Franke <[email protected]>

Author: Kingdutch

src/Type/Definition/ImplementingType.php

@@ -15,7 +15,7 @@ interface ImplementingType
     public function implementsInterface(InterfaceType $interfaceType) : bool;
 
     /**
-     * @return InterfaceType[]
+     * @return array<int, InterfaceType>
      */
     public function getInterfaces() : array;
 }

src/Type/Definition/InterfaceType.php

@@ -33,14 +33,14 @@ class InterfaceType extends Type implements AbstractType, OutputType, CompositeT
     /**
      * Lazily initialized.
      *
-     * @var InterfaceType[]
+     * @var array<int, InterfaceType>
      */
     private $interfaces;
 
     /**
      * Lazily initialized.
      *
-     * @var InterfaceType[]
+     * @var array<string, InterfaceType>
      */
     private $interfaceMap;
 
@@ -131,7 +131,7 @@ public function implementsInterface(InterfaceType $interfaceType) : bool
     }
 
     /**
-     * @return InterfaceType[]
+     * @return array<int, InterfaceType>
      */
     public function getInterfaces() : array
     {

src/Type/Definition/ObjectType.php

@@ -76,14 +76,14 @@ class ObjectType extends Type implements OutputType, CompositeType, NullableType
     /**
      * Lazily initialized.
      *
-     * @var InterfaceType[]
+     * @var array<int, InterfaceType>
      */
     private $interfaces;
 
     /**
      * Lazily initialized.
      *
-     * @var InterfaceType[]
+     * @var array<string, InterfaceType>
      */
     private $interfaceMap;
 
@@ -180,7 +180,7 @@ public function implementsInterface(InterfaceType $interfaceType) : bool
     }
 
     /**
-     * @return InterfaceType[]
+     * @return array<int, InterfaceType>
      */
     public function getInterfaces() : array
     {

src/Type/Schema.php

@@ -497,7 +497,7 @@ public function isPossibleType(AbstractType $abstractType, ObjectType $possibleT
     }
 
     /**
-     * Returns true if maybe sub type is a sub type of given abstract type.
+     * Returns true if the given type is a sub type of the given abstract type.
      *
      * @param UnionType|InterfaceType  $abstractType
      * @param ObjectType|InterfaceType $maybeSubType

src/Type/SchemaValidationContext.php

@@ -662,7 +662,7 @@ private function getFieldArgNode($type, $fieldName, $argName)
     /**
      * @param ObjectType|InterfaceType $type
      */
-    private function validateInterfaces(ImplementingType $type)
+    private function validateInterfaces(ImplementingType $type) : void
     {
         $ifaceTypeNames = [];
         foreach ($type->getInterfaces() as $iface) {
@@ -717,11 +717,8 @@ private function getDirectives($object)
 
     /**
      * @param ObjectType|InterfaceType $type
-     * @param InterfaceType            $iface
-     *
-     * @return NamedTypeNode|null
      */
-    private function getImplementsInterfaceNode($type, $iface)
+    private function getImplementsInterfaceNode($type, Type $iface) : ?NamedTypeNode
     {
         $nodes = $this->getAllImplementsInterfaceNodes($type, $iface);
 
@@ -894,9 +891,8 @@ private function validateTypeImplementsInterface($type, $iface)
 
     /**
      * @param ObjectType|InterfaceType $type
-     * @param InterfaceType            $iface
      */
-    private function validateTypeImplementsAncestors(ImplementingType $type, $iface)
+    private function validateTypeImplementsAncestors(ImplementingType $type, InterfaceType $iface) : void
     {
         $typeInterfaces = $type->getInterfaces();
         foreach ($iface->getInterfaces() as $transitive) {

src/Utils/ASTDefinitionBuilder.php

@@ -278,7 +278,7 @@ private function makeTypeDef(ObjectTypeDefinitionNode $def)
             'fields'      => function () use ($def) {
                 return $this->makeFieldDefMap($def);
             },
-            'interfaces'  => function () use ($def) {
+            'interfaces'  => function () use ($def) : ?array {
                 return $this->makeImplementedInterfaces($def);
             },
             'astNode'     => $def,
@@ -331,8 +331,10 @@ private function getDeprecationReason($node)
 
     /**
      * @param ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode $def
+     *
+     * @return array<int, InterfaceType> | null
      */
-    private function makeImplementedInterfaces($def)
+    private function makeImplementedInterfaces($def) : ?array
     {
         if ($def->interfaces !== null) {
             // Note: While this could make early assertions to get the correctly
@@ -359,7 +361,7 @@ private function makeInterfaceDef(InterfaceTypeDefinitionNode $def)
             'fields'      => function () use ($def) {
                 return $this->makeFieldDefMap($def);
             },
-            'interfaces'  => function () use ($def) {
+            'interfaces'  => function () use ($def) : ?array {
                 return $this->makeImplementedInterfaces($def);
             },
             'astNode'     => $def,