Merge branch '12.5'

* 12.5:
  Closes #6446
  Do not set xdebug.mode=off for PHPT process when PHPT file has --INI-- section with xdebug.mode
  Exclude src/autoload.php
  Revert "Load Xdebug for end-to-end tests"
  Load Xdebug for end-to-end tests
  Add test

Author: sebastianbergmann

src/Runner/CodeCoverage.php

@@ -213,9 +213,9 @@ public function stop(bool $append, null|false|TargetCollection $covers = null, ?
             return;
         }
 
-        $time = $this->timer()->stop()->asSeconds();
-
-        $status = TestStatus::unknown();
+        $time             = $this->timer()->stop()->asSeconds();
+        $status           = TestStatus::unknown();
+        $this->collecting = false;
 
         if ($this->test !== null) {
             if ($this->test->status()->isSuccess()) {
@@ -257,8 +257,7 @@ public function stop(bool $append, null|false|TargetCollection $covers = null, ?
 
         $this->codeCoverage->stop($append, $status, $covers, $uses, $time);
 
-        $this->test       = null;
-        $this->collecting = false;
+        $this->test = null;
     }
 
     public function deactivate(): void

src/Util/PHP/DefaultJobRunner.php

@@ -24,6 +24,7 @@
 use function is_resource;
 use function proc_close;
 use function proc_open;
+use function str_starts_with;
 use function stream_get_contents;
 use function sys_get_temp_dir;
 use function tempnam;
@@ -169,6 +170,16 @@ private function buildCommand(Job $job, ?string $file): array
         $command     = [PHP_BINARY];
         $phpSettings = $job->phpSettings();
 
+        $xdebugModeConfiguredExplicitly = false;
+
+        foreach ($phpSettings as $phpSetting) {
+            if (str_starts_with($phpSetting, 'xdebug.mode')) {
+                $xdebugModeConfiguredExplicitly = true;
+
+                break;
+            }
+        }
+
         if ($runtime->hasPCOV()) {
             $pcovSettings = ini_get_all('pcov');
 
@@ -195,6 +206,7 @@ private function buildCommand(Job $job, ?string $file): array
             );
 
             if (
+                !$xdebugModeConfiguredExplicitly &&
                 !CodeCoverage::instance()->isActive() &&
                 xdebug_is_debugger_active() === false &&
                 !$job->requiresXdebug()

tests/end-to-end/event/_files/test-risky-code-coverage/phpunit.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="../../../../../phpunit.xsd"
+         bootstrap="src/autoload.php"
+         beStrictAboutCoverageMetadata="true">
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <source>
+        <include>
+            <directory>src</directory>
+        </include>
+
+        <exclude>
+            <file>src/autoload.php</file>
+        </exclude>
+    </source>
+</phpunit>

tests/end-to-end/event/_files/test-risky-code-coverage/src/Bar.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Event\RiskyCodeCoverage;
+
+final class Bar
+{
+    public function doSomethingElse(): bool
+    {
+        return true;
+    }
+}

tests/end-to-end/event/_files/test-risky-code-coverage/src/Foo.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Event\RiskyCodeCoverage;
+
+final class Foo
+{
+    public function doSomething(): bool
+    {
+        return (new Bar)->doSomethingElse();
+    }
+}

tests/end-to-end/event/_files/test-risky-code-coverage/src/autoload.php

@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Event\RiskyCodeCoverage;
+
+require __DIR__ . '/Foo.php';
+
+require __DIR__ . '/Bar.php';

tests/end-to-end/event/_files/test-risky-code-coverage/tests/FooTest.php

@@ -0,0 +1,22 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Event\RiskyCodeCoverage;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\TestCase;
+
+#[CoversClass(Foo::class)]
+final class FooTest extends TestCase
+{
+    public function testSomething(): void
+    {
+        $this->assertTrue((new Foo)->doSomething());
+    }
+}

tests/end-to-end/event/risky-code-coverage.phpt

@@ -0,0 +1,48 @@
+--TEST--
+The right events are emitted in the right order for a test that is considered risky because it executed code that is not listed as code to be covered or used
+--SKIPIF--
+<?php declare(strict_types=1);
+if (!extension_loaded('xdebug')) {
+    print 'skip: Extension Xdebug must be loaded.';
+}
+--INI--
+xdebug.mode=coverage
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = '--coverage-text';
+$_SERVER['argv'][] = '--configuration';
+$_SERVER['argv'][] = __DIR__ . '/_files/test-risky-code-coverage';
+
+require __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit Started (PHPUnit %s using %s)
+Test Runner Configured
+Bootstrap Finished (%sautoload.php)
+Event Facade Sealed
+Test Suite Loaded (1 test)
+Static Analysis for Code Coverage Started
+Static Analysis for Code Coverage Finished (%d cache hits, %d cache misses)
+Test Runner Started
+Test Suite Sorted
+Test Runner Execution Started (1 test)
+Test Suite Started (%sphpunit.xml, 1 test)
+Test Suite Started (default, 1 test)
+Test Suite Started (PHPUnit\TestFixture\Event\RiskyCodeCoverage\FooTest, 1 test)
+Test Preparation Started (PHPUnit\TestFixture\Event\RiskyCodeCoverage\FooTest::testSomething)
+Test Prepared (PHPUnit\TestFixture\Event\RiskyCodeCoverage\FooTest::testSomething)
+Test Passed (PHPUnit\TestFixture\Event\RiskyCodeCoverage\FooTest::testSomething)
+Test Considered Risky (PHPUnit\TestFixture\Event\RiskyCodeCoverage\FooTest::testSomething)
+This test executed code that is not listed as code to be covered or used:
+- PHPUnit\TestFixture\Event\RiskyCodeCoverage\Bar
+
+Test Finished (PHPUnit\TestFixture\Event\RiskyCodeCoverage\FooTest::testSomething)
+Test Suite Finished (PHPUnit\TestFixture\Event\RiskyCodeCoverage\FooTest, 1 test)
+Test Suite Finished (default, 1 test)
+Test Suite Finished (%sphpunit.xml, 1 test)
+Test Runner Execution Finished
+Test Runner Finished
+PHPUnit Finished (Shell Exit Code: 0)