Reworked ProcessedClassType, ProcessedTraitType

Author: staabm

src/Data/ProcessedClassType.php

@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-code-coverage.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\CodeCoverage\Data;
+
+final class ProcessedClassType
+{
+    public function __construct(
+        public string $className,
+        public string $namespace,
+        /**
+         * @var array<string, ProcessedMethodType>
+         */
+        public array $methods,
+        public 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 string $link,
+    ) {
+    }
+}

src/Data/ProcessedTraitType.php

@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of phpunit/php-code-coverage.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace SebastianBergmann\CodeCoverage\Data;
+
+final class ProcessedTraitType
+{
+    public function __construct(
+        public string $traitName,
+        public string $namespace,
+        /**
+         * @var array<string, ProcessedMethodType>
+         */
+        public array $methods,
+        public 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 string $link,
+    ) {
+    }
+}

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 ProcessedClassType from File
- * @phpstan-import-type ProcessedTraitType from File
  */
 abstract class AbstractNode implements Countable
 {
@@ -186,7 +185,7 @@ public function cyclomaticComplexity(): int
         $ccn = 0;
 
         foreach ($this->classesAndTraits() as $classLike) {
-            $ccn += $classLike['ccn'];
+            $ccn += $classLike->ccn;
         }
 
         foreach ($this->functions() as $function) {

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 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