Merge pull request #358 from FriendsOfSymfony/fix-build

dbu · web-flow · commit 795b769e1c42 · 2017-06-10T19:29:38.000+02:00
make travis build more robust
diff --git a/src/Test/Proxy/NginxProxy.php b/src/Test/Proxy/NginxProxy.php
@@ -52,7 +52,7 @@ public function start()
     public function stop()
     {
         if (file_exists($this->pid)) {
-            $this->runCommand('kill', [file_get_contents($this->pid)]);
+            $this->runCommand('kill', [trim(file_get_contents($this->pid))]);
         }
     }
 
diff --git a/src/Test/Proxy/VarnishProxy.php b/src/Test/Proxy/VarnishProxy.php
@@ -67,7 +67,7 @@ public function stop()
     {
         if (file_exists($this->pid)) {
             try {
-                $this->runCommand('kill', ['-9', file_get_contents($this->pid)]);
+                $this->runCommand('kill', ['-9', trim(file_get_contents($this->pid))]);
             } catch (\RuntimeException $e) {
                 // Ignore if command fails when Varnish wasn't running
             }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function start()`
`52`	`52`	`public function stop()`
`53`	`53`	`{`
`54`	`54`	`if (file_exists($this->pid)) {`
`55`		`- $this->runCommand('kill', [file_get_contents($this->pid)]);`
	`55`	`+ $this->runCommand('kill', [trim(file_get_contents($this->pid))]);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function stop()`
`67`	`67`	`{`
`68`	`68`	`if (file_exists($this->pid)) {`
`69`	`69`	`try {`
`70`		`- $this->runCommand('kill', ['-9', file_get_contents($this->pid)]);`
	`70`	`+ $this->runCommand('kill', ['-9', trim(file_get_contents($this->pid))]);`
`71`	`71`	`} catch (\RuntimeException $e) {`
`72`	`72`	`// Ignore if command fails when Varnish wasn't running`
`73`	`73`	`}`