Adjustments for test and simplification.

kanata-php · Dec 14, 2023 · 24e242b · 24e242b
1 parent 70dea59
commit 24e242b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 33 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -11,23 +11,16 @@ class Client implements ClientInterface
 {
     protected ?WsClient $client;
 
-    protected string $protocol;
-    protected string $uri;
-    protected int $port;
-    protected string $query;
-    protected ?string $channel;
+    protected string $protocol = 'ws';
+    protected string $uri = '127.0.0.1';
+    protected int $port = 8000;
+    protected string $query = '';
+    protected ?string $channel = null;
 
     /**
      * @var array|null string[]
      */
-    protected ?array $listen;
-
-    /**
-     * Message handler for the whole incoming object.
-     *
-     * @var ?callable
-     */
-    protected $onOpenCallback = null;
+    protected ?array $listen = null;
 
     /**
      * Callback for when the server is disconnecting.
@@ -55,28 +48,28 @@ class Client implements ClientInterface
      *
      * @var int
      */
-    protected $timeout;
+    protected $timeout = -1;
 
     /**
      * Reconnect.
      *
      * @var bool
      */
-    protected bool $reconnect;
+    protected bool $reconnect = false;
 
     /**
      * Reconnection attempts to retry.
      *
      * @var int
      */
-    protected int $reconnectionAttempts;
+    protected int $reconnectionAttempts = 0;
 
     /**
      * Reconnection interval in seconds.
      *
      * @var int
      */
-    protected int $reconnectionInterval;
+    protected int $reconnectionInterval = 2;
 
     /**
      * Reconnection attempts count for control.
@@ -87,20 +80,11 @@ class Client implements ClientInterface
 
     public function __construct(array $options)
     {
-        $this->protocol = $options['protocol'] ?? 'ws';
-        $this->uri = $options['uri'] ?? '127.0.0.1';
-        $this->port = $options['port'] ?? 8000;
-        $this->query = $options['query'] ?? '';
-        $this->channel = $options['channel'] ??  null;
-        $this->listen = $options['listen'] ?? null;
-        $this->onOpenCallback = $options['onOpenCallback'] ?? null;
-        $this->onReadyCallback = $options['onReadyCallback'] ?? null;
-        $this->onMessageCallback = $options['onMessageCallback'] ?? null;
-        $this->onDisconnectCallback = $options['onDisconnectCallback'] ?? null;
-        $this->timeout = $options['timeout'] ?? -1;
-        $this->reconnect = isset($options['reconnect']) ? $options['reconnect'] : false;
-        $this->reconnectionAttempts = $options['reconnectionAttempts'] ?? 0;
-        $this->reconnectionInterval = $options['reconnectionInterval'] ?? 2;
+        foreach ($options as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->{$key} = $value;
+            }
+        }
     }
 
     public function getClient(): ?WsClient

diff --git a/tests/Feature/ClientTest.php b/tests/Feature/ClientTest.php
@@ -274,7 +274,7 @@ public function test_disconnection_callback()
             $client = new Client([
                 'port' => 8585,
                 'onDisconnectCallback' => function(Client $currentClient, $attemptsCount) use ($worker) {
-                    $worker->write('disconnection-callbacl');
+                    $worker->write('disconnection-callback');
                 }
             ]);
             $client->connect();
@@ -285,6 +285,6 @@ public function test_disconnection_callback()
         $result = $process->read();
         Process::kill($pid);
 
-        $this->assertEquals('disconnection-callbacl', $result);
+        $this->assertEquals('disconnection-callback', $result);
     }
 }