Refactor

Author: sebastianbergmann

src/CodeCoverage.php

@@ -103,7 +103,7 @@ public function __serialize(): array
     public function getReport(): Directory
     {
         if ($this->cachedReport === null) {
-            $this->cachedReport = (new Builder($this->analyser()))->build($this);
+            $this->cachedReport = new Builder($this->analyser())->build($this);
         }
 
         return $this->cachedReport;

src/Node/File.php

@@ -363,7 +363,7 @@ private function calculateStatistics(array $classes, array $traits, array $funct
                 $methodPathCoverage   = $method->executablePaths > 0 ? ($method->executedPaths / $method->executablePaths) * 100 : 0;
 
                 $method->coverage = $methodBranchCoverage > 0 ? $methodBranchCoverage : $methodLineCoverage;
-                $method->crap     = (new CrapIndex($method->ccn, $methodPathCoverage > 0 ? $methodPathCoverage : $methodLineCoverage))->asString();
+                $method->crap     = new CrapIndex($method->ccn, $methodPathCoverage > 0 ? $methodPathCoverage : $methodLineCoverage)->asString();
 
                 $trait->ccn += $method->ccn;
             }
@@ -375,7 +375,7 @@ private function calculateStatistics(array $classes, array $traits, array $funct
             $traitPathCoverage   = $trait->executablePaths > 0 ? ($trait->executedPaths / $trait->executablePaths) * 100 : 0;
 
             $trait->coverage = $traitBranchCoverage > 0 ? $traitBranchCoverage : $traitLineCoverage;
-            $trait->crap     = (new CrapIndex($trait->ccn, $traitPathCoverage > 0 ? $traitPathCoverage : $traitLineCoverage))->asString();
+            $trait->crap     = new CrapIndex($trait->ccn, $traitPathCoverage > 0 ? $traitPathCoverage : $traitLineCoverage)->asString();
 
             if ($trait->executableLines > 0 && $trait->coverage === 100) {
                 $this->numTestedClasses++;
@@ -391,7 +391,7 @@ private function calculateStatistics(array $classes, array $traits, array $funct
                 $methodPathCoverage   = $method->executablePaths > 0 ? ($method->executedPaths / $method->executablePaths) * 100 : 0;
 
                 $method->coverage = $methodBranchCoverage > 0 ? $methodBranchCoverage : $methodLineCoverage;
-                $method->crap     = (new CrapIndex($method->ccn, $methodPathCoverage > 0 ? $methodPathCoverage : $methodLineCoverage))->asString();
+                $method->crap     = new CrapIndex($method->ccn, $methodPathCoverage > 0 ? $methodPathCoverage : $methodLineCoverage)->asString();
 
                 $class->ccn += $method->ccn;
             }
@@ -403,7 +403,7 @@ private function calculateStatistics(array $classes, array $traits, array $funct
             $classPathCoverage   = $class->executablePaths > 0 ? ($class->executedPaths / $class->executablePaths) * 100 : 0;
 
             $class->coverage = $classBranchCoverage > 0 ? $classBranchCoverage : $classLineCoverage;
-            $class->crap     = (new CrapIndex($class->ccn, $classPathCoverage > 0 ? $classPathCoverage : $classLineCoverage))->asString();
+            $class->crap     = new CrapIndex($class->ccn, $classPathCoverage > 0 ? $classPathCoverage : $classLineCoverage)->asString();
 
             if ($class->executableLines > 0 && $class->coverage === 100) {
                 $this->numTestedClasses++;
@@ -418,7 +418,7 @@ private function calculateStatistics(array $classes, array $traits, array $funct
             $functionPathCoverage   = $function->executablePaths > 0 ? ($function->executedPaths / $function->executablePaths) * 100 : 0;
 
             $function->coverage = $functionBranchCoverage > 0 ? $functionBranchCoverage : $functionLineCoverage;
-            $function->crap     = (new CrapIndex($function->ccn, $functionPathCoverage > 0 ? $functionPathCoverage : $functionLineCoverage))->asString();
+            $function->crap     = new CrapIndex($function->ccn, $functionPathCoverage > 0 ? $functionPathCoverage : $functionLineCoverage)->asString();
 
             if ($function->coverage === 100) {
                 $this->numTestedFunctions++;

src/Report/Text.php

@@ -21,16 +21,16 @@
 use SebastianBergmann\CodeCoverage\Node\File;
 use SebastianBergmann\CodeCoverage\Util\Percentage;
 
-final class Text
+final readonly class Text
 {
     private const string COLOR_GREEN  = "\x1b[30;42m";
     private const string COLOR_YELLOW = "\x1b[30;43m";
     private const string COLOR_RED    = "\x1b[37;41m";
     private const string COLOR_HEADER = "\x1b[1;37;40m";
     private const string COLOR_RESET  = "\x1b[0m";
-    private readonly Thresholds $thresholds;
-    private readonly bool $showUncoveredFiles;
-    private readonly bool $showOnlySummary;
+    private Thresholds $thresholds;
+    private bool $showUncoveredFiles;
+    private bool $showOnlySummary;
 
     public function __construct(Thresholds $thresholds, bool $showUncoveredFiles = false, bool $showOnlySummary = false)
     {
@@ -141,7 +141,7 @@ public function process(CodeCoverage $coverage, bool $showColors = false): strin
             $report->numberOfExecutableLines(),
         );
 
-        $padding = max(array_map('strlen', [$classes, $methods, $lines]));
+        $padding = max(array_map(strlen(...), [$classes, $methods, $lines]));
 
         if ($this->showOnlySummary) {
             $title   = 'Code Coverage Report Summary:';

src/Report/Xml/Coverage.php

@@ -14,10 +14,10 @@
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
  */
-final class Coverage
+final readonly class Coverage
 {
-    private readonly XMLWriter $xmlWriter;
-    private readonly string $line;
+    private XMLWriter $xmlWriter;
+    private string $line;
 
     public function __construct(
         XMLWriter $xmlWriter,

src/Report/Xml/Source.php

@@ -29,6 +29,6 @@ public function __construct(XMLWriter $xmlWriter)
     public function setSourceCode(string $source): void
     {
         $tokens = (new Tokenizer)->parse($source);
-        (new XMLSerializer(new NamespaceUri(Facade::XML_NAMESPACE)))->appendToWriter($this->xmlWriter, $tokens);
+        new XMLSerializer(new NamespaceUri(Facade::XML_NAMESPACE))->appendToWriter($this->xmlWriter, $tokens);
     }
 }

src/Version.php

@@ -19,7 +19,7 @@ final class Version
     public static function id(): string
     {
         if (self::$version === '') {
-            self::$version = (new VersionId('12.5.2', dirname(__DIR__)))->asString();
+            self::$version = new VersionId('12.5.2', dirname(__DIR__))->asString();
         }
 
         return self::$version;

tests/_files/source_for_branched_exec_lines.php

@@ -454,7 +454,7 @@ class                           // 0
             implements                      // 0
             \Throwable                      // 0
             {                               // 0
-                private const MY_CONST = 1;
+                private const int MY_CONST = 1;
                 private $var = 1;
                 public function myMethod()
                 {
@@ -596,7 +596,7 @@ abstract class MyAbstractClass implements MyInterface
 final class MyFinalClass extends MyAbstractClass
 {
     use MyTrait;
-    public const STRUCT = [
+    public const array STRUCT = [
         'foo' => 'bar',
     ];
     private string $var;