Do not pass $cacheTokens flag to Node objects

Author: sebastianbergmann

src/CodeCoverage.php

@@ -327,14 +327,6 @@ public function disableTokenCaching(): void
     {
     }
 
-    /**
-     * @todo remove
-     */
-    public function cachesTokens(): bool
-    {
-        return false;
-    }
-
     public function enableCheckForUnintentionallyCoveredCode(): void
     {
         $this->checkForUnintentionallyCoveredCode = true;

src/Node/Builder.php

@@ -40,14 +40,13 @@ public function build(CodeCoverage $coverage): Directory
         $this->addItems(
             $root,
             $this->buildDirectoryStructure($data),
-            $coverage->getTests(),
-            $coverage->cachesTokens()
+            $coverage->getTests()
         );
 
         return $root;
     }
 
-    private function addItems(Directory $root, array $items, array $tests, bool $cacheTokens): void
+    private function addItems(Directory $root, array $items, array $tests): void
     {
         foreach ($items as $key => $value) {
             $key = (string) $key;
@@ -56,11 +55,11 @@ private function addItems(Directory $root, array $items, array $tests, bool $cac
                 $key = substr($key, 0, -2);
 
                 if (file_exists($root->pathAsString() . DIRECTORY_SEPARATOR . $key)) {
-                    $root->addFile($key, $value['lineCoverage'], $value['functionCoverage'], $tests, $cacheTokens);
+                    $root->addFile($key, $value['lineCoverage'], $value['functionCoverage'], $tests);
                 }
             } else {
                 $child = $root->addDirectory($key);
-                $this->addItems($child, $value, $tests, $cacheTokens);
+                $this->addItems($child, $value, $tests);
             }
         }
     }

src/Node/Directory.php

@@ -160,9 +160,9 @@ public function addDirectory(string $name): self
         return $directory;
     }
 
-    public function addFile(string $name, array $lineCoverageData, array $functionCoverageData, array $testData, bool $cacheTokens): File
+    public function addFile(string $name, array $lineCoverageData, array $functionCoverageData, array $testData): File
     {
-        $file = new File($name, $this, $lineCoverageData, $functionCoverageData, $testData, $cacheTokens);
+        $file = new File($name, $this, $lineCoverageData, $functionCoverageData, $testData);
 
         $this->children[] = $file;
         $this->files[]    = &$this->children[count($this->children) - 1];

src/Node/File.php

@@ -16,7 +16,6 @@
 use function strpos;
 use OutOfBoundsException;
 use PHP_Token_Stream;
-use PHP_Token_Stream_CachingFactory;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for phpunit/php-code-coverage
@@ -123,24 +122,18 @@ final class File extends AbstractNode
      */
     private $numTestedFunctions;
 
-    /**
-     * @var bool
-     */
-    private $cacheTokens;
-
     /**
      * @var array
      */
     private $codeUnitsByLine = [];
 
-    public function __construct(string $name, AbstractNode $parent, array $lineCoverageData, array $functionCoverageData, array $testData, bool $cacheTokens)
+    public function __construct(string $name, AbstractNode $parent, array $lineCoverageData, array $functionCoverageData, array $testData)
     {
         parent::__construct($name, $parent);
 
         $this->lineCoverageData     = $lineCoverageData;
         $this->functionCoverageData = $functionCoverageData;
         $this->testData             = $testData;
-        $this->cacheTokens          = $cacheTokens;
 
         $this->calculateStatistics();
     }
@@ -338,11 +331,7 @@ public function numberOfTestedFunctions(): int
 
     private function calculateStatistics(): void
     {
-        if ($this->cacheTokens) {
-            $tokens = PHP_Token_Stream_CachingFactory::get($this->pathAsString());
-        } else {
-            $tokens = new PHP_Token_Stream($this->pathAsString());
-        }
+        $tokens = new PHP_Token_Stream($this->pathAsString());
 
         $this->linesOfCode = $tokens->getLinesOfCode();