Merge pull request #12 from clue-labs/qvariant

Update clue/qdatastream to v0.5.0

Author: clue

composer.json

@@ -19,7 +19,7 @@
         "react/socket-client": "~0.4.0|~0.3.0",
         "react/dns": "~0.4.0|~0.3.0",
         "react/promise": "~2.0|~1.0",
-        "clue/qdatastream": "~0.4.0"
+        "clue/qdatastream": "~0.5.0"
     },
     "require-dev": {
         "clue/block-react": "~0.1.0"

src/Client.php

@@ -10,6 +10,7 @@
 use Evenement\EventEmitter;
 use React\Promise\Deferred;
 use Clue\QDataStream\Types;
+use Clue\QDataStream\QVariant;
 
 class Client extends EventEmitter
 {
@@ -124,27 +125,27 @@ public function sendHeartBeatRequest(\DateTime $dt)
         // TODO: legacy protocol uses a QTime, datastream protocol QDateTime
         $this->send($this->protocol->writeVariantList(array(
             Protocol::REQUEST_HEARTBEAT,
-            $dt
-        ), array(1 => Types::TYPE_QTIME)));
+            new QVariant($dt, Types::TYPE_QTIME)
+        )));
     }
 
     public function sendHeartBeatReply(\DateTime $dt)
     {
         // TODO: legacy protocol uses a QTime, datastream protocol QDateTime
         $this->send($this->protocol->writeVariantList(array(
             Protocol::REQUEST_HEARTBEATREPLY,
-            $dt
-        ), array(1 => Types::TYPE_QTIME)));
+            new QVariant($dt, Types::TYPE_QTIME)
+        )));
     }
 
     public function sendBufferInput($bufferInfo, $input)
     {
         $this->send($this->protocol->writeVariantList(array(
             Protocol::REQUEST_RPCCALL,
             "2sendInput(BufferInfo,QString)",
-            $bufferInfo,
+            new QVariant($bufferInfo, 'BufferInfo'),
             (string)$input
-        ), array(2 => 'BufferInfo')));
+        )));
     }
 
     public function sendBufferRequestBacklog($bufferId, $maxAmount, $messageIdFirst = -1, $messageIdLast = -1)
@@ -154,12 +155,12 @@ public function sendBufferRequestBacklog($bufferId, $maxAmount, $messageIdFirst
             "BacklogManager",
             "",
             "requestBacklog",
-            (int)$bufferId,
-            (int)$messageIdFirst,
-            (int)$messageIdLast,
+            new QVariant($bufferId, 'BufferId'),
+            new QVariant($messageIdFirst, 'MsgId'),
+            new QVariant($messageIdLast, 'MsgId'),
             (int)$maxAmount,
             0
-        ), array(4 => 'BufferId', 5 => 'MsgId', 6 => 'MsgId')));
+        )));
     }
 
     public function sendBufferRequestRemove($bufferId)
@@ -168,9 +169,9 @@ public function sendBufferRequestRemove($bufferId)
             Protocol::REQUEST_SYNC,
             "BufferSyncer",
             "",
-            "requestRemoveBuffer",
-            $bufferId
-        ), array(3 => Types::TYPE_QBYTE_ARRAY, 4 => 'BufferId')));
+            new QVariant("requestRemoveBuffer", Types::TYPE_QBYTE_ARRAY),
+            new QVariant($bufferId, 'BufferId')
+        )));
     }
 
     public function sendBufferRequestMarkAsRead($bufferId)
@@ -179,9 +180,9 @@ public function sendBufferRequestMarkAsRead($bufferId)
             Protocol::REQUEST_SYNC,
             "BufferSyncer",
             "",
-            "requestMarkBufferAsRead",
-            $bufferId
-        ), array(3 => Types::TYPE_QBYTE_ARRAY, 4 => 'BufferId')));
+            new QVariant("requestMarkBufferAsRead", Types::TYPE_QBYTE_ARRAY),
+            new QVariant($bufferId, 'BufferId')
+        )));
     }
 
     public function sendBufferRequestSetLastSeenMessage($bufferId, $messageId)
@@ -190,10 +191,10 @@ public function sendBufferRequestSetLastSeenMessage($bufferId, $messageId)
             Protocol::REQUEST_SYNC,
             "BufferSyncer",
             "",
-            "requestSetLastSeenMsg",
-            $bufferId,
-            $messageId
-        ), array(3 => Types::TYPE_QBYTE_ARRAY, 4 => 'BufferId', 5 => 'MsgId')));
+            new QVariant("requestSetLastSeenMsg", Types::TYPE_QBYTE_ARRAY),
+            new QVariant($bufferId, 'BufferId'),
+            new QVariant($messageId, 'MsgId')
+        )));
     }
 
     public function sendBufferRequestSetMarkerLine($bufferId, $messageId)
@@ -202,10 +203,10 @@ public function sendBufferRequestSetMarkerLine($bufferId, $messageId)
             Protocol::REQUEST_SYNC,
             "BufferSyncer",
             "",
-            "requestSetMarkerLine",
-            $bufferId,
-            $messageId
-        ), array(3 => Types::TYPE_QBYTE_ARRAY, 4 => 'BufferId', 5 => 'MsgId')));
+            new QVariant("requestSetMarkerLine", Types::TYPE_QBYTE_ARRAY),
+            new QVariant($bufferId, 'BufferId'),
+            new QVariant($messageId, 'MsgId')
+        )));
     }
 
     public function sendNetworkRequestConnect($networkId)
@@ -214,8 +215,8 @@ public function sendNetworkRequestConnect($networkId)
             Protocol::REQUEST_SYNC,
             "Network",
             (string)$networkId,
-            "requestConnect"
-        ), array(3 => Types::TYPE_QBYTE_ARRAY)));
+            new QVariant("requestConnect", Types::TYPE_QBYTE_ARRAY)
+        )));
     }
 
     public function sendNetworkRequestDisconnect($networkId)
@@ -224,8 +225,8 @@ public function sendNetworkRequestDisconnect($networkId)
             Protocol::REQUEST_SYNC,
             "Network",
             (string)$networkId,
-            "requestDisconnect"
-        ), array(3 => Types::TYPE_QBYTE_ARRAY)));
+            new QVariant("requestDisconnect", Types::TYPE_QBYTE_ARRAY)
+        )));
     }
 
     public function close()