Fix offset/count query string params in listArchives()

Author: aiham

src/OpenTok/Util/Client.php

@@ -230,10 +230,17 @@ public function forceDisconnect($sessionId,$connectionId)
     public function listArchives($offset, $count)
     {
         $request = new Request('GET', '/v2/project/'.$this->apiKey.'/archive');
-        if ($offset != 0) $request->getQuery()->set('offset', $offset);
-        if (!empty($count)) $request->getQuery()->set('count', $count);
+        $queryParams = [];
+        if ($offset != 0) {
+          $queryParams['offset'] = $offset;
+        }
+        if (!empty($count)) {
+          $queryParams['count'] = $count;
+        }
         try {
-            $response = $this->client->send($request);
+            $response = $this->client->send($request, [
+              'query' => $queryParams
+            ]);
             $archiveListJson = json_decode($response->getBody(), true);
         } catch (\Exception $e) {
             $this->handleException($e);

tests/OpenTok/OpenTokTest.php

@@ -844,6 +844,42 @@ public function testListsArchives()
         // objects
     }
 
+    public function testListsArchivesWithOffsetAndCount()
+    {
+        // Arrange
+        $this->setupOTWithMocks([[
+            'code' => 200,
+            'headers' => [
+                'Content-Type' => 'application/json'
+            ],
+            'path' => 'v2/project/APIKEY/archive/get_second'
+        ]]);
+
+        // Act
+        $archiveList = $this->opentok->listArchives(1, 1);
+
+        // Assert
+        $this->assertCount(1, $this->historyContainer);
+
+        $request = $this->historyContainer[0]['request'];
+        $this->assertEquals('GET', strtoupper($request->getMethod()));
+        $this->assertEquals('/v2/project/'.$this->API_KEY.'/archive', $request->getUri()->getPath());
+        $this->assertEquals('api.opentok.com', $request->getUri()->getHost());
+        $this->assertEquals('https', $request->getUri()->getScheme());
+
+        $authString = $request->getHeaderLine('X-OPENTOK-AUTH');
+        $this->assertEquals(true, TestHelpers::validateOpenTokAuthHeader($this->API_KEY, $this->API_SECRET, $authString));
+
+        // TODO: test the dynamically built User Agent string
+        $userAgent = $request->getHeaderLine('User-Agent');
+        $this->assertNotEmpty($userAgent);
+        $this->assertStringStartsWith('OpenTok-PHP-SDK/3.1.1', $userAgent);
+
+        $this->assertInstanceOf('OpenTok\ArchiveList', $archiveList);
+        $this->assertEquals(1, $archiveList->totalCount());
+        $this->assertEquals('832641bf-5dbf-41a1-ad94-fea213e59a92', $archiveList->getItems()[0]->id);
+    }
+
     /**
      * @expectedException InvalidArgumentException
      */

tests/mock/v2/project/APIKEY/archive/get_second

@@ -0,0 +1,15 @@
+{
+  "count" : 1,
+  "items" : [ {
+    "createdAt" : 1394321113000,
+    "duration" : 1294,
+    "id" : "832641bf-5dbf-41a1-ad94-fea213e59a92",
+    "name" : "showtime",
+    "partnerId" : 854511,
+    "reason" : "",
+    "sessionId" : "2_MX44NTQ1MTF-flR1ZSBOb3YgMTIgMDk6NDA6NTkgUFNUIDIwMTN-MC43NjU0Nzh-",
+    "size" : 42165242,
+    "status" : "available",
+    "url" : "http://tokbox.com.archive2.s3.amazonaws.com/854511%2F832641bf-5dbf-41a1-ad94-fea213e59a92%2Farchive.mp4?Expires=1394397391&AWSAccessKeyId=AKIAI6LQCPIXYVWCQV6Q&Signature=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+  } ]
+}