aandrieux/Test-Miroir
1
0
Fork 0
mirror of https://github.com/xPaw/PHP-Source-Query.git synced 2026-06-16 12:23:14 +02:00
Code Issues Releases Wiki Activity

Rename SocketType -> EngineType.

Browse Source
This commit is contained in:
Anthony Birkett
2021-06-01 21:50:37 +01:00
parent 71bdac6f9d
commit da68be0fb1
7 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SourceQuery/Socket/SocketType.php → SourceQuery/EngineType.php
+9 -4
View File
@@ -13,10 +13,15 @@ declare(strict_types=1);
* @internal
*/
namespace xPaw\SourceQuery\Socket;
namespace xPaw\SourceQuery;
abstract class SocketType
abstract class EngineType
{
public const GOLDSOURCE = 0;
public const SOURCE = 1;
public const GOLDSOURCE = 'GoldSource';
public const SOURCE = 'Source';
public const ALL_ENGINES = [
self::GOLDSOURCE,
self::SOURCE,
];
}
SourceQuery/Socket/GoldSourceSocket.php
+3 -2
View File
@@ -15,14 +15,15 @@ declare(strict_types=1);
namespace xPaw\SourceQuery\Socket;
use xPaw\SourceQuery\EngineType;
use xPaw\SourceQuery\Socket\Traits\GoldSourcePacketDataTrait;
final class GoldSourceSocket extends AbstractSocket
{
use GoldSourcePacketDataTrait;
public function getType(): int
public function getType(): string
{
return SocketType::GOLDSOURCE;
return EngineType::GOLDSOURCE;
}
}
SourceQuery/Socket/SocketInterface.php
+1 -1
View File
@@ -36,7 +36,7 @@ interface SocketInterface
/**
* Get the socket type (goldsrc/src).
*/
public function getType(): int;
public function getType(): string;
public function open(string $address, int $port, int $timeout): void;
SourceQuery/Socket/SourceSocket.php
+3 -2
View File
@@ -15,14 +15,15 @@ declare(strict_types=1);
namespace xPaw\SourceQuery\Socket;
use xPaw\SourceQuery\EngineType;
use xPaw\SourceQuery\Socket\Traits\SourcePacketDataTrait;
final class SourceSocket extends AbstractSocket
{
use SourcePacketDataTrait;
public function getType(): int
public function getType(): string
{
return SocketType::SOURCE;
return EngineType::SOURCE;
}
}
SourceQuery/Socket/TestableSocket.php
+6 -5
View File
@@ -16,6 +16,7 @@ declare(strict_types=1);
namespace xPaw\SourceQuery\Socket;
use xPaw\SourceQuery\Buffer;
use xPaw\SourceQuery\EngineType;
use xPaw\SourceQuery\Exception\InvalidPacketException;
use xPaw\SourceQuery\Socket\Traits\GoldSourcePacketDataTrait;
use xPaw\SourceQuery\Socket\Traits\SourcePacketDataTrait;
@@ -35,18 +36,18 @@ final class TestableSocket extends AbstractSocket
*/
private array $packetQueue;
private int $type;
private string $type;
/**
* TestableSocket constructor.
*/
public function __construct(int $type = SocketType::SOURCE)
public function __construct(string $type = EngineType::SOURCE)
{
$this->packetQueue = [];
$this->type = $type;
}
public function getType(): int
public function getType(): string
{
return $this->type;
}
@@ -117,7 +118,7 @@ final class TestableSocket extends AbstractSocket
?int &$checksum
): void {
switch ($this->type) {
case SocketType::GOLDSOURCE:
case EngineType::GOLDSOURCE:
$this->readInternalPacketDataGoldSource(
$buffer,
$count,
@@ -128,7 +129,7 @@ final class TestableSocket extends AbstractSocket
break;
case SocketType::SOURCE:
case EngineType::SOURCE:
default:
$this->readInternalPacketDataSource(
$buffer,
SourceQuery/SourceQuery.php
+1 -2
View File
@@ -25,7 +25,6 @@ use xPaw\SourceQuery\QueryResponse\RulesQueryResponse;
use xPaw\SourceQuery\QueryResponse\SourceInfoQueryResponse;
use xPaw\SourceQuery\Rcon\RconInterface;
use xPaw\SourceQuery\Socket\SocketInterface;
use xPaw\SourceQuery\Socket\SocketType;
final class SourceQuery
{
@@ -201,7 +200,7 @@ final class SourceQuery
}
// Old GoldSource protocol, HLTV still uses it.
if (self::S2A_INFO_OLD === $type && SocketType::GOLDSOURCE === $this->socket->getType()) {
if (self::S2A_INFO_OLD === $type && EngineType::GOLDSOURCE === $this->socket->getType()) {
return GoldSourceInfoQueryResponse::fromBuffer($buffer);
}