From d854b76a089056ebf21e6594cac67f60b0148441 Mon Sep 17 00:00:00 2001
From: Travis Carden <travis.carden@gmail.com>
Date: Tue, 21 Nov 2023 18:24:14 -0500
Subject: [PATCH] [Process] `ExecutableFinder::addSuffix()` has no effect

---
 .../Component/Process/ExecutableFinder.php    | 21 ++++++++++++----
 .../Process/Tests/ExecutableFinderTest.php    | 25 +++++++++++++++++++
 .../Fixtures/executable_with_added_suffix.foo |  1 +
 .../Tests/Fixtures/executable_without_suffix  |  1 +
 4 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100755 src/Symfony/Component/Process/Tests/Fixtures/executable_with_added_suffix.foo
 create mode 100755 src/Symfony/Component/Process/Tests/Fixtures/executable_without_suffix

diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
index ceb7a55880a06..9ab99606aeff8 100644
--- a/src/Symfony/Component/Process/ExecutableFinder.php
+++ b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -19,7 +19,15 @@
  */
 class ExecutableFinder
 {
-    private array $suffixes = ['.exe', '.bat', '.cmd', '.com'];
+    private array $suffixes = [];
+
+    public function __construct()
+    {
+        // Set common extensions on Windows.
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->suffixes = ['.exe', '.bat', '.cmd', '.com'];
+        }
+    }
 
     /**
      * Replaces default suffixes of executable.
@@ -30,7 +38,10 @@ public function setSuffixes(array $suffixes): void
     }
 
     /**
-     * Adds new possible suffix to check for executable.
+     * Adds new possible suffix to check for executable, including the dot (.).
+     *
+     *     $finder = new ExecutableFinder();
+     *     $finder->addSuffix('.foo');
      */
     public function addSuffix(string $suffix): void
     {
@@ -52,10 +63,10 @@ public function find(string $name, ?string $default = null, array $extraDirs = [
         );
 
         $suffixes = [''];
-        if ('\\' === \DIRECTORY_SEPARATOR) {
-            $pathExt = getenv('PATHEXT');
-            $suffixes = array_merge($pathExt ? explode(\PATH_SEPARATOR, $pathExt) : $this->suffixes, $suffixes);
+        if ('\\' === \DIRECTORY_SEPARATOR && $pathExt = getenv('PATHEXT')) {
+            $suffixes = array_merge(explode(\PATH_SEPARATOR, $pathExt), $suffixes);
         }
+        $suffixes = array_merge($suffixes, $this->suffixes);
         foreach ($suffixes as $suffix) {
             foreach ($dirs as $dir) {
                 if (@is_file($file = $dir.\DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === \DIRECTORY_SEPARATOR || @is_executable($file))) {
diff --git a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
index a1b8d6d54b940..56cb3d51a5c7f 100644
--- a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
+++ b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
@@ -85,6 +85,31 @@ public function testFindWithExtraDirs()
         $this->assertSamePath(\PHP_BINARY, $result);
     }
 
+    public function testFindWithoutSuffix()
+    {
+        $fixturesDir = __DIR__.\DIRECTORY_SEPARATOR.'Fixtures';
+        $name = 'executable_without_suffix';
+
+        $finder = new ExecutableFinder();
+        $result = $finder->find($name, null, [$fixturesDir]);
+
+        $this->assertSamePath($fixturesDir.\DIRECTORY_SEPARATOR.$name, $result);
+    }
+
+    public function testFindWithAddedSuffixes()
+    {
+        $fixturesDir = __DIR__.\DIRECTORY_SEPARATOR.'Fixtures';
+        $name = 'executable_with_added_suffix';
+        $suffix = '.foo';
+
+        $finder = new ExecutableFinder();
+        $finder->addSuffix($suffix);
+
+        $result = $finder->find($name, null, [$fixturesDir]);
+
+        $this->assertSamePath($fixturesDir.\DIRECTORY_SEPARATOR.$name.$suffix, $result);
+    }
+
     /**
      * @runInSeparateProcess
      */
diff --git a/src/Symfony/Component/Process/Tests/Fixtures/executable_with_added_suffix.foo b/src/Symfony/Component/Process/Tests/Fixtures/executable_with_added_suffix.foo
new file mode 100755
index 0000000000000..471a493a7720f
--- /dev/null
+++ b/src/Symfony/Component/Process/Tests/Fixtures/executable_with_added_suffix.foo
@@ -0,0 +1 @@
+See \Symfony\Component\Process\Tests\ExecutableFinderTest::testFindWithAddedSuffixes()
diff --git a/src/Symfony/Component/Process/Tests/Fixtures/executable_without_suffix b/src/Symfony/Component/Process/Tests/Fixtures/executable_without_suffix
new file mode 100755
index 0000000000000..9bf8b4db7c4fa
--- /dev/null
+++ b/src/Symfony/Component/Process/Tests/Fixtures/executable_without_suffix
@@ -0,0 +1 @@
+See \Symfony\Component\Process\Tests\ExecutableFinderTest::testFindWithoutSuffix()