Merge pull request #8419 from johnstevenson/fix-14925

Fix Windows test regression from commit 149250a
main
Jordi Boggiano 5 years ago committed by GitHub
commit 539cebb846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -155,7 +155,7 @@ class ProcessExecutor
//@see https://bugs.php.net/bug.php?id=43784 //@see https://bugs.php.net/bug.php?id=43784
//@see https://bugs.php.net/bug.php?id=49446 //@see https://bugs.php.net/bug.php?id=49446
if ('\\' === DIRECTORY_SEPARATOR) { if ('\\' === DIRECTORY_SEPARATOR) {
if ('' === $argument) { if ((string) $argument === '') {
return escapeshellarg($argument); return escapeshellarg($argument);
} }

@ -734,7 +734,7 @@ composer https://github.com/old/url (push)
$cmd = str_replace('cd ', 'cd /D ', $cmd); $cmd = str_replace('cd ', 'cd /D ', $cmd);
$cmd = str_replace('composerPath', getcwd().'/composerPath', $cmd); $cmd = str_replace('composerPath', getcwd().'/composerPath', $cmd);
return str_replace('""', '', strtr($cmd, "'", '"')); return strtr($cmd, "'", '"');
} }
return $cmd; return $cmd;

Loading…
Cancel
Save