Fixed minor doc-blocks issues with tests

Author: divineniiquaye

phpstan.neon.dist

@@ -6,16 +6,7 @@ parameters:
     paths: [src]
     checkGenericClassInNonGenericObjectType: false
 
-    excludes_analyse:
-        - src/DependencyInjection/*
-
     ignoreErrors:
         -
-            message: "#^Parameter \\#1 \\$argument of class ReflectionClass constructor expects class-string<T of object>\\|T of object, string given.$#"
-            path: src/AnnotationLoader.php
-        -
-           message: "#^Call to an undefined method ReflectionClass\\|ReflectionMethod\\|ReflectionProperty\\:\\:getAttributes\\(\\).$#"
-           path: src/AnnotationLoader.php
-        -
-           message: "#^Instanceof between ReflectionProperty and ReflectionProperty will always evaluate to true.$#"
+           message: "#^Unable to resolve the template type T in call to method Spiral\\\\Attributes\\\\ReaderInterface\\:\\:(getParameterMetadata\\(\\)|getFunctionMetadata\\(\\)|getClassMetadata\\(\\)|getPropertyMetadata\\(\\)|getConstantMetadata\\(\\))$#"
            path: src/AnnotationLoader.php

phpunit.xml.dist

@@ -22,9 +22,5 @@
         <include>
             <directory>src</directory>
         </include>
-
-        <exclude>
-            <directory>src/DependecyInjection</directory>
-        </exclude>
     </coverage>
 </phpunit>

psalm.xml.dist

@@ -17,21 +17,10 @@
         <directory name="src"/>
         <ignoreFiles>
             <directory name="vendor"/>
-            <directory name="src/DependencyInjection"/>
         </ignoreFiles>
     </projectFiles>
 
-    <issueHandlers>
-        <UndefinedMethod>
-            <errorLevel type="suppress">
-                <referencedMethod name="ReflectionClass::getAttributes" />
-            </errorLevel>
-        </UndefinedMethod>
-
-        <ArgumentTypeCoercion>
-            <errorLevel type="suppress">
-                <referencedFunction name="ReflectionClass::__construct" />
-            </errorLevel>
-        </ArgumentTypeCoercion>
-    </issueHandlers>
+    <stubs>
+        <file name="vendor/vimeo/psalm/stubs/Php80.php" />
+    </stubs>
 </psalm>

src/AnnotationLoader.php

@@ -112,6 +112,7 @@ private function findAnnotations(string $resource, ListenerInterface $listener):
             $classes[] = $resource;
         }
 
+        /** @var class-string $class */
         foreach ($classes as $class) {
             $classReflection = new ReflectionClass($class);
             $className       = $classReflection->getName();
@@ -167,6 +168,7 @@ private function findAnnotations(string $resource, ListenerInterface $listener):
     }
 
     /**
+     *
      * @param Reflector $reflection
      *
      * @return iterable<object>
@@ -209,10 +211,10 @@ private function getAnnotations(Reflector $reflection, ListenerInterface $listen
     }
 
     /**
-     * @param array $parameters
-     * @param ListenerInterface $listener
+     * @param ReflectionParameter[] $parameters
+     * @param ListenerInterface     $listener
      *
-     * @return iterable<object>
+     * @return iterable<int,object[]>
      */
     private function getMethodParameter(array $parameters, ListenerInterface $listener): iterable
     {

tests/AnnotationLoaderTest.php

@@ -67,6 +67,9 @@ public function testAttach(): void
             }
         }
 
+        asort($names);
+        asort($result);
+
         $this->assertEquals([
             'default',
             'protected_property',