Commite8973b5

Amrouche Hamza

committed

[Process] Allow writing portable "prepared" command lines

1 parenta32b130 commite8973b5Copy full SHA for e8973b5

File tree

+31

-1

lines changed

+31

-1

lines changed

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,10 @@ public function start(callable $callback = null, array $env = array())`
`278`	`278`
`279`	`279`	`$options =array('suppress_errors' =>true);`
`280`	`280`
`281`		`-if ('\\' ===DIRECTORY_SEPARATOR) {`
	`281`	`+$windows ='\\' ===DIRECTORY_SEPARATOR;`
	`282`	`+$commandline =$this->replacePlaceholder($commandline,$windows ?array('!','!') :array('$',''));`
	`283`	`+`
	`284`	`+if ($windows) {`
`282`	`285`	`$options['bypass_shell'] =true;`
`283`	`286`	`$commandline =$this->prepareWindowsCommandLine($commandline,$envBackup);`
`284`	`287`	`}elseif (!$this->useFileHandles &&$this->isSigchildEnabled()) {`
`@@ -1562,4 +1565,19 @@ private function escapeArgument($argument)`
`1562`	`1565`
`1563`	`1566`	`return'"'.str_replace(array('"','^','%','!',"\n"),array('""','"^^"','"^%"','"^!"','!LF!'),$argument).'"';`
`1564`	`1567`	`}`
	`1568`	`+`
	`1569`	`+privatefunctionreplacePlaceholder($commandLine,$toReplace)`
	`1570`	`+ {`
	`1571`	`+if (!preg_match_all('/\{([a-zA-Z0-9]+?)\}/',$commandLine,$matches)) {`
	`1572`	`+return$commandLine;`
	`1573`	`+ }`
	`1574`	`+`
	`1575`	`+$patterns =$replacements =array();`
	`1576`	`+foreach ($matchesas$match) {`
	`1577`	`+$patterns[] =sprintf('/{%s}/',$match[0]);`
	`1578`	`+$replacements[] =sprintf('%s%s%s',$toReplace[0],$match[0],$toReplace[1]);`
	`1579`	`+`
	`1580`	`+ }`
	`1581`	`+returnpreg_replace($patterns,$replacements,$commandLine);`
	`1582`	`+ }`
`1565`	`1583`	`}`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1470,6 +1470,18 @@ public function provideEscapeArgument()`
`1470`	`1470`	`yieldarray('éÉèÈàÀöä');`
`1471`	`1471`	`}`
`1472`	`1472`
	`1473`	`+publicfunctiontestWithPreparedCommand()`
	`1474`	`+ {`
	`1475`	`+$p =newProcess('echo {abc}');`
	`1476`	`+$p->run(null,array('abc' =>'ABC'));`
	`1477`	`+`
	`1478`	`+$expected =<<<EOTXT`
	`1479`	`+ABC`
	`1480`	`+`
	`1481`	`+EOTXT;`
	`1482`	`+$this->assertSame($expected,$p->getOutput());`
	`1483`	`+ }`
	`1484`	`+`
`1473`	`1485`	`publicfunctiontestEnvArgument()`
`1474`	`1486`	`{`
`1475`	`1487`	`$env =array('FOO' =>'Foo','BAR' =>'Bar');`

Comments

(0)