Merge branch '10.0'

Author: sebastianbergmann

src/Node/File.php

@@ -92,6 +92,9 @@
  */
 final class File extends AbstractNode
 {
+    /**
+     * @psalm-var array<int, ?list<non-empty-string>>
+     */
     private array $lineCoverageData;
     private array $functionCoverageData;
     private readonly array $testData;
@@ -135,6 +138,7 @@ final class File extends AbstractNode
     private array $codeUnitsByLine = [];
 
     /**
+     * @psalm-param array<int, ?list<non-empty-string>> $lineCoverageData
      * @psalm-param LinesOfCodeType $linesOfCode
      * @psalm-param array<string, CodeUnitClassType> $classes
      * @psalm-param array<string, CodeUnitTraitType> $traits
@@ -157,6 +161,9 @@ public function count(): int
         return 1;
     }
 
+    /**
+     * @psalm-return array<int, ?list<non-empty-string>>
+     */
     public function lineCoverageData(): array
     {
         return $this->lineCoverageData;

src/Report/Clover.php

@@ -88,7 +88,7 @@ public function process(CodeCoverage $coverage, ?string $target = null, ?string
                     $methodCount = 0;
 
                     foreach (range($method['startLine'], $method['endLine']) as $line) {
-                        if (isset($coverageData[$line]) && ($coverageData[$line] !== null)) {
+                        if (isset($coverageData[$line])) {
                             $methodCount = max($methodCount, count($coverageData[$line]));
                         }
                     }

src/Report/Cobertura.php

@@ -174,7 +174,7 @@ public function process(CodeCoverage $coverage, ?string $target = null): string
                     $methodElement->appendChild($methodLinesElement);
 
                     foreach (range($method['startLine'], $method['endLine']) as $line) {
-                        if (!isset($coverageData[$line]) || $coverageData[$line] === null) {
+                        if (!isset($coverageData[$line])) {
                             continue;
                         }
                         $methodLineElement = $document->createElement('line');
@@ -255,7 +255,7 @@ public function process(CodeCoverage $coverage, ?string $target = null): string
                 $methodElement->appendChild($methodLinesElement);
 
                 foreach (range($function['startLine'], $function['endLine']) as $line) {
-                    if (!isset($coverageData[$line]) || $coverageData[$line] === null) {
+                    if (!isset($coverageData[$line])) {
                         continue;
                     }
                     $methodLineElement = $document->createElement('line');