Merge branch '3.4' into 4.4

fabpot · fabpot · commit a7fc347f104c · 2020-04-12T16:39:55.000+02:00
* 3.4:
  Tweak the code to avoid fabbot false positives
diff --git a/Command/ServerLogCommand.php b/Command/ServerLogCommand.php
@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         if (!$socket = stream_socket_server($host, $errno, $errstr)) {
-            throw new RuntimeException(sprintf('Server start failed on "%s": %s %s.', $host, $errstr, $errno));
+            throw new RuntimeException(sprintf('Server start failed on "%s": '.$errstr.' '.$errno, $host));
         }
 
         foreach ($this->getLogs($socket) as $clientId => $message) {

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`if (!$socket = stream_socket_server($host, $errno, $errstr)) {`
`109`		`- throw new RuntimeException(sprintf('Server start failed on "%s": %s %s.', $host, $errstr, $errno));`
	`109`	`+ throw new RuntimeException(sprintf('Server start failed on "%s": '.$errstr.' '.$errno, $host));`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`foreach ($this->getLogs($socket) as $clientId => $message) {`