1
0
mirror of https://github.com/xPaw/PHP-Source-Query.git synced 2026-06-11 01:33:15 +02:00

Psalm fixes around resource handling.

This commit is contained in:
Anthony Birkett
2021-05-31 13:05:53 +01:00
parent efa37503bf
commit 48b89017c4
3 changed files with 27 additions and 19 deletions
+8 -6
View File
@@ -33,7 +33,9 @@ abstract class AbstractSocket implements SocketInterface
public int $port = 0;
/**
* @var resource|null
* @var ?resource
*
* @psalm-var null|resource|closed-resource
*/
public $socket;
@@ -73,7 +75,7 @@ abstract class AbstractSocket implements SocketInterface
*/
public function getSocket()
{
if (!$this->socket) {
if (!is_resource($this->socket)) {
throw new InvalidArgumentException('Socket not open.');
}
@@ -117,7 +119,7 @@ abstract class AbstractSocket implements SocketInterface
*/
public function close(): void
{
if ($this->socket) {
if (is_resource($this->socket)) {
fclose($this->socket);
$this->socket = null;
@@ -137,7 +139,7 @@ abstract class AbstractSocket implements SocketInterface
*/
public function read(int $length = 1400): Buffer
{
if (!$this->socket) {
if (!is_resource($this->socket)) {
throw new InvalidPacketException('Socket not open.');
}
@@ -165,7 +167,7 @@ abstract class AbstractSocket implements SocketInterface
*/
public function write(int $header, string $string = ''): bool
{
if (!$this->socket) {
if (!is_resource($this->socket)) {
throw new InvalidPacketException('Socket not open.');
}
@@ -185,7 +187,7 @@ abstract class AbstractSocket implements SocketInterface
*/
public function sherlock(Buffer $buffer, int $length): bool
{
if (!$this->socket) {
if (!is_resource($this->socket)) {
throw new InvalidPacketException('Socket not open.');
}