[Process] ExecutableFinder::addSuffix() has no effect

Author: TravisCarden

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))) {

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
      */

Tests/Fixtures/executable_with_added_suffix.foo

@@ -0,0 +1 @@
+See \Symfony\Component\Process\Tests\ExecutableFinderTest::testFindWithAddedSuffixes()

Tests/Fixtures/executable_without_suffix

@@ -0,0 +1 @@
+See \Symfony\Component\Process\Tests\ExecutableFinderTest::testFindWithoutSuffix()