Refactoring - Extract Socket Trait

svilborg · Jul 16, 2019 · 8a679ed · 8a679ed
1 parent 7b92263
commit 8a679ed
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 deletions.
diff --git a/src/Checks/Network/Tcp.php b/src/Checks/Network/Tcp.php
@@ -2,10 +2,14 @@
 namespace Health\Checks\Network;
 
 use Health\Checks\HealthCheckInterface;
+use Health\Checks\BaseCheck;
+use Health\Checks\Traits\SocketTrait;
 
-class Tcp extends Socket implements HealthCheckInterface
+class Tcp extends BaseCheck implements HealthCheckInterface
 {
 
+    use SocketTrait;
+
     /**
      *
      * {@inheritdoc}

diff --git a/src/Checks/Network/Tcp6.php b/src/Checks/Network/Tcp6.php
@@ -2,9 +2,12 @@
 namespace Health\Checks\Network;
 
 use Health\Checks\HealthCheckInterface;
+use Health\Checks\BaseCheck;
+use Health\Checks\Traits\SocketTrait;
 
-class Tcp6 extends Socket implements HealthCheckInterface
+class Tcp6 extends BaseCheck implements HealthCheckInterface
 {
+    use SocketTrait;
 
     /**
      *

diff --git a/src/Checks/Network/Udp.php b/src/Checks/Network/Udp.php
@@ -2,9 +2,12 @@
 namespace Health\Checks\Network;
 
 use Health\Checks\HealthCheckInterface;
+use Health\Checks\BaseCheck;
+use Health\Checks\Traits\SocketTrait;
 
-class Udp extends Socket implements HealthCheckInterface
+class Udp extends BaseCheck implements HealthCheckInterface
 {
+    use SocketTrait;
 
     /**
      *

diff --git a/src/Checks/Network/Udp6.php b/src/Checks/Network/Udp6.php
@@ -2,9 +2,12 @@
 namespace Health\Checks\Network;
 
 use Health\Checks\HealthCheckInterface;
+use Health\Checks\BaseCheck;
+use Health\Checks\Traits\SocketTrait;
 
-class Udp6 extends Socket implements HealthCheckInterface
+class Udp6 extends BaseCheck implements HealthCheckInterface
 {
+    use SocketTrait;
 
     /**
      *

diff --git a/src/Checks/Network/Unix.php b/src/Checks/Network/Unix.php
@@ -2,9 +2,12 @@
 namespace Health\Checks\Network;
 
 use Health\Checks\HealthCheckInterface;
+use Health\Checks\BaseCheck;
+use Health\Checks\Traits\SocketTrait;
 
-class Unix extends Socket implements HealthCheckInterface
+class Unix extends BaseCheck implements HealthCheckInterface
 {
+    use SocketTrait;
 
     /**
      *

diff --git a/src/Checks/Network/Socket.php → src/Checks/Traits/SocketTrait.php b/src/Checks/Network/Socket.php → src/Checks/Traits/SocketTrait.php
@@ -1,29 +1,23 @@
 <?php
-namespace Health\Checks\Network;
+namespace Health\Checks\Traits;
 
-use Health\Checks\BaseCheck;
-use Health\Checks\HealthCheckInterface;
-
-class Socket extends BaseCheck implements HealthCheckInterface
+trait SocketTrait
 {
 
-    protected $resource = null;
-
     /**
+     * Socket resource
      *
-     * {@inheritdoc}
-     * @see \Health\Checks\HealthCheckInterface::call()
+     * @var resource
      */
-    public function call()
-    {
-        return null;
-    }
+    protected $resource = null;
 
     /**
      *
      * @param int $domain
      * @param int $type
      * @param int $protocol
+     *
+     * @return resource
      */
     protected function create($domain, $type, $protocol)
     {
@@ -61,7 +55,7 @@ protected function connect($address)
     }
 
     /**
-     * Close Socket
+     * Close SocketTrait
      */
     protected function close()
     {