aandrieux/Test-Miroir
1
0
Fork 0
mirror of https://github.com/xPaw/PHP-Source-Query.git synced 2026-05-18 14:33:34 +02:00
Code Issues Releases Wiki Activity

Remove socket open check which can never be false

Browse Source
This commit is contained in:
Pavel Djundik
2015-10-18 22:01:28 +03:00
parent f18f3208fa
commit 77e5af8745
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SourceQuery/Socket.php
-2
View File
@@ -70,8 +70,6 @@
Stream_Set_Timeout( $this->Socket, $Timeout ); Stream_Set_Timeout( $this->Socket, $Timeout );
Stream_Set_Blocking( $this->Socket, true ); Stream_Set_Blocking( $this->Socket, true );
return true;
} }
public function Write( $Header, $String = '' ) public function Write( $Header, $String = '' )
SourceQuery/SourceQuery.php
+1 -7
View File
@@ -15,7 +15,6 @@
use xPaw\SourceQuery\Exception\InvalidArgumentException; use xPaw\SourceQuery\Exception\InvalidArgumentException;
use xPaw\SourceQuery\Exception\InvalidPacketException; use xPaw\SourceQuery\Exception\InvalidPacketException;
use xPaw\SourceQuery\Exception\SocketException; use xPaw\SourceQuery\Exception\SocketException;
use xPaw\SourceQuery\Exception\TimeoutException;
/** /**
* Class SourceQuery * Class SourceQuery
@@ -25,7 +24,6 @@
* @uses xPaw\SourceQuery\Exception\InvalidArgumentException * @uses xPaw\SourceQuery\Exception\InvalidArgumentException
* @uses xPaw\SourceQuery\Exception\InvalidPacketException * @uses xPaw\SourceQuery\Exception\InvalidPacketException
* @uses xPaw\SourceQuery\Exception\SocketException * @uses xPaw\SourceQuery\Exception\SocketException
* @uses xPaw\SourceQuery\Exception\TimeoutException
*/ */
class SourceQuery class SourceQuery
{ {
@@ -138,7 +136,6 @@
* @param int $Engine Engine the server runs on (goldsource, source) * @param int $Engine Engine the server runs on (goldsource, source)
* *
* @throws InvalidArgumentException * @throws InvalidArgumentException
* @throws TimeoutException
* @throws SocketException * @throws SocketException
*/ */
public function Connect( $Ip, $Port, $Timeout = 3, $Engine = self::SOURCE ) public function Connect( $Ip, $Port, $Timeout = 3, $Engine = self::SOURCE )
@@ -150,10 +147,7 @@
throw new InvalidArgumentException( 'Timeout must be an integer.', InvalidArgumentException::TIMEOUT_NOT_INTEGER ); throw new InvalidArgumentException( 'Timeout must be an integer.', InvalidArgumentException::TIMEOUT_NOT_INTEGER );
} }
if( !$this->Socket->Open( $Ip, (int)$Port, $Timeout, (int)$Engine ) ) $this->Socket->Open( $Ip, (int)$Port, $Timeout, (int)$Engine );
{
throw new TimeoutException( 'Could not connect to server.', TimeoutException::TIMEOUT_CONNECT );
}
$this->Connected = true; $this->Connected = true;
} }