From a2f7834ef5820c55ca61d0d5c94832b96dac4ebf Mon Sep 17 00:00:00 2001
From: Anthony Birkett <antbir@gmail.com>
Date: Sun, 30 May 2021 11:30:29 +0100
Subject: [PATCH] Use autoloading.

---
 Examples/Example.php       |  2 +-
 Examples/RconExample.php   |  2 +-
 Examples/View.php          |  4 +++-
 SourceQuery/BaseSocket.php |  2 +-
 SourceQuery/Socket.php     | 12 +++++++++---
 SourceQuery/bootstrap.php  | 30 ------------------------------
 Tests/phpunit.xml          |  4 +---
 composer.json              |  6 +++---
 8 files changed, 19 insertions(+), 43 deletions(-)
 delete mode 100644 SourceQuery/bootstrap.php

diff --git a/Examples/Example.php b/Examples/Example.php
index a8bc770..cfa061d 100644
--- a/Examples/Example.php
+++ b/Examples/Example.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-require __DIR__ . '/../SourceQuery/bootstrap.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 use xPaw\SourceQuery\SourceQuery;
 
diff --git a/Examples/RconExample.php b/Examples/RconExample.php
index d1e22de..dc58692 100644
--- a/Examples/RconExample.php
+++ b/Examples/RconExample.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-require __DIR__ . '/../SourceQuery/bootstrap.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 use xPaw\SourceQuery\SourceQuery;
 
diff --git a/Examples/View.php b/Examples/View.php
index 9ecaa47..49d798c 100644
--- a/Examples/View.php
+++ b/Examples/View.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-require __DIR__ . '/../SourceQuery/bootstrap.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 use xPaw\SourceQuery\SourceQuery;
 
@@ -115,6 +115,8 @@ $Timer = number_format(microtime(true) - $Timer, 4, '.', '');
         echo 'true';
     } elseif ($InfoValue === false) {
         echo 'false';
+    } elseif (is_int($InfoValue)) {
+        echo $InfoValue;
     } else {
         echo htmlspecialchars($InfoValue);
     }
diff --git a/SourceQuery/BaseSocket.php b/SourceQuery/BaseSocket.php
index f1a98dc..3cae434 100644
--- a/SourceQuery/BaseSocket.php
+++ b/SourceQuery/BaseSocket.php
@@ -29,7 +29,7 @@ use xPaw\SourceQuery\Exception\SocketException;
 abstract class BaseSocket
 {
     /**
-     * @var resource
+     * @var resource|null
      */
     public $Socket;
 
diff --git a/SourceQuery/Socket.php b/SourceQuery/Socket.php
index 05489e3..6735e74 100644
--- a/SourceQuery/Socket.php
+++ b/SourceQuery/Socket.php
@@ -33,10 +33,10 @@ final class Socket extends BaseSocket
      */
     public function Close(): void
     {
-        if ($this->Socket !== null) {
+        if ($this->Socket !== null && $this->Socket !== 0) {
             fclose($this->Socket);
 
-            $this->Socket = 0;
+            $this->Socket = null;
         }
     }
 
@@ -94,7 +94,13 @@ final class Socket extends BaseSocket
     public function Read(int $Length = 1400): Buffer
     {
         $Buffer = new Buffer();
-        $Buffer->Set(fread($this->Socket, $Length));
+        $data = fread($this->Socket, $Length);
+
+        if (!$data) {
+            throw new SocketException('Failed to open socket.');
+        }
+
+        $Buffer->Set($data);
 
         $this->ReadInternal($Buffer, $Length, [ $this, 'Sherlock' ]);
 
diff --git a/SourceQuery/bootstrap.php b/SourceQuery/bootstrap.php
deleted file mode 100644
index c11049e..0000000
--- a/SourceQuery/bootstrap.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Library to query servers that implement Source Engine Query protocol.
- *
- * Special thanks to koraktor for his awesome Steam Condenser class,
- * I used it as a reference at some points.
- *
- * @author Pavel Djundik
- *
- * @link https://xpaw.me
- * @link https://github.com/xPaw/PHP-Source-Query
- *
- * @license GNU Lesser General Public License, version 2.1
- */
-
-require_once __DIR__ . '/Exception/SourceQueryException.php';
-require_once __DIR__ . '/Exception/AuthenticationException.php';
-require_once __DIR__ . '/Exception/InvalidArgumentException.php';
-require_once __DIR__ . '/Exception/SocketException.php';
-require_once __DIR__ . '/Exception/InvalidPacketException.php';
-
-require_once __DIR__ . '/Buffer.php';
-require_once __DIR__ . '/BaseSocket.php';
-require_once __DIR__ . '/Socket.php';
-require_once __DIR__ . '/SourceRcon.php';
-require_once __DIR__ . '/GoldSourceRcon.php';
-require_once __DIR__ . '/SourceQuery.php';
diff --git a/Tests/phpunit.xml b/Tests/phpunit.xml
index 5751ddc..7242208 100644
--- a/Tests/phpunit.xml
+++ b/Tests/phpunit.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" 
-         bootstrap="../SourceQuery/bootstrap.php"
-         verbose="true">
+<phpunit colors="true" verbose="true">
 	<testsuites>
 		<testsuite name="Tests">
 			<file>./Tests.php</file>
diff --git a/composer.json b/composer.json
index 7913280..3f8d3ec 100644
--- a/composer.json
+++ b/composer.json
@@ -19,9 +19,9 @@
 	"require":
 	{
 		"php": ">=7.4",
-		"ext-bz2":  ">7.*",
-		"ext-gmp":  ">7.*",
-		"ext-json":  ">7.*"
+		"ext-bz2":  ">=7.4",
+		"ext-gmp":  ">=7.4",
+		"ext-json":  ">=7.4"
 	},
 	"require-dev":
 	{