Represent line-coverage data in objects

src/Data/ProcessedClassType.php

@@ -0,0 +1,70 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-code-coverage.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\CodeCoverage\Data;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
+final class ProcessedClassType
+{
+    public readonly string $className;
+    public readonly string $namespace;
+
+    /**
+     * @var array<string, ProcessedMethodType>
+     */
+    public array $methods;
+    public readonly int $startLine;
+    public int $executableLines;
+    public int $executedLines;
+    public int $executableBranches;
+    public int $executedBranches;
+    public int $executablePaths;
+    public int $executedPaths;
+    public int $ccn;
+    public float|int $coverage;
+    public int|string $crap;
+    public readonly string $link;
+
+    public function __construct(
+        string $className,
+        string $namespace,
+        /**
+         * @var array<string, ProcessedMethodType>
+         */
+        array $methods,
+        int $startLine,
+        int $executableLines,
+        int $executedLines,
+        int $executableBranches,
+        int $executedBranches,
+        int $executablePaths,
+        int $executedPaths,
+        int $ccn,
+        float|int $coverage,
+        int|string $crap,
+        string $link,
+    ) {
+        $this->className          = $className;
+        $this->namespace          = $namespace;
+        $this->methods            = $methods;
+        $this->startLine          = $startLine;
+        $this->executableLines    = $executableLines;
+        $this->executedLines      = $executedLines;
+        $this->executableBranches = $executableBranches;
+        $this->executedBranches   = $executedBranches;
+        $this->executablePaths    = $executablePaths;
+        $this->executedPaths      = $executedPaths;
+        $this->ccn                = $ccn;
+        $this->coverage           = $coverage;
+        $this->crap               = $crap;
+        $this->link               = $link;
+    }
+}

src/Data/ProcessedFunctionType.php

@@ -0,0 +1,66 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-code-coverage.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\CodeCoverage\Data;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
+final class ProcessedFunctionType
+{
+    public readonly string $functionName;
+    public readonly string $namespace;
+    public readonly string $signature;
+    public readonly int $startLine;
+    public readonly int $endLine;
+    public int $executableLines;
+    public int $executedLines;
+    public int $executableBranches;
+    public int $executedBranches;
+    public int $executablePaths;
+    public int $executedPaths;
+    public int $ccn;
+    public float|int $coverage;
+    public int|string $crap;
+    public readonly string $link;
+
+    public function __construct(
+        string $functionName,
+        string $namespace,
+        string $signature,
+        int $startLine,
+        int $endLine,
+        int $executableLines,
+        int $executedLines,
+        int $executableBranches,
+        int $executedBranches,
+        int $executablePaths,
+        int $executedPaths,
+        int $ccn,
+        float|int $coverage,
+        int|string $crap,
+        string $link,
+    ) {
+        $this->link               = $link;
+        $this->crap               = $crap;
+        $this->coverage           = $coverage;
+        $this->ccn                = $ccn;
+        $this->executedPaths      = $executedPaths;
+        $this->executablePaths    = $executablePaths;
+        $this->executedBranches   = $executedBranches;
+        $this->executableBranches = $executableBranches;
+        $this->executedLines      = $executedLines;
+        $this->executableLines    = $executableLines;
+        $this->endLine            = $endLine;
+        $this->startLine          = $startLine;
+        $this->signature          = $signature;
+        $this->namespace          = $namespace;
+        $this->functionName       = $functionName;
+    }
+}

src/Data/ProcessedMethodType.php

@@ -0,0 +1,66 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-code-coverage.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\CodeCoverage\Data;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
+final class ProcessedMethodType
+{
+    public readonly string $methodName;
+    public readonly string $visibility;
+    public readonly string $signature;
+    public readonly int $startLine;
+    public readonly int $endLine;
+    public int $executableLines;
+    public int $executedLines;
+    public int $executableBranches;
+    public int $executedBranches;
+    public int $executablePaths;
+    public int $executedPaths;
+    public int $ccn;
+    public float|int $coverage;
+    public int|string $crap;
+    public readonly string $link;
+
+    public function __construct(
+        string $methodName,
+        string $visibility,
+        string $signature,
+        int $startLine,
+        int $endLine,
+        int $executableLines,
+        int $executedLines,
+        int $executableBranches,
+        int $executedBranches,
+        int $executablePaths,
+        int $executedPaths,
+        int $ccn,
+        float|int $coverage,
+        int|string $crap,
+        string $link,
+    ) {
+        $this->link               = $link;
+        $this->crap               = $crap;
+        $this->coverage           = $coverage;
+        $this->ccn                = $ccn;
+        $this->executedPaths      = $executedPaths;
+        $this->executablePaths    = $executablePaths;
+        $this->executedBranches   = $executedBranches;
+        $this->executableBranches = $executableBranches;
+        $this->executedLines      = $executedLines;
+        $this->executableLines    = $executableLines;
+        $this->endLine            = $endLine;
+        $this->startLine          = $startLine;
+        $this->signature          = $signature;
+        $this->visibility         = $visibility;
+        $this->methodName         = $methodName;
+    }
+}

