tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-29 16:54:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

RestApiClient: Remove curl's return type hint and wrong curl_error() param

Browse Source 
Php >= 8 returns CurlHandle instead of resource, which confuses phpstan.
This commit is contained in:
Sukhwinder Dhillon 2024-01-18 11:44:27 +01:00 committed by Johannes Meyer
parent cc3bfd5437
commit 2acfdecb8d
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Director/Core/RestApiClient.php
View File

@ -206,14 +206,14 @@ class RestApiClient
} }
/** /**
* @return resource * @throws RuntimeException
*/ */
protected function curl() protected function curl()
{ {
if ($this->curl === null) { if ($this->curl === null) {
$this->curl = curl_init(sprintf('https://%s:%d', $this->peer, $this->port)); $this->curl = curl_init(sprintf('https://%s:%d', $this->peer, $this->port));
if (! $this->curl) { if (! $this->curl) {
throw new RuntimeException('CURL INIT ERROR: ' . curl_error($this->curl)); throw new RuntimeException('CURL INIT FAILED');
} }
} }
@ -260,14 +260,12 @@ class RestApiClient
public function disconnect() public function disconnect()
{ {
if ($this->curl !== null) { if ($this->curl) {
if (is_resource($this->curl)) {
@curl_close($this->curl); @curl_close($this->curl);
} }
$this->curl = null; $this->curl = null;
} }
}
public function __destruct() public function __destruct()
{ {

7
library/Director/RestApi/RestApiClient.php
View File

@ -8,7 +8,6 @@ use RuntimeException;
class RestApiClient class RestApiClient
{ {
/** @var resource */
private $curl; private $curl;
/** @var string HTTP or HTTPS */ /** @var string HTTP or HTTPS */
@ -295,14 +294,14 @@ class RestApiClient
} }
/** /**
* @return resource * @throws RuntimeException
*/ */
protected function curl() protected function curl()
{ {
if ($this->curl === null) { if ($this->curl === null) {
$this->curl = \curl_init(\sprintf('https://%s:%d', $this->host, $this->port)); $this->curl = curl_init(sprintf('https://%s:%d', $this->host, $this->port));
if (! $this->curl) { if (! $this->curl) {
throw new RuntimeException('CURL INIT ERROR: ' . \curl_error($this->curl)); throw new RuntimeException('CURL INIT FAILED');
} }
} }