Remove PHP_Token_Stream parameter from RawCodeCoverageData::fromUncoveredFile()

Author: sebastianbergmann

src/CodeCoverage.php

@@ -22,8 +22,6 @@
 use function get_class;
 use function is_array;
 use function sort;
-use PHP_Token_Stream;
-use PHP_Token_Stream_CachingFactory;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Runner\PhptTestCase;
 use PHPUnit\Util\Test;
@@ -498,13 +496,7 @@ private function addUncoveredFilesFromFilter(): void
 
         foreach ($uncoveredFiles as $uncoveredFile) {
             if (file_exists($uncoveredFile)) {
-                if ($this->cacheTokens) {
-                    $tokens = PHP_Token_Stream_CachingFactory::get($uncoveredFile);
-                } else {
-                    $tokens = new PHP_Token_Stream($uncoveredFile);
-                }
-
-                $this->append(RawCodeCoverageData::fromUncoveredFile($uncoveredFile, $tokens), self::UNCOVERED_FILES);
+                $this->append(RawCodeCoverageData::fromUncoveredFile($uncoveredFile), self::UNCOVERED_FILES);
             }
         }
     }

src/RawCodeCoverageData.php

@@ -100,8 +100,9 @@ public static function fromXdebugWithMixedCoverage(array $rawCoverage): self
         return new self($lineCoverage, $functionCoverage);
     }
 
-    public static function fromUncoveredFile(string $filename, PHP_Token_Stream $tokens): self
+    public static function fromUncoveredFile(string $filename): self
     {
+        $tokens       = new PHP_Token_Stream($filename);
         $lineCoverage = [];
 
         $lines     = file($filename);

tests/tests/RawCodeCoverageDataTest.php

@@ -10,7 +10,6 @@
 namespace SebastianBergmann\CodeCoverage;
 
 use function array_keys;
-use PHP_Token_Stream;
 
 final class RawCodeCoverageDataTest extends TestCase
 {
@@ -264,8 +263,7 @@ public function testRemoveCoverageDataForLines(): void
 
     public function testUseStatementsAreUncovered(): void
     {
-        $file   = TEST_FILES_PATH . 'source_with_use_statements.php';
-        $tokens = new PHP_Token_Stream($file);
+        $file = TEST_FILES_PATH . 'source_with_use_statements.php';
 
         $this->assertEquals(
             [
@@ -280,28 +278,26 @@ public function testUseStatementsAreUncovered(): void
                 21,
                 22,
             ],
-            array_keys(RawCodeCoverageData::fromUncoveredFile($file, $tokens)->lineCoverage()[$file])
+            array_keys(RawCodeCoverageData::fromUncoveredFile($file)->lineCoverage()[$file])
         );
     }
 
     public function testEmptyClassesAreUncovered(): void
     {
-        $file   = TEST_FILES_PATH . 'source_with_empty_class.php';
-        $tokens = new PHP_Token_Stream($file);
+        $file = TEST_FILES_PATH . 'source_with_empty_class.php';
 
         $this->assertEquals(
             [
                 12,
                 14,
             ],
-            array_keys(RawCodeCoverageData::fromUncoveredFile($file, $tokens)->lineCoverage()[$file])
+            array_keys(RawCodeCoverageData::fromUncoveredFile($file)->lineCoverage()[$file])
         );
     }
 
     public function testInterfacesAreUncovered(): void
     {
-        $file   = TEST_FILES_PATH . 'source_with_interface.php';
-        $tokens = new PHP_Token_Stream($file);
+        $file = TEST_FILES_PATH . 'source_with_interface.php';
 
         $this->assertEquals(
             [
@@ -316,14 +312,13 @@ public function testInterfacesAreUncovered(): void
                 16,
                 17,
             ],
-            array_keys(RawCodeCoverageData::fromUncoveredFile($file, $tokens)->lineCoverage()[$file])
+            array_keys(RawCodeCoverageData::fromUncoveredFile($file)->lineCoverage()[$file])
         );
     }
 
     public function testInlineCommentsKeepTheLine(): void
     {
-        $file   = TEST_FILES_PATH . 'source_with_oneline_annotations.php';
-        $tokens = new PHP_Token_Stream($file);
+        $file = TEST_FILES_PATH . 'source_with_oneline_annotations.php';
 
         $this->assertEquals(
             [
@@ -340,7 +335,7 @@ public function testInlineCommentsKeepTheLine(): void
                 35,
                 36,
             ],
-            array_keys(RawCodeCoverageData::fromUncoveredFile($file, $tokens)->lineCoverage()[$file])
+            array_keys(RawCodeCoverageData::fromUncoveredFile($file)->lineCoverage()[$file])
         );
     }