Merge branch '6.4' into 7.0

* 6.4: (31 commits)
  [HttpKernel] Strip exception file paths from log messages
  [Validator] Add ability to validate time without seconds
  [Process] Fix test case
  [Process] Support finding executables independently of open_basedir
  [Mime] Update mimetypes
  Add some PHPDoc
  [Workflow] Add a profiler
  [Form] Removing self-closing slash from `<input>`
  [FrameworkBundle][Serializer] Add TranslatableNormalizer
  [Uid] Fix example
  [HttpKernel] Add `reset()` implementation in DataCollector
  [Uid] Add more PHP doc to "export" functions
  [HttpKernel] RequestPayloadValueResolver Add support for custom http status code
  [Serializer] Add support for seld/jsonlint in order to enhance error messages
  [Workflow] fix MermaidDumper when place contains special char
  [Translation] Phrase translation provider
  [Workflow] Add support for storing the marking in a property
  [Crawler] Fix regression where cdata nodes will return empty string
  [Scheduler] make `ScheduledStamp` "send-able"
  [Serializer] Groups annotation/attribute on class
  ...

Author: nicolas-grekas

CHANGELOG.md

@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Add `RunProcessMessage` and `RunProcessMessageHandler`
+ * Support using `Process::findExecutable()` independently of `open_basedir`
 
 5.2.0
 -----

ExecutableFinder.php

@@ -46,25 +46,10 @@ public function addSuffix(string $suffix): void
      */
     public function find(string $name, string $default = null, array $extraDirs = []): ?string
     {
-        if (\ini_get('open_basedir')) {
-            $searchPath = array_merge(explode(\PATH_SEPARATOR, \ini_get('open_basedir')), $extraDirs);
-            $dirs = [];
-            foreach ($searchPath as $path) {
-                // Silencing against https://bugs.php.net/69240
-                if (@is_dir($path)) {
-                    $dirs[] = $path;
-                } else {
-                    if (basename($path) == $name && @is_executable($path)) {
-                        return $path;
-                    }
-                }
-            }
-        } else {
-            $dirs = array_merge(
-                explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),
-                $extraDirs
-            );
-        }
+        $dirs = array_merge(
+            explode(\PATH_SEPARATOR, getenv('PATH') ?: getenv('Path')),
+            $extraDirs
+        );
 
         $suffixes = [''];
         if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -76,9 +61,18 @@ public function find(string $name, string $default = null, array $extraDirs = []
                 if (@is_file($file = $dir.\DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === \DIRECTORY_SEPARATOR || @is_executable($file))) {
                     return $file;
                 }
+
+                if (!@is_dir($dir) && basename($dir) === $name.$suffix && @is_executable($dir)) {
+                    return $dir;
+                }
             }
         }
 
+        $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v';
+        if (\function_exists('exec') && ($executablePath = strtok(@exec($command.' '.escapeshellarg($name)), \PHP_EOL)) && is_executable($executablePath)) {
+            return $executablePath;
+        }
+
         return $default;
     }
 }

PhpExecutableFinder.php

@@ -34,7 +34,7 @@ public function find(bool $includeArgs = true): string|false
         if ($php = getenv('PHP_BINARY')) {
             if (!is_executable($php)) {
                 $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v';
-                if ($php = strtok(exec($command.' '.escapeshellarg($php)), \PHP_EOL)) {
+                if (\function_exists('exec') && $php = strtok(exec($command.' '.escapeshellarg($php)), \PHP_EOL)) {
                     if (!is_executable($php)) {
                         return false;
                     }

Tests/ErrorProcessInitiator.php

@@ -14,12 +14,12 @@
 use Symfony\Component\Process\Exception\ProcessTimedOutException;
 use Symfony\Component\Process\Process;
 
-require \dirname(__DIR__).'/vendor/autoload.php';
+require is_file(\dirname(__DIR__).'/vendor/autoload.php') ? \dirname(__DIR__).'/vendor/autoload.php' : \dirname(__DIR__, 5).'/vendor/autoload.php';
 
 ['e' => $php] = getopt('e:') + ['e' => 'php'];
 
 try {
-    $process = new Process("exec $php -r \"echo 'ready'; trigger_error('error', E_USER_ERROR);\"");
+    $process = new Process([$php, '-r', "echo 'ready'; trigger_error('error', E_USER_ERROR);"]);
     $process->start();
     $process->setTimeout(0.5);
     while (!str_contains($process->getOutput(), 'ready')) {

Tests/ExecutableFinderTest.php

@@ -19,20 +19,9 @@
  */
 class ExecutableFinderTest extends TestCase
 {
-    private string|false $path = false;
-
     protected function tearDown(): void
     {
-        if ($this->path) {
-            // Restore path if it was changed.
-            putenv('PATH='.$this->path);
-        }
-    }
-
-    private function setPath($path)
-    {
-        $this->path = getenv('PATH');
-        putenv('PATH='.$path);
+        putenv('PATH='.($_SERVER['PATH'] ?? $_SERVER['Path']));
     }
 
     public function testFind()
@@ -41,7 +30,7 @@ public function testFind()
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
-        $this->setPath(\dirname(\PHP_BINARY));
+        putenv('PATH='.\dirname(\PHP_BINARY));
 
         $finder = new ExecutableFinder();
         $result = $finder->find($this->getPhpBinaryName());
@@ -57,7 +46,7 @@ public function testFindWithDefault()
 
         $expected = 'defaultValue';
 
-        $this->setPath('');
+        putenv('PATH=');
 
         $finder = new ExecutableFinder();
         $result = $finder->find('foo', $expected);
@@ -71,7 +60,7 @@ public function testFindWithNullAsDefault()
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
-        $this->setPath('');
+        putenv('PATH=');
 
         $finder = new ExecutableFinder();
 
@@ -86,7 +75,7 @@ public function testFindWithExtraDirs()
             $this->markTestSkipped('Cannot test when open_basedir is set');
         }
 
-        $this->setPath('');
+        putenv('PATH=');
 
         $extraDirs = [\dirname(\PHP_BINARY)];
 
@@ -129,7 +118,6 @@ public function testFindProcessInOpenBasedir()
             $this->markTestSkipped('Cannot run test on windows');
         }
 
-        $this->setPath('');
         $this->iniSet('open_basedir', \PHP_BINARY.\PATH_SEPARATOR.'/');
 
         $finder = new ExecutableFinder();
@@ -154,7 +142,7 @@ public function testFindBatchExecutableOnWindows()
 
         $this->assertFalse(is_executable($target));
 
-        $this->setPath(sys_get_temp_dir());
+        putenv('PATH='.sys_get_temp_dir());
 
         $finder = new ExecutableFinder();
         $result = $finder->find(basename($target), false);

Tests/ProcessTest.php

@@ -1521,6 +1521,10 @@ public function testWaitStoppedDeadProcess()
         $process->setTimeout(2);
         $process->wait();
         $this->assertFalse($process->isRunning());
+
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            $this->assertSame(0, $process->getExitCode());
+        }
     }
 
     public function testEnvCaseInsensitiveOnWindows()