CodeCoverage: support Xdebug 3 (#424)

nette · Dec 3, 2020 · 652853e · 652853e
1 parent 10a9b57
commit 652853e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Runner/CliTester.php b/src/Runner/CliTester.php
@@ -236,11 +236,15 @@ private function prepareCodeCoverage(Runner $runner): string
 		file_put_contents($this->options['--coverage'], '');
 		$file = realpath($this->options['--coverage']);
 
-		[$engine] = reset($engines);
+		[$engine, $version] = reset($engines);
 
 		$runner->setEnvironmentVariable(Environment::COVERAGE, $file);
 		$runner->setEnvironmentVariable(Environment::COVERAGE_ENGINE, $engine);
 
+		if ($engine === CodeCoverage\Collector::ENGINE_XDEBUG && version_compare($version, '3.0.0', '>=')) {
+			$runner->addPhpIniOption('xdebug.mode', ltrim(ini_get('xdebug.mode') . ',coverage', ','));
+		}
+
 		if ($engine === CodeCoverage\Collector::ENGINE_PCOV && count($this->options['--coverage-src'])) {
 			$runner->addPhpIniOption('pcov.directory', Helpers::findCommonDirectory($this->options['--coverage-src']));
 		}

diff --git a/tests/CodeCoverage/Collector.phpt b/tests/CodeCoverage/Collector.phpt
@@ -16,7 +16,14 @@ $engines = array_filter(CodeCoverage\Collector::detectEngines(), function (array
 if (count($engines) < 1) {
 	Tester\Environment::skip('Requires Xdebug or PHPDB SAPI.');
 }
-[$engine] = reset($engines);
+[$engine, $version] = reset($engines);
+
+if ($engine === CodeCoverage\Collector::ENGINE_XDEBUG
+	&& version_compare($version, '3.0.0', '>=')
+	&& strpos(ini_get('xdebug.mode'), 'coverage') === false
+) {
+	Tester\Environment::skip('Requires xdebug.mode=coverage with Xdebug 3.');
+}
 
 if (CodeCoverage\Collector::isStarted()) {
 	Tester\Environment::skip('Requires running without --coverage.');