Pass code coverage static analysis cache configuration to PHP processes that run TestCase tests in isolation

Author: sebastianbergmann

src/Framework/TestCase.php

@@ -805,30 +805,39 @@ public function run(TestResult $result = null): TestResult
                 $phar = '\'\'';
             }
 
-            $codeCoverage       = $result->getCodeCoverage();
-            $codeCoverageFilter = null;
-            $driverMethod       = 'forLineCoverage';
+            $codeCoverage               = $result->getCodeCoverage();
+            $codeCoverageFilter         = null;
+            $cachesStaticAnalysis       = 'false';
+            $codeCoverageCacheDirectory = null;
+            $driverMethod               = 'forLineCoverage';
 
             if ($codeCoverage) {
                 $codeCoverageFilter = $codeCoverage->filter();
 
                 if ($codeCoverage->collectsBranchAndPathCoverage()) {
                     $driverMethod = 'forLineAndPathCoverage';
                 }
+
+                if ($codeCoverage->cachesStaticAnalysis()) {
+                    $cachesStaticAnalysis       = 'true';
+                    $codeCoverageCacheDirectory = $codeCoverage->cacheDirectory();
+                }
             }
 
-            $data               = var_export(serialize($this->data), true);
-            $dataName           = var_export($this->dataName, true);
-            $dependencyInput    = var_export(serialize($this->dependencyInput), true);
-            $includePath        = var_export(get_include_path(), true);
-            $codeCoverageFilter = var_export(serialize($codeCoverageFilter), true);
+            $data                       = var_export(serialize($this->data), true);
+            $dataName                   = var_export($this->dataName, true);
+            $dependencyInput            = var_export(serialize($this->dependencyInput), true);
+            $includePath                = var_export(get_include_path(), true);
+            $codeCoverageFilter         = var_export(serialize($codeCoverageFilter), true);
+            $codeCoverageCacheDirectory = var_export(serialize($codeCoverageCacheDirectory), true);
             // must do these fixes because TestCaseMethod.tpl has unserialize('{data}') in it, and we can't break BC
             // the lines above used to use addcslashes() rather than var_export(), which breaks null byte escape sequences
-            $data               = "'." . $data . ".'";
-            $dataName           = "'.(" . $dataName . ").'";
-            $dependencyInput    = "'." . $dependencyInput . ".'";
-            $includePath        = "'." . $includePath . ".'";
-            $codeCoverageFilter = "'." . $codeCoverageFilter . ".'";
+            $data                       = "'." . $data . ".'";
+            $dataName                   = "'.(" . $dataName . ").'";
+            $dependencyInput            = "'." . $dependencyInput . ".'";
+            $includePath                = "'." . $includePath . ".'";
+            $codeCoverageFilter         = "'." . $codeCoverageFilter . ".'";
+            $codeCoverageCacheDirectory = "'." . $codeCoverageCacheDirectory . ".'";
 
             $configurationFilePath = $GLOBALS['__PHPUNIT_CONFIGURATION_FILE'] ?? '';
 
@@ -838,6 +847,8 @@ public function run(TestResult $result = null): TestResult
                 'filename'                                   => $class->getFileName(),
                 'className'                                  => $class->getName(),
                 'collectCodeCoverageInformation'             => $coverage,
+                'cachesStaticAnalysis'                       => $cachesStaticAnalysis,
+                'codeCoverageCacheDirectory'                 => $codeCoverageCacheDirectory,
                 'driverMethod'                               => $driverMethod,
                 'data'                                       => $data,
                 'dataName'                                   => $dataName,

src/Util/PHP/Template/TestCaseClass.tpl

@@ -38,12 +38,16 @@ function __phpunit_run_isolated_test()
     if ({collectCodeCoverageInformation}) {
         $filter = unserialize('{codeCoverageFilter}');
 
-        $result->setCodeCoverage(
-            new CodeCoverage(
-                Driver::{driverMethod}($filter),
-                $filter
-            )
+        $codeCoverage = new CodeCoverage(
+            Driver::{driverMethod}($filter),
+            $filter
         );
+
+        if ({cachesStaticAnalysis}) {
+            $codeCoverage->cacheStaticAnalysis(unserialize('{codeCoverageCacheDirectory}'));
+        }
+
+        $result->setCodeCoverage($codeCoverage);
     }
 
     $result->beStrictAboutTestsThatDoNotTestAnything({isStrictAboutTestsThatDoNotTestAnything});

src/Util/PHP/Template/TestCaseMethod.tpl

@@ -39,12 +39,16 @@ function __phpunit_run_isolated_test()
     if ({collectCodeCoverageInformation}) {
         $filter = unserialize('{codeCoverageFilter}');
 
-        $result->setCodeCoverage(
-            new CodeCoverage(
-                Driver::{driverMethod}($filter),
-                $filter
-            )
+        $codeCoverage = new CodeCoverage(
+            Driver::{driverMethod}($filter),
+            $filter
         );
+
+        if ({cachesStaticAnalysis}) {
+            $codeCoverage->cacheStaticAnalysis(unserialize('{codeCoverageCacheDirectory}'));
+        }
+
+        $result->setCodeCoverage($codeCoverage);
     }
 
     $result->beStrictAboutTestsThatDoNotTestAnything({isStrictAboutTestsThatDoNotTestAnything});