Fixed unknown socket resource problem and setted close socket connection method in socket handlers destructor methods

Author: example

src/Client.php

@@ -1,61 +1,71 @@
-<?php
+<?php 
 
 namespace WebSocket;
 
 class Client extends SocketEndpoint implements ISocketImplementer
 {
     /**
-     * Create socket using connectToSocket
-     * method
-     * @var resource
+     * Socket resource created using 
+     * acceptSocketConnection method
+     * @var resource 
      */ 
-    private $createdSocket;
+    protected $createdSocket;
 
     /**
-     * Create connection for server socket
+     * Accept server socket connection
      * @return resource|\WebSocket\SocketError 
      */ 
     public function create()
     {
         $this->createdSocket = $this->connectToSocket();
 
         if (!$this->createdSocket) {
-            return new SocketError('Can\'t create and connect to socket');
+            return new SocketError('Can\'t accepted connected socket');
         }
 
         return $this->createdSocket;
     }
 
     /**
-     * Read message from created server socket
-     * @return \WebSocket\SocketError|WebSocket\SocketMessage 
+     * Read message from accepted server socket 
+     * @return \WebSocket\SocketError|\WebSocket\SocketMessage 
      */ 
     public function read()
     {
-        $responseFromSocket = new SocketMessage(
+        $socketResponse = new SocketMessage(
             $this->readFromSocket($this->createdSocket)
         );
 
-        if (!$responseFromSocket->getSocketResponse()) {
-            return new SocketError('Can\'t read from server socket');
+        if (!$socketResponse->getSocketResponse()) {
+            return new SocketError('Can\'t read message from client socket');
         }
 
-        return $responseFromSocket;
+        return $socketResponse;
     }
 
     /**
-     * Write message to created server socket
-     * @param string $message
+     * Write message to server accepted socket 
+     * @param string $message 
      * @return int|\WebSocket\SocketError 
      */ 
     public function write(string $message)
     {
-        $writtenSocket = $this->write($message);
+        $writtenMessage = $this->writeToSocket($this->createdSocket, $message);
 
-        if (!$writtenSocket) {
-            return new SocketError('Can\'t write to server socket');
+        if (!$writtenMessage) {
+            return new SocketError('Can\'t write to accepted client socket');
         }
 
-        return $writtenSocket;
+        return $writtenMessage;
+    }
+
+    /**
+     * Call Client destructor method when socket
+     * connection was broken
+     * @return void
+     */ 
+    public function __destruct()
+    {
+        return $this->closeSocketConnection($this->createdSocket);
     }
 }

src/Server.php

@@ -58,4 +58,14 @@ public function write(string $message)
 
         return $writtenMessage;
     }
+
+    /**
+     * Call Server destructor method when socket
+     * connection was broken 
+     * @return void 
+     */ 
+    public function __destruct()
+    {
+        return $this->closeSocketConnection($this->createdSocket);
+    }
 }

src/Socket.php

@@ -27,6 +27,12 @@ class Socket
      */ 
     protected string $content = '';
 
+    protected $clientSocket;
+
+    protected $serverSocket;
+
+    protected $createdSocket;
+
     /**
      * Socket constructor method
      * @param string $host 
@@ -121,7 +127,7 @@ public function connect()
             $this->socket, $this->host, $this->port
         );
 
-        return $this;
+        return $this->socket;
     }
 
     /**
@@ -151,11 +157,12 @@ public function read($socket)
     }
 
     /**
-     * Socket detructor method which 
-     * close current listening socket 
+     * Close specified socket connection
+     * @param resource $socket 
+     * @return void 
      */ 
-    public function __destruct()
+    public function close($socket)
     {
-        socket_close($this->socket);
+        return socket_close($socket);
     }
 }

src/SocketEndpoint.php

@@ -58,7 +58,7 @@ protected function acceptConnectionOnSocket()
      */ 
     protected function connectToSocket()
     {
-        return $this->getSocket()->connect()->getConnectedSocket();
+        return $this->getSocket()->connect();
     }
 
     /**
@@ -81,4 +81,15 @@ protected function readFromSocket($socket)
     {
         return $this->getSocket()->read($socket);
     }
+
+    /**
+     * Close socket connection which was created
+     * acceptSocketConnection() or connectToSocket()
+     * @param resource $socket 
+     * @return void 
+     */ 
+    protected function closeSocketConnection($socket)
+    {
+        return $this->getSocket()->close($socket);
+    }
 }