1
0
mirror of https://github.com/xPaw/PHP-Source-Query.git synced 2026-06-16 10:13:14 +02:00

Rename SocketType -> EngineType.

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
@@ -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,
];
}
+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;
}
}
+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;
+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;
}
}
+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,
+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);
}
+3 -3
View File
@@ -3,12 +3,12 @@
declare(strict_types=1);
use PHPUnit\Framework\TestCase;
use xPaw\SourceQuery\EngineType;
use xPaw\SourceQuery\Exception\AuthenticationException;
use xPaw\SourceQuery\Exception\InvalidArgumentException;
use xPaw\SourceQuery\Exception\InvalidPacketException;
use xPaw\SourceQuery\Exception\SocketException;
use xPaw\SourceQuery\Rcon\TestableRcon;
use xPaw\SourceQuery\Socket\SocketType;
use xPaw\SourceQuery\Socket\TestableSocket;
use xPaw\SourceQuery\SourceQuery;
@@ -140,8 +140,8 @@ final class Tests extends TestCase
public function testGetInfo(string $rawInput, array $expectedOutput): void
{
$socketType = isset($expectedOutput['IsMod'])
? SocketType::GOLDSOURCE
: SocketType::SOURCE;
? EngineType::GOLDSOURCE
: EngineType::SOURCE;
$socket = new TestableSocket($socketType);
$sourceQuery = $this->create($socket);