Corrections and fixes

README.md

@@ -1,9 +1,9 @@
-# Quake 3 Server List Script #
+# Quake 3 Server List
 
 Simple library for querying Quake 3 based master servers and it's game servers.
 
 - Version `1.x.x` uses `fsockopen`
-- Version `2.x.x` uses `socket_*` functions
+- Version `2.x.x` uses `sockets` extension
 
 _For legacy version check [old](https://github.com/jacklul/q3serverlist/tree/old) branch._
 

composer.json

@@ -23,7 +23,8 @@
     }
   ],
   "require": {
-    "php": "^5.5|^7.0"
+    "php": "^5.5|^7.0",
+    "ext-sockets": "*"
   },
   "require-dev": {
     "squizlabs/php_codesniffer": "^3.2"

examples/amphp/composer.json

@@ -1,9 +1,11 @@
 {
     "require": {
-        "amphp/parallel": "^1.4",
-        "jacklul/q3serverlist": "^1.0"
+        "amphp/parallel": "^1.4"
     },
     "autoload": {
+        "psr-4": {
+            "jacklul\\q3serverlist\\": "../../src"
+        },
         "files": ["functions.php"]
     }
 }

examples/amphp/servers.php

@@ -8,7 +8,7 @@
  * and pthreads extension
  * 
  * This is the fastest and most reliable way of scanning
- * the masters server in with multiple threads.
+ * the masters server with multiple threads
  */
 
 use Amp\Parallel\Worker;
@@ -20,7 +20,12 @@
     exit('Thread safety is required' . PHP_EOL);
 }
 
-require __DIR__ . '/vendor/autoload.php';
+if (file_exists(__DIR__ . '/vendor/autoload.php')) {
+    require __DIR__ . '/vendor/autoload.php';
+} elseif (file_exists(__DIR__ . '/../../vendor/autoload.php')) {
+    require __DIR__ . '/../../vendor/autoload.php';
+}
+
 $start = microtime(true);
 
 // Fetch the server list

examples/pthreads/composer.json

@@ -1,5 +1,7 @@
 {
-    "require": {
-        "jacklul/q3serverlist": "^1.0"
+    "autoload": {
+        "psr-4": {
+            "jacklul\\q3serverlist\\": "../../src"
+        }
     }
 }

examples/pthreads/servers.php

@@ -14,18 +14,25 @@
     exit('Thread safety is required' . PHP_EOL);
 }
 
-require __DIR__ . '/vendor/autoload.php';
+if (file_exists(__DIR__ . '/vendor/autoload.php')) {
+    require __DIR__ . '/vendor/autoload.php';
+} elseif (file_exists(__DIR__ . '/../../vendor/autoload.php')) {
+    require __DIR__ . '/../../vendor/autoload.php';
+}
+
 $start = microtime(true);
 
 class ServerScan extends Thread
 {
     private $server;
+    private $connection;
     private $print;
     public $result;
 
     public function __construct(Server $server, $print = false)
     {
         $this->server = $server;
+        $this->connection = $server->getConnection();
         $this->print  = $print;
     }
 
@@ -78,6 +85,8 @@ public function run(): void
                 print $this->server->getAddress() . ':' . $this->server->getPort() . PHP_EOL;
             }
         }
+
+        $this->server->getConnection()->close();
     }
 }
 

examples/spatie-async/composer.json

@@ -1,6 +1,10 @@
 {
     "require": {
-        "spatie/async": "^1.4",
-        "jacklul/q3serverlist": "^1.0"
+        "spatie/async": "^1.4"
+    },
+    "autoload": {
+        "psr-4": {
+            "jacklul\\q3serverlist\\": "../../src"
+        }
     }
 }

examples/spatie-async/servers.php

@@ -10,7 +10,12 @@
 use jacklul\q3serverlist\Server;
 use Spatie\Async\Pool;
 
-require __DIR__ . '/vendor/autoload.php';
+if (file_exists(__DIR__ . '/vendor/autoload.php')) {
+    require __DIR__ . '/vendor/autoload.php';
+} elseif (file_exists(__DIR__ . '/../../vendor/autoload.php')) {
+    require __DIR__ . '/../../vendor/autoload.php';
+}
+
 $start = microtime(true);
 
 function scanServer(Server $server, $print = false): ?array