Commite394597

committed

[Process] Fixed issue between process builder and exec

1 parente8b9e25 commite394597Copy full SHA for e394597

File tree

+15

-0

lines changed

+15

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,9 @@ public function getProcess()`
`272`	`272`
`273`	`273`	`$arguments =array_merge($this->prefix,$this->arguments);`
`274`	`274`	`$process =newProcess($arguments,$this->cwd,$this->env,$this->input,$this->timeout,$this->options);`
	`275`	`+// to preserve the BC with symfony <3.3, we convert the array structure`
	`276`	`+// to a string structure to avoid the prefixing with the exec binary`
	`277`	`+$process->setCommandLine($process->getCommandLine());`
`275`	`278`
`276`	`279`	`if ($this->inheritEnv) {`
`277`	`280`	`$process->inheritEnvironmentVariables();`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -210,4 +210,16 @@ public function testInvalidInput()`
`210`	`210`	`$builder = ProcessBuilder::create();`
`211`	`211`	`$builder->setInput(array());`
`212`	`212`	`}`
	`213`	`+`
	`214`	`+publicfunctiontestDoesNotPrefixExec()`
	`215`	`+ {`
	`216`	`+$builder = ProcessBuilder::create(array('a','b'));`
	`217`	`+$process =$builder->getProcess();`
	`218`	`+`
	`219`	`+$r =new \ReflectionObject($process);`
	`220`	`+$p =$r->getProperty('commandline');`
	`221`	`+$p->setAccessible(true);`
	`222`	`+`
	`223`	`+$this->assertSame("'a' 'b'",$p->getValue($process));`
	`224`	`+ }`
`213`	`225`	`}`

Comments

(0)