Socket fix for PHP 8 (fixes #31)

KIMB-technologies · Dec 5, 2020 · 204aba0 · 204aba0
1 parent 824f214
commit 204aba0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/core/AutocompleteSocket.php b/core/AutocompleteSocket.php
@@ -53,7 +53,7 @@ private function openSocket(){
 	}
 
 	public function __destruct(){
-		if( is_resource($this->socket)){
+		if( Utilities::isSocketType($this->socket)){
 			socket_close($this->socket);
 		}
 		if( file_exists($this->socketpath)){
@@ -68,7 +68,7 @@ private function closeOtherSocket(){
 
 			socket_write($s, $msg, strlen($msg));
 		}
-		if(is_resource($s)){
+		if(Utilities::isSocketType($s)){
 			socket_close($s);
 		}
 
@@ -81,7 +81,7 @@ private function closeOtherSocket(){
 	private function connectionHandler( $connection ){
 		$buffer = "";
 		do{
-			if( !is_resource($connection) ){
+			if( !Utilities::isSocketType($connection) ){
 				return;
 			}
 			$buffer = @socket_read($connection, 256, PHP_NORMAL_READ);

diff --git a/core/Utilities.php b/core/Utilities.php
@@ -4,7 +4,7 @@
  */
 class Utilities {
 
-	const VERSION = 'v1.0.13';
+	const VERSION = 'v1.0.14';
 
 	const DEFAULT_LINE_LENGTH = 125;
 
@@ -140,6 +140,20 @@ public static function isOnline(string $url) : bool {
 			return false;
 		}
 	}
+
+	/**
+	 * Checks if given variable is a socket.
+	 * @param mixed $s the var to check
+	 * @return bool is socket?
+	 */
+	public static function isSocketType($s) : bool {
+		if( class_exists('Socket') && version_compare(PHP_VERSION, '8.0.0', '>=') ){
+			return $s instanceof Socket;
+		}
+		else{
+			return is_resource($s);
+		}
+	}
 }
 
 ?>
diff --git a/core/platform/socketTester.php b/core/platform/socketTester.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once(__DIR__ . '/../Utilities.php');
+
 function getSocketPath(){
 	return '/private/tmp/TaskTimeTerminateAutocomplete.sock';
 	//return getenv('USERPROFILE') . '/AppData/Local/Temp/TaskTimeTerminateAutocomplete.sock';
@@ -18,7 +20,7 @@ function getCompletion($prefix){
 				}
 			}
 		}
-		if(is_resource($s)){
+		if(Utilities::isSocketType($s)){
 			socket_close($s);
 		}
 	}