Added abstract connection class and unified code

Author: stefanak-michal

src/connection/AConnection.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Bolt\connection;
+
+/**
+ * Class AConnection
+ *
+ * @author Michal Stefanak
+ * @link https://github.com/stefanak-michal/Bolt
+ * @package Bolt\connection
+ */
+abstract class AConnection implements IConnection
+{
+
+    /**
+     * @var string
+     */
+    protected $ip;
+
+    /**
+     * @var int
+     */
+    protected $port;
+
+    /**
+     * @var int
+     */
+    protected $timeout;
+
+    /**
+     * AConnection constructor.
+     * @param string $ip
+     * @param int $port
+     * @param int $timeout
+     */
+    public function __construct(string $ip = '127.0.0.1', int $port = 7687, int $timeout = 15)
+    {
+        $this->ip = $ip;
+        $this->port = $port;
+        $this->timeout = $timeout;
+    }
+
+    /**
+     * Print buffer as HEX
+     * @param string $str
+     * @param bool $write
+     */
+    protected function printHex(string $str, bool $write = true)
+    {
+        $str = implode(unpack('H*', $str));
+        echo '<pre>';
+        echo $write ? '> ' : '< ';
+        foreach (str_split($str, 8) as $chunk) {
+            echo implode(' ', str_split($chunk, 2));
+            echo '    ';
+        }
+        echo '</pre>';
+    }
+}

src/connection/Socket.php

@@ -12,53 +12,25 @@
  * @link https://github.com/stefanak-michal/Bolt
  * @package Bolt\connection
  */
-class Socket implements IConnection
+class Socket extends AConnection
 {
 
-    /**
-     * @var string
-     */
-    private $ip;
-
-    /**
-     * @var int
-     */
-    private $port;
-
-    /**
-     * @var int
-     */
-    private $timeout;
-
     /**
      * @var resource
      */
     private $socket;
 
-    /**
-     * @param string $ip
-     * @param int $port
-     * @param int $timeout
-     * @throws Exception
-     */
-    public function __construct(string $ip = '127.0.0.1', int $port = 7687, int $timeout = 15)
-    {
-        if (!extension_loaded('sockets')) {
-            Bolt::error('PHP Extension sockets not enabled');
-        }
-
-        $this->ip = $ip;
-        $this->port = $port;
-        $this->timeout = $timeout;
-    }
-
     /**
      * Create socket connection
      * @return bool
      * @throws Exception
      */
     public function connect(): bool
     {
+        if (!extension_loaded('sockets')) {
+            throw new ConnectException('PHP Extension sockets not enabled');
+        }
+
         $this->socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
         if (!is_resource($this->socket)) {
             Bolt::error('Cannot create socket');
@@ -147,23 +119,6 @@ public function read(int $length = 2048): string
         return $output;
     }
 
-    /**
-     * Print buffer as HEX
-     * @param string $str
-     * @param bool $write
-     */
-    private function printHex(string $str, bool $write = true)
-    {
-        $str = implode(unpack('H*', $str));
-        echo '<pre>';
-        echo $write ? '> ' : '< ';
-        foreach (str_split($str, 8) as $chunk) {
-            echo implode(' ', str_split($chunk, 2));
-            echo '    ';
-        }
-        echo '</pre>';
-    }
-
     /**
      * Close socket connection
      */

src/connection/StreamSocket.php

@@ -13,24 +13,9 @@
  * @link https://github.com/stefanak-michal/Bolt
  * @package Bolt\connection
  */
-class StreamSocket implements IConnection
+class StreamSocket extends AConnection
 {
 
-    /**
-     * @var string
-     */
-    private $ip;
-
-    /**
-     * @var int
-     */
-    private $port;
-
-    /**
-     * @var int
-     */
-    private $timeout;
-
     /**
      * @var array
      */
@@ -41,19 +26,6 @@ class StreamSocket implements IConnection
      */
     private $stream;
 
-    /**
-     * StreamSocket constructor.
-     * @param string $ip
-     * @param int $port
-     * @param int $timeout
-     */
-    public function __construct(string $ip = '127.0.0.1', int $port = 7687, int $timeout = 15)
-    {
-        $this->ip = $ip;
-        $this->port = $port;
-        $this->timeout = $timeout;
-    }
-
     /**
      * Set SSL Context options
      * @link https://www.php.net/manual/en/context.ssl.php
@@ -142,21 +114,4 @@ public function disconnect()
             stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);
     }
 
-    /**
-     * Print buffer as HEX
-     * @param string $str
-     * @param bool $write
-     */
-    private function printHex(string $str, bool $write = true)
-    {
-        $str = implode(unpack('H*', $str));
-        echo '<pre>';
-        echo $write ? '> ' : '< ';
-        foreach (str_split($str, 8) as $chunk) {
-            echo implode(' ', str_split($chunk, 2));
-            echo '    ';
-        }
-        echo '</pre>';
-    }
-
 }