Merge pull request #246 from clue-labs/php8-closed

WyriHaximus · web-flow · commit 04225cd5ad95 · 2020-08-24T21:33:57.000+02:00
Socket address of closed socket should be null (support PHP 8)
diff --git a/src/Connection.php b/src/Connection.php
@@ -138,12 +138,20 @@ public function handleClose()
 
     public function getRemoteAddress()
     {
-        return $this->parseAddress(@\stream_socket_get_name($this->stream, true));
+        if (!\is_resource($this->stream)) {
+            return null;
+        }
+
+        return $this->parseAddress(\stream_socket_get_name($this->stream, true));
     }
 
     public function getLocalAddress()
     {
-        return $this->parseAddress(@\stream_socket_get_name($this->stream, false));
+        if (!\is_resource($this->stream)) {
+            return null;
+        }
+
+        return $this->parseAddress(\stream_socket_get_name($this->stream, false));
     }
 
     private function parseAddress($address)

Original file line number	Diff line number	Diff line change
`@@ -138,12 +138,20 @@ public function handleClose()`
`138`	`138`
`139`	`139`	`public function getRemoteAddress()`
`140`	`140`	`{`
`141`		`- return $this->parseAddress(@\stream_socket_get_name($this->stream, true));`
	`141`	`+ if (!\is_resource($this->stream)) {`
	`142`	`+ return null;`
	`143`	`+ }`
	`144`	`+`
	`145`	`+ return $this->parseAddress(\stream_socket_get_name($this->stream, true));`
`142`	`146`	`}`
`143`	`147`
`144`	`148`	`public function getLocalAddress()`
`145`	`149`	`{`
`146`		`- return $this->parseAddress(@\stream_socket_get_name($this->stream, false));`
	`150`	`+ if (!\is_resource($this->stream)) {`
	`151`	`+ return null;`
	`152`	`+ }`
	`153`	`+`
	`154`	`+ return $this->parseAddress(\stream_socket_get_name($this->stream, false));`
`147`	`155`	`}`
`148`	`156`
`149`	`157`	`private function parseAddress($address)`