diff --git a/SourceQuery/Exception/SocketException.php b/SourceQuery/Exception/SocketException.php index f8d98e4..eb05aec 100644 --- a/SourceQuery/Exception/SocketException.php +++ b/SourceQuery/Exception/SocketException.php @@ -16,4 +16,5 @@ { const COULD_NOT_CREATE_SOCKET = 1; const NOT_CONNECTED = 2; + const CONNECTEON_FALED = 3; } diff --git a/SourceQuery/Exception/TimeoutException.php b/SourceQuery/Exception/TimeoutException.php deleted file mode 100644 index 1dd6348..0000000 --- a/SourceQuery/Exception/TimeoutException.php +++ /dev/null @@ -1,18 +0,0 @@ - - * - * @link https://xpaw.me - * @link https://github.com/xPaw/PHP-Source-Query - * - * @license GNU Lesser General Public License, version 2.1 - * - * @internal - */ - - namespace xPaw\SourceQuery\Exception; - - class TimeoutException extends SourceQueryException - { - const TIMEOUT_CONNECT = 1; - } diff --git a/SourceQuery/SourceQuery.php b/SourceQuery/SourceQuery.php index 9198e88..ab7e12a 100644 --- a/SourceQuery/SourceQuery.php +++ b/SourceQuery/SourceQuery.php @@ -537,7 +537,6 @@ * * @throws AuthenticationException * @throws SocketException - * @throws TimeoutException * * @return bool True on success, false on failure */ diff --git a/SourceQuery/SourceRcon.php b/SourceQuery/SourceRcon.php index 4e08c83..a8d3ecb 100644 --- a/SourceQuery/SourceRcon.php +++ b/SourceQuery/SourceRcon.php @@ -13,8 +13,8 @@ namespace xPaw\SourceQuery; use xPaw\SourceQuery\Exception\AuthenticationException; - use xPaw\SourceQuery\Exception\TimeoutException; use xPaw\SourceQuery\Exception\InvalidPacketException; + use xPaw\SourceQuery\Exception\SocketException; /** * Class SourceRcon @@ -22,8 +22,8 @@ * @package xPaw\SourceQuery * * @uses xPaw\SourceQuery\Exception\AuthenticationException - * @uses xPaw\SourceQuery\Exception\TimeoutException * @uses xPaw\SourceQuery\Exception\InvalidPacketException + * @uses xPaw\SourceQuery\Exception\SocketException */ class SourceRcon { @@ -70,7 +70,7 @@ if( $ErrNo || !$this->RconSocket ) { - throw new TimeoutException( 'Can\'t connect to RCON server: ' . $ErrStr, TimeoutException::TIMEOUT_CONNECT ); + throw new SocketException( 'Can\'t connect to RCON server: ' . $ErrStr, SocketException::CONNECTEON_FALED ); } Stream_Set_Timeout( $this->RconSocket, $this->Socket->Timeout ); diff --git a/SourceQuery/bootstrap.php b/SourceQuery/bootstrap.php index 2e6f7ad..1958607 100644 --- a/SourceQuery/bootstrap.php +++ b/SourceQuery/bootstrap.php @@ -18,7 +18,6 @@ require_once __DIR__ . '/Exception/InvalidArgumentException.php'; require_once __DIR__ . '/Exception/SocketException.php'; require_once __DIR__ . '/Exception/InvalidPacketException.php'; - require_once __DIR__ . '/Exception/TimeoutException.php'; require_once __DIR__ . '/Buffer.php'; require_once __DIR__ . '/Socket.php';