Enhancement: Increase phpstan/phpstan level from 5 to 6

phpstan.neon

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

src/Data/ProcessedCodeCoverageData.php

@@ -41,15 +41,18 @@
  *      }>,
  *      hit: list<TestIdType>
  *  }
- * @phpstan-type FunctionCoverageType array<string, array<string, FunctionCoverageDataType>>
+ * @phpstan-type FunctionCoverageForFileType array<string, FunctionCoverageDataType>
+ * @phpstan-type FunctionCoverageType array<string, FunctionCoverageForFileType>
+ * @phpstan-type LineCoverageForFileType array<int, null|list<TestIdType>>
+ * @phpstan-type LineCoverageType array<string, LineCoverageForFileType>
  */
 final class ProcessedCodeCoverageData
 {
     /**
      * Line coverage data.
      * An array of filenames, each having an array of linenumbers, each executable line having an array of testcase ids.
      *
-     * @var array<string, array<int, null|list<TestIdType>>>
+     * @var LineCoverageType
      */
     private array $lineCoverage = [];
 
@@ -112,30 +115,45 @@ public function markCodeAsExecutedByTestCase(string $testCaseId, RawCodeCoverage
         }
     }
 
+    /**
+     * @param LineCoverageType $lineCoverage
+     */
     public function setLineCoverage(array $lineCoverage): void
     {
         $this->lineCoverage = $lineCoverage;
     }
 
+    /**
+     * @return LineCoverageType
+     */
     public function lineCoverage(): array
     {
         ksort($this->lineCoverage);
 
         return $this->lineCoverage;
     }
 
+    /**
+     * @param FunctionCoverageType $functionCoverage
+     */
     public function setFunctionCoverage(array $functionCoverage): void
     {
         $this->functionCoverage = $functionCoverage;
     }
 
+    /**
+     * @return FunctionCoverageType
+     */
     public function functionCoverage(): array
     {
         ksort($this->functionCoverage);
 
         return $this->functionCoverage;
     }
 
+    /**
+     * @return list<non-empty-string>
+     */
     public function coveredFiles(): array
     {
         ksort($this->lineCoverage);
@@ -220,6 +238,8 @@ public function merge(self $newData): void
      *
      * During a merge, a higher number is better.
      *
+     * @param LineCoverageForFileType $data
+     *
      * @return 1|2|3|4
      */
     private function priorityForLine(array $data, int $line): int

src/Node/Builder.php

@@ -29,6 +29,8 @@
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
  *
  * @phpstan-import-type TestType from CodeCoverage
+ * @phpstan-import-type FunctionCoverageForFileType from ProcessedCodeCoverageData
+ * @phpstan-import-type LineCoverageForFileType from ProcessedCodeCoverageData
  */
 final readonly class Builder
 {
@@ -60,7 +62,7 @@
     /**
      * @param array<string, TestType> $tests
      */
     private function addItems(Directory $root, array $items, array $tests): void
     {
         foreach ($items as $key => $value) {
             $key = (string) $key;
@@ -132,7 +134,7 @@
      * )
      * </code>
      *
-     * @return array<string, array<string, array{lineCoverage: array<int, int>, functionCoverage: array<string, array<int, int>>}>>
+     * @return array<string, array{lineCoverage: LineCoverageForFileType, functionCoverage: FunctionCoverageForFileType}>
      */
     private function buildDirectoryStructure(ProcessedCodeCoverageData $data): array
     {

src/Report/Html/Renderer/File.php

@@ -102,6 +102,7 @@
 use function str_replace;
 use function token_get_all;
 use function trim;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\FileCouldNotBeWrittenException;
 use SebastianBergmann\CodeCoverage\Node\File as FileNode;
 use SebastianBergmann\CodeCoverage\Util\Percentage;
@@ -113,6 +114,7 @@
  * @phpstan-import-type ProcessedTraitType from FileNode
  * @phpstan-import-type ProcessedMethodType from FileNode
  * @phpstan-import-type ProcessedFunctionType from FileNode
+ * @phpstan-import-type TestType from CodeCoverage
  *
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
  */
@@ -799,7 +801,7 @@
     /**
      * @param list<string> $codeLines
      */
     private function renderBranchLines(array $branch, array $codeLines, array $testData): string
     {
         $linesTemplate      = new Template($this->templatePath . 'lines.html.dist', '{{', '}}');
         $singleLineTemplate = new Template($this->templatePath . 'line.html.dist', '{{', '}}');
@@ -906,9 +908,10 @@
     }
 
     /**
-     * @param list<string> $codeLines
+     * @param list<string>            $codeLines
+     * @param array<string, TestType> $testData
      */
     private function renderPathLines(array $path, array $branches, array $codeLines, array $testData): string
     {
         $linesTemplate      = new Template($this->templatePath . 'lines.html.dist', '{{', '}}');
         $singleLineTemplate = new Template($this->templatePath . 'line.html.dist', '{{', '}}');
@@ -1118,6 +1121,9 @@
         return $methodName;
     }
 
+    /**
+     * @param TestType $testData
+     */
     private function createPopoverContentForTest(string $test, array $testData): string
     {
         $testCSS = '';

src/Target/MapBuilder.php

@@ -206,6 +206,10 @@ public function build(Filter $filter, FileAnalyser $analyser): array
         ];
     }
 
+    /**
+     * @param TargetMapPart                             $methods
+     * @param array<non-empty-string, non-empty-string> $reverseLookup
+     */
     private function processMethods(Class_|Trait_ $classOrTrait, string $file, array &$methods, array &$reverseLookup): void
     {
         foreach ($classOrTrait->methods() as $method) {

tests/tests/Target/MapBuilderTest.php

@@ -417,6 +417,10 @@ public static function provider(): array
         ];
     }
 
+    /**
+     * @param TargetMap                        $expected
+     * @param non-empty-list<non-empty-string> $files
+     */
     #[DataProvider('provider')]
     public function testBuildsMap(array $expected, array $files): void
     {