Max phpstan level, add checks for socket null

Author: xPaw

SourceQuery/GoldSourceRcon.php

@@ -16,6 +16,7 @@
 
 	use xPaw\SourceQuery\Exception\AuthenticationException;
 	use xPaw\SourceQuery\Exception\InvalidPacketException;
+	use xPaw\SourceQuery\Exception\SocketException;
 
 	/**
 	 * Class GoldSourceRcon
@@ -53,18 +54,21 @@ public function Open( ) : void
 
 		public function Write( int $Header, string $String = '' ) : bool
 		{
+			if( $this->Socket->Socket === null )
+			{
+				throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
+			}
+
 			$Command = pack( 'cccca*', 0xFF, 0xFF, 0xFF, 0xFF, $String );
 			$Length  = strlen( $Command );
 
 			return $Length === fwrite( $this->Socket->Socket, $Command, $Length );
 		}
 
 		/**
-		 * @param int $Length
 		 * @throws AuthenticationException
-		 * @return Buffer
 		 */
-		public function Read( int $Length = 1400 ) : Buffer
+		public function Read( ) : Buffer
 		{
 			// GoldSource RCON has same structure as Query
 			$Buffer = $this->Socket->Read( );

SourceQuery/Socket.php

@@ -58,6 +58,11 @@ public function Open( string $Address, int $Port, int $Timeout, int $Engine ) :
 
 		public function Write( int $Header, string $String = '' ) : bool
 		{
+			if( $this->Socket === null )
+			{
+				throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
+			}
+
 			$Command = pack( 'ccccca*', 0xFF, 0xFF, 0xFF, 0xFF, $Header, $String );
 			$Length  = strlen( $Command );
 
@@ -75,6 +80,11 @@ public function Write( int $Header, string $String = '' ) : bool
 		 */
 		public function Read( ) : Buffer
 		{
+			if( $this->Socket === null )
+			{
+				throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
+			}
+
 			$Data = fread( $this->Socket, self::MaxPacketLength );
 			$Buffer = new Buffer( );
 			$Buffer->Set( $Data === false ? '' : $Data );
@@ -86,6 +96,11 @@ public function Read( ) : Buffer
 
 		public function Sherlock( Buffer $Buffer ) : bool
 		{
+			if( $this->Socket === null )
+			{
+				throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
+			}
+
 			$Data = fread( $this->Socket, self::MaxPacketLength );
 
 			if( $Data === false || strlen( $Data ) < 4 )

SourceQuery/SourceRcon.php

@@ -74,6 +74,11 @@ public function Open( ) : void
 
 		public function Write( int $Header, string $String = '' ) : bool
 		{
+			if( $this->RconSocket === null )
+			{
+				throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
+			}
+
 			// Pack the packet together
 			$Command = pack( 'VV', ++$this->RconRequestId, $Header ) . $String . "\x00\x00"; 
 
@@ -86,6 +91,11 @@ public function Write( int $Header, string $String = '' ) : bool
 
 		public function Read( ) : Buffer
 		{
+			if( $this->RconSocket === null )
+			{
+				throw new SocketException( 'Not connected.', SocketException::NOT_CONNECTED );
+			}
+
 			$Data = fread( $this->RconSocket, 4 );
 			$Buffer = new Buffer( );
 			$Buffer->Set( $Data === false ? '' : $Data );

phpstan.neon

@@ -2,7 +2,7 @@ includes:
     - vendor/phpstan/phpstan-strict-rules/rules.neon
 parameters:
 	checkFunctionNameCase: true
-	level: 7
+	level: max
 	paths:
 		- .
 	excludePaths: