Composer Support

* Create xPaw Namespace
* Use PSR-4 autoloading standard

Author: Navarr Barnier

Diff for: .gitignore

@@ -0,0 +1,3 @@
+vendor/
+composer.lock
+# Composer.lock should normally be included but is not recommended for libraries

Diff for: README.md

@@ -18,7 +18,10 @@ Minecraft implements [Source RCON protocol](https://developer.valvesoftware.com/
 ## Example
 ```php
 <?php
-	require __DIR__ . '/MinecraftQuery.class.php';
+	require __DIR__ . '/src/MinecraftQuery.php';
+	require __DIR__ . '/src/MinecraftQueryException.php';
+	
+	use xPaw\MinecraftQuery;
 
 	$Query = new MinecraftQuery( );
 

Diff for: composer.json

@@ -0,0 +1,12 @@
+{
+    "name": "xpaw/php-minecraft-query",
+    "description": "A Minecraft Server query handler for php",
+    "license": "CC BY-NC-SA 3.0",
+    "keywords": ["minecraft"],
+    "require": {
+        "php": ">=5.3.0"
+    },
+    "autoload": {
+        "psr-4": { "xPaw\\": "src" }
+    }
+}

Diff for: MinecraftServerPing.php renamed to src/MinecraftPing.php

@@ -1,8 +1,6 @@
 <?php
-class MinecraftPingException extends Exception
-{
-	//
-}
+
+namespace xPaw;
 
 class MinecraftPing
 {
@@ -27,104 +25,104 @@ class MinecraftPing
 	 * echo '<img width="64" height="64" src="' . Str_Replace( "\n", "", $Info[ 'favicon' ] ) . '">';
 	 *
 	 */
-	
+
 	private $Socket;
 	private $ServerAddress;
 	private $ServerPort;
 	private $Timeout;
-	
+
 	public function __construct( $Address, $Port = 25565, $Timeout = 2 )
 	{
 		$this->ServerAddress = $Address;
 		$this->ServerPort = (int)$Port;
 		$this->Timeout = (int)$Timeout;
-		
+
 		$this->Connect( );
 	}
-	
+
 	public function __destruct( )
 	{
 		$this->Close( );
 	}
-	
+
 	public function Close( )
 	{
 		if( $this->Socket !== null )
 		{
 			fclose( $this->Socket );
-			
+
 			$this->Socket = null;
 		}
 	}
-	
+
 	public function Connect( )
 	{
 		$connectTimeout = $this->Timeout;
 		$this->Socket = @fsockopen( $this->ServerAddress, $this->ServerPort, $errno, $errstr, $connectTimeout );
-		
+
 		if( !$this->Socket )
 		{
 			throw new MinecraftPingException( "Failed to connect or create a socket: $errno ($errstr)" );
 		}
-		
+
 		// Set Read/Write timeout
 		stream_set_timeout( $this->Socket, $this->Timeout );
 	}
-	
+
 	public function Query( )
 	{
 		$TimeStart = microtime(true); // for read timeout purposes
-		
+
 		// See http://wiki.vg/Protocol (Status Ping)
 		$Data = "\x00"; // packet ID = 0 (varint)
-		
+
 		$Data .= "\x04"; // Protocol version (varint)
 		$Data .= Pack( 'c', StrLen( $this->ServerAddress ) ) . $this->ServerAddress; // Server (varint len + UTF-8 addr)
 		$Data .= Pack( 'n', $this->ServerPort ); // Server port (unsigned short)
 		$Data .= "\x01"; // Next state: status (varint)
-		
+
 		$Data = Pack( 'c', StrLen( $Data ) ) . $Data; // prepend length of packet ID + data
-		
+
 		fwrite( $this->Socket, $Data ); // handshake
 		fwrite( $this->Socket, "\x01\x00" ); // status ping
-		
+
 		$Length = $this->ReadVarInt( ); // full packet length
-		
+
 		if( $Length < 10 )
 		{
 			return FALSE;
 		}
-		
+
 		fgetc( $this->Socket ); // packet type, in server ping it's 0
-		
+
 		$Length = $this->ReadVarInt( ); // string length
-		
+
 		$Data = "";
 		do
 		{
 			if (microtime(true) - $TimeStart > $this->Timeout)
 			{
 				throw new MinecraftPingException( 'Server read timed out' );
 			}
-			
+
 			$Remainder = $Length - StrLen( $Data );
 			$block = fread( $this->Socket, $Remainder ); // and finally the json string
 			// abort if there is no progress
 			if (!$block)
 			{
 				throw new MinecraftPingException( 'Server returned too few data' );
 			}
-			
+
 			$Data .= $block;
 		} while( StrLen($Data) < $Length );
-		
+
 		if( $Data === FALSE )
 		{
 			throw new MinecraftPingException( 'Server didn\'t return any data' );
 		}
-		
+
 		$Data = JSON_Decode( $Data, true );
-		
+
 		if( JSON_Last_Error( ) !== JSON_ERROR_NONE )
 		{
 			if( Function_Exists( 'json_last_error_msg' ) )
@@ -135,32 +133,32 @@ public function Query( )
 			{
 				throw new MinecraftPingException( 'JSON parsing failed' );
 			}
-			
+
 			return FALSE;
 		}
-		
+
 		return $Data;
 	}
-	
+
 	public function QueryOldPre17( )
 	{
 		fwrite( $this->Socket, "\xFE\x01" );
 		$Data = fread( $this->Socket, 512 );
 		$Len = StrLen( $Data );
-		
+
 		if( $Len < 4 || $Data[ 0 ] !== "\xFF" )
 		{
 			return FALSE;
 		}
-		
+
 		$Data = SubStr( $Data, 3 ); // Strip packet header (kick message packet and short length)
 		$Data = iconv( 'UTF-16BE', 'UTF-8', $Data );
-		
+
 		// Are we dealing with Minecraft 1.4+ server?
 		if( $Data[ 1 ] === "\xA7" && $Data[ 2 ] === "\x31" )
 		{
 			$Data = Explode( "\x00", $Data );
-			
+
 			return Array(
 				'HostName'   => $Data[ 3 ],
 				'Players'    => IntVal( $Data[ 4 ] ),
@@ -169,9 +167,9 @@ public function QueryOldPre17( )
 				'Version'    => $Data[ 2 ]
 			);
 		}
-		
+
 		$Data = Explode( "\xA7", $Data );
-		
+
 		return Array(
 			'HostName'   => SubStr( $Data[ 0 ], 0, -1 ),
 			'Players'    => isset( $Data[ 1 ] ) ? IntVal( $Data[ 1 ] ) : 0,
@@ -180,36 +178,36 @@ public function QueryOldPre17( )
 			'Version'    => '1.3'
 		);
 	}
-	
+
 	private function ReadVarInt( )
 	{
 		$i = 0;
 		$j = 0;
-		
+
 		while( true )
 		{
 			$k = @fgetc( $this->Socket );
-			
+
 			if( $k === FALSE )
 			{
 				return 0;
 			}
-			
+
 			$k = Ord( $k );
-			
+
 			$i |= ( $k & 0x7F ) << $j++ * 7;
-			
+
 			if( $j > 5 )
 			{
 				throw new MinecraftPingException( 'VarInt too big' );
 			}
-			
+
 			if( ( $k & 0x80 ) != 128 )
 			{
 				break;
 			}
 		}
-		
+
 		return $i;
 	}
 }

Diff for: src/MinecraftPingException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace xPaw;
+
+class MinecraftPingException extends \Exception
+{
+	// Exception thrown by MinecraftPing class
+}