Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 56b3aa5eab0a · 2020-05-30T22:06:45.000+02:00
* 3.4:
  Various cleanups
diff --git a/Server/DumpServer.php b/Server/DumpServer.php
@@ -41,7 +41,7 @@ public function __construct(string $host, LoggerInterface $logger = null)
     public function start(): void
     {
         if (!$this->socket = stream_socket_server($this->host, $errno, $errstr)) {
-            throw new \RuntimeException(sprintf('Server start failed on "%s": '.$errstr.' '.$errno, $this->host));
+            throw new \RuntimeException(sprintf('Server start failed on "%s": ', $this->host).$errstr.' '.$errno);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function __construct(string $host, LoggerInterface $logger = null)`
`41`	`41`	`public function start(): void`
`42`	`42`	`{`
`43`	`43`	`if (!$this->socket = stream_socket_server($this->host, $errno, $errstr)) {`
`44`		`- throw new \RuntimeException(sprintf('Server start failed on "%s": '.$errstr.' '.$errno, $this->host));`
	`44`	`+ throw new \RuntimeException(sprintf('Server start failed on "%s": ', $this->host).$errstr.' '.$errno);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`