PHPStan fixes.

Author: Crell

phpstan.neon.dist

@@ -2,7 +2,6 @@ parameters:
     level: 8
     paths:
         - src
-    checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
         - '#Match expression does not handle remaining value#'
         - '#has an uninitialized readonly property (.*). Assign it in the constructor.#'

src/AttributeParser.php

@@ -235,9 +235,9 @@ protected function attributeInheritanceTree(\Reflector $subject, string $attribu
      *
      * This includes both classes and interfaces.
      *
-     * @param \ReflectionClass $subject
+     * @param \ReflectionClass<object> $subject
      *   The reflection of the class for which we want the ancestors.
-     * @return iterable<\ReflectionClass>
+     * @return iterable<\ReflectionClass<object>>
      * @throws \ReflectionException
      */
     protected function classInheritanceTree(\ReflectionClass $subject): iterable
@@ -293,7 +293,7 @@ protected function parameterInheritanceTree(\ReflectionParameter $subject): iter
      *
      * @param \ReflectionProperty|\ReflectionMethod|\ReflectionClassConstant $subject
      *   The reflection of the component for which we want the ancestors.
-     * @return iterable<\Reflector>
+     * @return iterable<\ReflectionProperty|\ReflectionMethod|\ReflectionClassConstant>
      * @throws \ReflectionException
      */
     protected function classElementInheritanceTree(\ReflectionProperty|\ReflectionMethod|\ReflectionClassConstant $subject): iterable
@@ -309,6 +309,7 @@ protected function classElementInheritanceTree(\ReflectionProperty|\ReflectionMe
         foreach ($this->classAncestors($subject->getDeclaringClass()->name) as $class) {
             $rClass = new \ReflectionClass($class);
             if ($rClass->$hasMethod($subjectName)) {
+                // @phpstan-ignore generator.valueType (PHPStan thinks this could be false, but I'm pretty sure it's wrong.)
                 yield $rClass->$getMethod($subjectName);
             }
         }
@@ -323,7 +324,7 @@ protected function classElementInheritanceTree(\ReflectionProperty|\ReflectionMe
     public function classAncestors(string $class, bool $includeClass = true): array
     {
         // These methods both return associative arrays, making + safe.
-        /** @var array<class-string> $ancestors */
+        /** @var array<string, class-string> $ancestors */
         $ancestors = class_parents($class) + class_implements($class);
         return $includeClass
             ? [$class => $class] + $ancestors

src/Attributes/Reflect/CollectParameters.php

@@ -4,6 +4,7 @@
 
 namespace Crell\AttributeUtils\Attributes\Reflect;
 
+// @phpstan-ignore trait.unused (I don't know why PHPStan thinks this is unused. It very much is used.)
 trait CollectParameters
 {
     /** @var ReflectParameter[] */

src/Attributes/Reflect/ReflectClass.php

@@ -68,6 +68,9 @@ class ReflectClass implements FromReflectionClass, ParseMethods, ParseStaticMeth
      */
     public readonly ClassType $structType;
 
+    /**
+     * @param \ReflectionClass<object> $subject
+     */
     public function fromReflection(\ReflectionClass $subject): void
     {
         $this->phpName = $subject->getName();

src/FromReflectionClass.php

@@ -17,5 +17,8 @@
  */
 interface FromReflectionClass
 {
+    /**
+     * @param \ReflectionClass<object> $subject
+     */
     public function fromReflection(\ReflectionClass $subject): void;
 }

src/FromReflectionEnum.php

@@ -17,5 +17,8 @@
  */
 interface FromReflectionEnum
 {
+    /**
+     * @param \ReflectionEnum<\UnitEnum> $subject
+     */
     public function fromReflection(\ReflectionEnum $subject): void;
 }