Refactor

Author: sebastianbergmann

src/CodeCoverage.php

@@ -105,28 +105,20 @@ final class CodeCoverage
      */
     private $isInitialized = false;
 
-    /**
-     * @var Directory
-     */
-    private $report;
-
     public function __construct(Driver $driver, Filter $filter)
     {
         $this->driver = $driver;
         $this->filter = $filter;
         $this->data   = new ProcessedCodeCoverageData;
+        $this->wizard = new Wizard;
     }
 
     /**
      * Returns the code coverage information as a graph of node objects.
      */
     public function getReport(): Directory
     {
-        if ($this->report === null) {
-            $this->report = (new Builder)->build($this);
-        }
-
-        return $this->report;
+        return (new Builder)->build($this);
     }
 
     /**
@@ -138,7 +130,6 @@ public function clear(): void
         $this->currentId     = null;
         $this->data          = new ProcessedCodeCoverageData;
         $this->tests         = [];
-        $this->report        = null;
     }
 
     /**
@@ -166,8 +157,7 @@ public function getData(bool $raw = false): ProcessedCodeCoverageData
      */
     public function setData(ProcessedCodeCoverageData $data): void
     {
-        $this->data   = $data;
-        $this->report = null;
+        $this->data = $data;
     }
 
     /**
@@ -292,8 +282,6 @@ public function append(RawCodeCoverageData $rawData, $id = null, bool $append =
 
             $this->data->markCodeAsExecutedByTestCase($id, $rawData);
         }
-
-        $this->report = null;
     }
 
     /**
@@ -309,8 +297,7 @@ public function merge(self $that): void
 
         $this->data->merge($that->data);
 
-        $this->tests  = \array_merge($this->tests, $that->getTests());
-        $this->report = null;
+        $this->tests = \array_merge($this->tests, $that->getTests());
     }
 
     public function enableTokenCaching(): void
@@ -608,7 +595,7 @@ private function performUnintentionallyCoveredCodeCheck(RawCodeCoverageData $dat
         foreach ($data->lineCoverage() as $file => $_data) {
             foreach ($_data as $line => $flag) {
                 if ($flag === 1 && !isset($allowedLines[$file][$line])) {
-                    $unintentionallyCoveredUnits[] = $this->wizard()->lookup($file, $line);
+                    $unintentionallyCoveredUnits[] = $this->wizard->lookup($file, $line);
                 }
             }
         }
@@ -731,7 +718,7 @@ private function coverageToCodeUnits(RawCodeCoverageData $rawData): array
         foreach ($rawData->lineCoverage() as $filename => $lines) {
             foreach ($lines as $line => $flag) {
                 if ($flag === 1) {
-                    $codeUnits[] = $this->wizard()->lookup($filename, $line);
+                    $codeUnits[] = $this->wizard->lookup($filename, $line);
                 }
             }
         }
@@ -745,19 +732,10 @@ private function linesToCodeUnits(array $data): array
 
         foreach ($data as $filename => $lines) {
             foreach ($lines as $line) {
-                $codeUnits[] = $this->wizard()->lookup($filename, $line);
+                $codeUnits[] = $this->wizard->lookup($filename, $line);
             }
         }
 
         return \array_unique($codeUnits);
     }
-
-    private function wizard(): Wizard
-    {
-        if ($this->wizard === null) {
-            $this->wizard = new Wizard;
-        }
-
-        return $this->wizard;
-    }
 }