bug #58752 [Process] Fix escaping /X arguments on Windows (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 5865f285ab86 · 2024-11-04T11:59:21.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Process] Fix escaping /X arguments on Windows | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #58733 | License | MIT Commits ------- 16902ec [Process] Fix escaping /X arguments on Windows
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/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/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/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());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1638,7 +1638,7 @@ private function escapeArgument(?string $argument): string`
`1638`	`1638`	`if (str_contains($argument, "\0")) {`
`1639`	`1639`	`$argument = str_replace("\0", '?', $argument);`
`1640`	`1640`	`}`
`1641`		`- if (!preg_match('/[\/()%!^"<>&\|\s]/', $argument)) {`
	`1641`	`+ if (!preg_match('/[()%!^"<>&\|\s]/', $argument)) {`
`1642`	`1642`	`return $argument;`
`1643`	`1643`	`}`
`1644`	`1644`	`$argument = preg_replace('/(\\\\+)$/', '$1$1', $argument);`
Original file line number	Diff line number	Diff line change
`@@ -1424,7 +1424,12 @@ public function testGetCommandLine()`
`1424`	`1424`	`{`
`1425`	`1425`	`$p = new Process(['/usr/bin/php']);`
`1426`	`1426`
`1427`		`- $expected = '\\' === \DIRECTORY_SEPARATOR ? '"/usr/bin/php"' : "'/usr/bin/php'";`
	`1427`	`+ $expected = '\\' === \DIRECTORY_SEPARATOR ? '/usr/bin/php' : "'/usr/bin/php'";`
	`1428`	`+ $this->assertSame($expected, $p->getCommandLine());`
	`1429`	`+`
	`1430`	`+ $p = new Process(['cd', '/d']);`
	`1431`	`+`
	`1432`	`+ $expected = '\\' === \DIRECTORY_SEPARATOR ? 'cd /d' : "'cd' '/d'";`
`1428`	`1433`	`$this->assertSame($expected, $p->getCommandLine());`
`1429`	`1434`	`}`
`1430`	`1435`