run tests with PHPUnit 12.1 on PHP >= 8.3

xabbuh · xabbuh · commit 934d11ba3eeb · 2025-08-04T22:39:36.000+02:00
diff --git a/phpunit b/phpunit
@@ -7,7 +7,7 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
 }
 if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
     if (\PHP_VERSION_ID >= 80300) {
-        putenv('SYMFONY_PHPUNIT_VERSION=12.0');
+        putenv('SYMFONY_PHPUNIT_VERSION=12.1');
     } else {
         putenv('SYMFONY_PHPUNIT_VERSION=11.5');
     }
diff --git a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Process\ExecutableFinder;
+use Symfony\Component\Process\Process;
 
 /**
  * @author Chris Smith <chris@cs278.org>
@@ -122,17 +123,11 @@ public function testFindWithOpenBaseDir()
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
-        putenv('PATH='.\dirname(\PHP_BINARY));
-        $initialOpenBaseDir = ini_set('open_basedir', \dirname(\PHP_BINARY).\PATH_SEPARATOR.'/');
-
-        try {
-            $finder = new ExecutableFinder();
-            $result = $finder->find($this->getPhpBinaryName());
+        $process = new Process([\PHP_BINARY, '-d', 'open_basedir='.\dirname(\PHP_BINARY).\PATH_SEPARATOR.'/', __DIR__.'/Fixtures/open_basedir.php']);
+        $process->run();
+        $result = $process->getOutput();
 
-            $this->assertSamePath(\PHP_BINARY, $result);
-        } finally {
-            ini_set('open_basedir', $initialOpenBaseDir);
-        }
+        $this->assertSamePath(\PHP_BINARY, $result);
     }
 
     #[RunInSeparateProcess]
diff --git a/src/Symfony/Component/Process/Tests/Fixtures/open_basedir.php b/src/Symfony/Component/Process/Tests/Fixtures/open_basedir.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once __DIR__.'/../../ExecutableFinder.php';
+
+use Symfony\Component\Process\ExecutableFinder;
+
+putenv('PATH='.dirname(PHP_BINARY));
+
+function getPhpBinaryName(): string
+{
+    return basename(PHP_BINARY, '\\' === DIRECTORY_SEPARATOR ? '.exe' : '');
+}
+
+echo (new ExecutableFinder())->find(getPhpBinaryName());

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {`
`7`	`7`	`}`
`8`	`8`	`if (!getenv('SYMFONY_PHPUNIT_VERSION')) {`
`9`	`9`	`if (\PHP_VERSION_ID >= 80300) {`
`10`		`- putenv('SYMFONY_PHPUNIT_VERSION=12.0');`
	`10`	`+ putenv('SYMFONY_PHPUNIT_VERSION=12.1');`
`11`	`11`	`} else {`
`12`	`12`	`putenv('SYMFONY_PHPUNIT_VERSION=11.5');`
`13`	`13`	`}`