Increase PHPStan Rule Level to 6

Author: sebastianbergmann

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-    level: 5
+    level: 6
 
     paths:
         - src

src/Data/ProcessedClassType.php

@@ -35,12 +35,12 @@ final class ProcessedClassType
     public int|string $crap;
     public readonly string $link;
 
+    /**
+     * @param array<string, ProcessedMethodType> $methods
+     */
     public function __construct(
         string $className,
         string $namespace,
-        /**
-         * @var array<string, ProcessedMethodType>
-         */
         array $methods,
         int $startLine,
         int $executableLines,

src/Data/ProcessedCodeCoverageData.php

@@ -214,6 +214,8 @@ public function merge(self $newData): void
      *
      * During a merge, a higher number is better.
      *
+     * @param array<int, null|list<TestIdType>> $data
+     *
      * @return 1|2|3|4
      */
     private function priorityForLine(array $data, int $line): int

src/Data/ProcessedTraitType.php

@@ -35,12 +35,12 @@ final class ProcessedTraitType
     public int|string $crap;
     public readonly string $link;
 
+    /**
+     * @param array<string, ProcessedMethodType> $methods
+     */
     public function __construct(
         string $traitName,
         string $namespace,
-        /**
-         * @var array<string, ProcessedMethodType>
-         */
         array $methods,
         int $startLine,
         int $executableLines,

src/Node/Builder.php

@@ -73,6 +73,7 @@ public function build(ProcessedCodeCoverageData $codeCoverage, array $testResult
     }
 
     /**
+     * @param array<string, mixed>    $items
      * @param array<string, TestType> $tests
      */
     private function addItems(Directory $root, array $items, array $tests): void

src/Node/File.php

@@ -15,6 +15,7 @@
 use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Data\ProcessedBranchCoverageData;
 use SebastianBergmann\CodeCoverage\Data\ProcessedClassType;
+use SebastianBergmann\CodeCoverage\Data\ProcessedFunctionCoverageData;
 use SebastianBergmann\CodeCoverage\Data\ProcessedFunctionType;
 use SebastianBergmann\CodeCoverage\Data\ProcessedMethodType;
 use SebastianBergmann\CodeCoverage\Data\ProcessedPathCoverageData;
@@ -45,6 +46,10 @@ final class File extends AbstractNode
      * @var array<int, ?list<non-empty-string>>
      */
     private array $lineCoverageData;
+
+    /**
+     * @var array<string, ProcessedFunctionCoverageData>
+     */
     private array $functionCoverageData;
 
     /**
@@ -82,17 +87,18 @@ final class File extends AbstractNode
     private ?int $numTestedFunctions = null;
 
     /**
-     * @var array<int, array|array{0: Class_, 1: string}|array{0: Function_|ProcessedFunctionType|ProcessedMethodType}|array{0: Trait_, 1: string}>
+     * @var array<int, array<int, ProcessedClassType|ProcessedFunctionType|ProcessedMethodType|ProcessedTraitType>>
      */
     private array $codeUnitsByLine = [];
 
     /**
-     * @param non-empty-string                    $sha1
-     * @param array<int, ?list<non-empty-string>> $lineCoverageData
-     * @param array<string, TestType>             $testData
-     * @param array<string, Class_>               $classes
-     * @param array<string, Trait_>               $traits
-     * @param array<string, Function_>            $functions
+     * @param non-empty-string                             $sha1
+     * @param array<int, ?list<non-empty-string>>          $lineCoverageData
+     * @param array<string, ProcessedFunctionCoverageData> $functionCoverageData
+     * @param array<string, TestType>                      $testData
+     * @param array<string, Class_>                        $classes
+     * @param array<string, Trait_>                        $traits
+     * @param array<string, Function_>                     $functions
      */
     public function __construct(string $name, AbstractNode $parent, string $sha1, array $lineCoverageData, array $functionCoverageData, array $testData, array $classes, array $traits, array $functions, LinesOfCode $linesOfCode)
     {
@@ -128,6 +134,9 @@ public function lineCoverageData(): array
         return $this->lineCoverageData;
     }
 
+    /**
+     * @return array<string, ProcessedFunctionCoverageData>
+     */
     public function functionCoverageData(): array
     {
         return $this->functionCoverageData;

src/Report/Facade.php

@@ -56,6 +56,9 @@ public static function fromSerializedData(array $serializedCoverage): self
         );
     }
 
+    /**
+     * @param array<string, array{size: string, status: string, time: float}> $testResults
+     */
     private function __construct(Directory $report, array $testResults)
     {
         $this->report      = $report;

src/Report/Html/Renderer/File.php

@@ -119,6 +119,8 @@
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
  *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for phpunit/php-code-coverage
+ *
+ * @phpstan-import-type TestType from \SebastianBergmann\CodeCoverage\CodeCoverage
  */
 final class File extends Renderer
 {
@@ -800,7 +802,8 @@ private function renderBranchStructure(FileNode $node): string
     }
 
     /**
-     * @param list<string> $codeLines
+     * @param list<string>            $codeLines
+     * @param array<string, TestType> $testData
      */
     private function renderBranchLines(ProcessedBranchCoverageData $branch, array $codeLines, array $testData): string
     {
@@ -908,6 +911,7 @@ private function renderPathStructure(FileNode $node): string
     /**
      * @param array<int, ProcessedBranchCoverageData> $branches
      * @param list<string>                            $codeLines
+     * @param array<string, TestType>                 $testData
      */
     private function renderPathLines(ProcessedPathCoverageData $path, array $branches, array $codeLines, array $testData): string
     {
@@ -1119,6 +1123,9 @@ private function abbreviateMethodName(string $methodName): string
         return $methodName;
     }
 
+    /**
+     * @param TestType $testData
+     */
     private function createPopoverContentForTest(string $test, array $testData): string
     {
         $testCSS = '';

src/Report/Xml/Coverage.php

@@ -29,6 +29,9 @@ public function __construct(
         $this->line      = $line;
     }
 
+    /**
+     * @param list<string> $tests
+     */
     public function finalize(array $tests): void
     {
         $writer = $this->xmlWriter;

src/Test/Target/MapBuilder.php

@@ -25,6 +25,7 @@
 /**
  * @phpstan-import-type TargetMap from Mapper
  * @phpstan-import-type TargetMapPart from Mapper
+ * @phpstan-import-type ReverseLookup from Mapper
  *
  * @immutable
  *
@@ -169,6 +170,10 @@ public function build(Filter $filter, FileAnalyser $analyser): array
         ];
     }
 
+    /**
+     * @param array<non-empty-string, list<positive-int>>                      $sourceData
+     * @param array<string, array<non-empty-string, array<int, positive-int>>> $data
+     */
     private function mergeLines(string $targetClass, array $sourceData, array &$data): void
     {
         /**
@@ -195,6 +200,13 @@ private function mergeLines(string $targetClass, array $sourceData, array &$data
         }
     }
 
+    /**
+     * @param TargetMapPart $methods
+     * @param ReverseLookup $reverseLookup
+     *
+     * @param-out TargetMapPart $methods
+     * @param-out ReverseLookup $reverseLookup
+     */
     private function processMethods(Class_|Trait_ $classOrTrait, string $file, array &$methods, array &$reverseLookup): void
     {
         foreach ($classOrTrait->methods() as $method) {