From e9aab0814d57e9e974f7d8fdc76ce18433dc8626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petar=20Obradovi=C4=87?= Date: Fri, 7 May 2021 13:24:46 +0200 Subject: [PATCH 1/2] Add Composer files to ".gitignore" file --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index aefac54..f6f3f8a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ *.un~ .cache .cache/* +composer.lock +vendor/ From 8d9b94e8a4ec67920eb3b057e255bd3ab91da261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petar=20Obradovi=C4=87?= Date: Fri, 7 May 2021 14:24:07 +0200 Subject: [PATCH 2/2] Fix interaction with the Sockets API under PHP 8.x --- lib/Phirehose.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Phirehose.php b/lib/Phirehose.php index 7ada65e..f850462 100644 --- a/lib/Phirehose.php +++ b/lib/Phirehose.php @@ -518,8 +518,8 @@ public function consume($reconnect = TRUE) pcntl_signal_dispatch(); } - // Some sort of socket error has occured - $this->lastErrorNo = is_resource($this->conn) ? @socket_last_error($this->conn) : NULL; + // Some sort of socket error has occurred + $this->lastErrorNo = is_resource($this->conn) ? @socket_last_error() : NULL; $this->lastErrorMsg = ($this->lastErrorNo > 0) ? @socket_strerror($this->lastErrorNo) : 'Socket disconnected'; $this->log('Phirehose connection error occured: ' . $this->lastErrorMsg,'error');