src/Data/ProcessedTraitType.php

@@ -0,0 +1,70 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-code-coverage.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\CodeCoverage\Data;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
+ */
+final class ProcessedTraitType
+{
+    public readonly string $traitName;
+    public readonly string $namespace;
+
+    /**
+     * @var array<string, ProcessedMethodType>
+     */
+    public array $methods;
+    public readonly int $startLine;
+    public int $executableLines;
+    public int $executedLines;
+    public int $executableBranches;
+    public int $executedBranches;
+    public int $executablePaths;
+    public int $executedPaths;
+    public int $ccn;
+    public float|int $coverage;
+    public int|string $crap;
+    public readonly string $link;
+
+    public function __construct(
+        string $traitName,
+        string $namespace,
+        /**
+         * @var array<string, ProcessedMethodType>
+         */
+        array $methods,
+        int $startLine,
+        int $executableLines,
+        int $executedLines,
+        int $executableBranches,
+        int $executedBranches,
+        int $executablePaths,
+        int $executedPaths,
+        int $ccn,
+        float|int $coverage,
+        int|string $crap,
+        string $link,
+    ) {
+        $this->link               = $link;
+        $this->crap               = $crap;
+        $this->coverage           = $coverage;
+        $this->ccn                = $ccn;
+        $this->executedPaths      = $executedPaths;
+        $this->executablePaths    = $executablePaths;
+        $this->executedBranches   = $executedBranches;
+        $this->executableBranches = $executableBranches;
+        $this->executedLines      = $executedLines;
+        $this->executableLines    = $executableLines;
+        $this->startLine          = $startLine;
+        $this->methods            = $methods;
+        $this->namespace          = $namespace;
+        $this->traitName          = $traitName;
+    }
+}

src/Node/AbstractNode.php

@@ -15,15 +15,14 @@
 use function str_replace;
 use function substr;
 use Countable;
+use SebastianBergmann\CodeCoverage\Data\ProcessedClassType;
+use SebastianBergmann\CodeCoverage\Data\ProcessedFunctionType;
+use SebastianBergmann\CodeCoverage\Data\ProcessedTraitType;
 use SebastianBergmann\CodeCoverage\StaticAnalysis\LinesOfCode;
 use SebastianBergmann\CodeCoverage\Util\Percentage;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
- *
- * @phpstan-import-type ProcessedFunctionType from File
- * @phpstan-import-type ProcessedClassType from File
- * @phpstan-import-type ProcessedTraitType from File
  */
 abstract class AbstractNode implements Countable
 {
@@ -186,11 +185,11 @@ public function cyclomaticComplexity(): int
         $ccn = 0;
 
         foreach ($this->classesAndTraits() as $classLike) {
-            $ccn += $classLike['ccn'];
+            $ccn += $classLike->ccn;
         }
 
         foreach ($this->functions() as $function) {
-            $ccn += $function['ccn'];
+            $ccn += $function->ccn;
         }
 
         return $ccn;

src/Node/Directory.php

@@ -14,15 +14,14 @@
 use function count;
 use IteratorAggregate;
 use RecursiveIteratorIterator;
+use SebastianBergmann\CodeCoverage\Data\ProcessedClassType;
+use SebastianBergmann\CodeCoverage\Data\ProcessedFunctionType;
+use SebastianBergmann\CodeCoverage\Data\ProcessedTraitType;
 use SebastianBergmann\CodeCoverage\StaticAnalysis\LinesOfCode;
 
 /**
  * @template-implements IteratorAggregate<int, AbstractNode>
  *
- * @phpstan-import-type ProcessedFunctionType from File
- * @phpstan-import-type ProcessedClassType from File
- * @phpstan-import-type ProcessedTraitType from File
- *
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
  */
 final class Directory extends AbstractNode implements IteratorAggregate