[Process] Fix escaping /X arguments on Windows

symfony · Nov 4, 2024 · d94dda5 · d94dda5
1 parent 72baf6b
commit d94dda5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Process.php b/Process.php
@@ -1638,7  1638,7 @@ private function escapeArgument(?string $argument): string
         if (str_contains($argument, "\0")) {
             $argument = str_replace("\0", '?', $argument);
         }
-        if (!preg_match('/[\/()%!^"<>&|\s]/', $argument)) {
         if (!preg_match('/[()%!^"<>&|\s]/', $argument)) {
             return $argument;
         }
         $argument = preg_replace('/(\\\\ )$/', '$1$1', $argument);

diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
@@ -1424,7  1424,12 @@ public function testGetCommandLine()
     {
         $p = new Process(['/usr/bin/php']);
 
-        $expected = '\\' === \DIRECTORY_SEPARATOR ? '"/usr/bin/php"' : "'/usr/bin/php'";
         $expected = '\\' === \DIRECTORY_SEPARATOR ? '/usr/bin/php' : "'/usr/bin/php'";
         $this->assertSame($expected, $p->getCommandLine());
 
         $p = new Process(['cd', '/d']);
 
         $expected = '\\' === \DIRECTORY_SEPARATOR ? 'cd /d' : "'cd' '/d'";
         $this->assertSame($expected, $p->getCommandLine());
     }