wamp

Author: ASKozienko

Tests/Spec/JsonSerializerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Wamp\Tests;
+namespace Enqueue\Wamp\Tests\Spec;
 
 use Enqueue\Wamp\JsonSerializer;
 use Enqueue\Wamp\Serializer;

WampContext.php

@@ -31,19 +31,9 @@ class WampContext implements Context
      */
     private $clientFactory;
 
-    public function __construct($client)
+    public function __construct(callable $clientFactory)
     {
-        if ($client instanceof Client) {
-            $this->client = $client;
-        } elseif (is_callable($client)) {
-            $this->clientFactory = $client;
-        } else {
-            throw new \InvalidArgumentException(sprintf(
-                'The $client argument must be either %s or callable that returns %s once called.',
-                Client::class,
-                Client::class
-            ));
-        }
+        $this->clientFactory = $clientFactory;
 
         $this->setSerializer(new JsonSerializer());
     }
@@ -93,10 +83,6 @@ public function purgeQueue(Queue $queue): void
     public function close(): void
     {
         foreach ($this->clients as $client) {
-            if (null === $client) {
-                return;
-            }
-
             if (null === $client->getSession()) {
                 return;
             }

WampSubscriptionConsumer.php

@@ -61,7 +61,7 @@ public function consume(int $timeout = 0): void
             $this->client->on('open', function (ClientSession $session) {
 
                 foreach ($this->subscribers as $queue => $subscriber) {
-                    $session->subscribe($queue, function ($args) use ($subscriber, $session) {
+                    $session->subscribe($queue, function ($args) use ($subscriber) {
                         $message = $this->context->getSerializer()->toMessage($args[0]);
 
                         /**