bug symfony#25624 [WebServerBundle] Fix escaping of php binary with arguments (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit f20515a6c23d · 2017-12-29T21:41:06.000+01:00
This PR was merged into the 3.3 branch. Discussion ---------- [WebServerBundle] Fix escaping of php binary with arguments | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Not really needed in practice, yet more correct, and will open some improvements in PhpExecutableFinder for master. Commits ------- 6629ae5 [WebServerBundle] Fix escaping of php binary with arguments
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServer.php b/src/Symfony/Bundle/WebServerBundle/WebServer.php
@@ -146,11 +146,11 @@ public function isRunning($pidFile = null)
     private function createServerProcess(WebServerConfig $config)
     {
         $finder = new PhpExecutableFinder();
-        if (false === $binary = $finder->find()) {
+        if (false === $binary = $finder->find(false)) {
             throw new \RuntimeException('Unable to find the PHP binary.');
         }
 
-        $process = new Process(array($binary, '-dvariables_order=EGPCS', '-S', $config->getAddress(), $config->getRouter()));
+        $process = new Process(array_merge(array($binary), $finder->findArguments(), array('-dvariables_order=EGPCS', '-S', $config->getAddress(), $config->getRouter())));
         $process->setWorkingDirectory($config->getDocumentRoot());
         $process->setTimeout(null);
 

Original file line number	Diff line number	Diff line change
`@@ -146,11 +146,11 @@ public function isRunning($pidFile = null)`
`146`	`146`	`private function createServerProcess(WebServerConfig $config)`
`147`	`147`	`{`
`148`	`148`	`$finder = new PhpExecutableFinder();`
`149`		`- if (false === $binary = $finder->find()) {`
	`149`	`+ if (false === $binary = $finder->find(false)) {`
`150`	`150`	`throw new \RuntimeException('Unable to find the PHP binary.');`
`151`	`151`	`}`
`152`	`152`
`153`		`- $process = new Process(array($binary, '-dvariables_order=EGPCS', '-S', $config->getAddress(), $config->getRouter()));`
	`153`	`+ $process = new Process(array_merge(array($binary), $finder->findArguments(), array('-dvariables_order=EGPCS', '-S', $config->getAddress(), $config->getRouter())));`
`154`	`154`	`$process->setWorkingDirectory($config->getDocumentRoot());`
`155`	`155`	`$process->setTimeout(null);`
`156`	`156`