Fixing PHP standalone webserver for Travis

Michael Fero · Michael Fero · commit a1f8187cfc3d · 2015-09-09T21:25:04.000Z
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -304,9 +304,9 @@ private function execute(array $env = array())
     private function startWebServer()
     {
         $this->webServerURL = 'http://127.0.0.1:10000';
-        $command = sprintf('%s -S "%s"', $this->phpBin, '127.0.0.1:10000');
-        if (!strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            $command = 'exec' . $command;
+        $command = sprintf('exec %s -S "%s"', $this->phpBin, '127.0.0.1:10000');
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            $command = sprintf('%s -S "%s"', $this->phpBin, '127.0.0.1:10000');
         }
         if ($this->phpBinOptions) {
             $command = sprintf("%s %s", $command, $this->phpBinOptions);

Original file line number	Diff line number	Diff line change
`@@ -304,9 +304,9 @@ private function execute(array $env = array())`
`304`	`304`	`private function startWebServer()`
`305`	`305`	`{`
`306`	`306`	`$this->webServerURL = 'http://127.0.0.1:10000';`
`307`		`- $command = sprintf('%s -S "%s"', $this->phpBin, '127.0.0.1:10000');`
`308`		`- if (!strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {`
`309`		`- $command = 'exec' . $command;`
	`307`	`+ $command = sprintf('exec %s -S "%s"', $this->phpBin, '127.0.0.1:10000');`
	`308`	`+ if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {`
	`309`	`+ $command = sprintf('%s -S "%s"', $this->phpBin, '127.0.0.1:10000');`
`310`	`310`	`}`
`311`	`311`	`if ($this->phpBinOptions) {`
`312`	`312`	`$command = sprintf("%s %s", $command, $this->phpBinOptions);`