bump to 1.2.2 and prepare for future changes to TS.MGET (palicao#12)

Author: palicao

docker-compose.yml

@@ -11,4 +11,4 @@ services:
       - .:/app
   redis:
     container_name: redis
-    image: redislabs/redistimeseries:1.2.1
+    image: redislabs/redistimeseries:1.2.2

src/TimeSeries.php

@@ -337,7 +337,12 @@ public function getLastSamples(Filter $filter): array
         );
         $samples = [];
         foreach ($results as $result) {
-            $samples[] = Sample::createFromTimestamp($result[0], (float)$result[3], (int)$result[2]);
+            // most recent versions of TS.MGET return results in a nested array
+            if (count($result) === 3) {
+                $samples[] = Sample::createFromTimestamp($result[0], (float)$result[2][1], (int)$result[2][0]);
+            } else {
+                $samples[] = Sample::createFromTimestamp($result[0], (float)$result[3], (int)$result[2]);
+            }
         }
         return $samples;
     }

tests/Integration/IntegrationTest.php

@@ -35,8 +35,8 @@ public function setUp(): void
 
     public function testAddAndRetrieveAsRange(): void
     {
-        $from = new DateTimeImmutable('2019-11-06 20:34:17.103000');
-        $to = new DateTimeImmutable('2019-11-06 20:34:17.107000');
+        $from = new DateTimeImmutable('2019-11-06 20:34:17.000');
+        $to = new DateTimeImmutable('2019-11-06 20:34:17.100');
 
         $this->sut->create(
             'temperature:3:11',
@@ -51,21 +51,21 @@ public function testAddAndRetrieveAsRange(): void
             $from,
             $to,
             null,
-            new AggregationRule(AggregationRule::AGG_AVG, 5)
+            new AggregationRule(AggregationRule::AGG_AVG, 10)
         );
 
         $expectedRange = [
-            new Sample('temperature:3:11', 30, new DateTimeImmutable('2019-11-06 20:34:17.100000')),
-            new Sample('temperature:3:11', 42, new DateTimeImmutable('2019-11-06 20:34:17.105000'))
+            new Sample('temperature:3:11', 30, new DateTimeImmutable('2019-11-06 20:34:17.000')),
+            new Sample('temperature:3:11', 42, new DateTimeImmutable('2019-11-06 20:34:17.100'))
         ];
 
         $this->assertEquals($expectedRange, $range);
     }
 
     public function testAddAndRetrieveAsMultiRangeWithMultipleFilters(): void
     {
-        $from = new DateTimeImmutable('2019-11-06 20:34:17.103000');
-        $to = new DateTimeImmutable('2019-11-06 20:34:17.107000');
+        $from = new DateTimeImmutable('2019-11-06 20:34:17.000');
+        $to = new DateTimeImmutable('2019-11-06 20:34:17.100');
 
         $this->sut->create(
             'temperature:3:11',
@@ -81,17 +81,17 @@ public function testAddAndRetrieveAsMultiRangeWithMultipleFilters(): void
         $range = $this->sut->multiRange($filter);
 
         $expectedRange = [
-            new Sample('temperature:3:11', 30, new DateTimeImmutable('2019-11-06 20:34:17.103000')),
-            new Sample('temperature:3:11', 42, new DateTimeImmutable('2019-11-06 20:34:17.107000'))
+            new Sample('temperature:3:11', 30, new DateTimeImmutable('2019-11-06 20:34:17.000')),
+            new Sample('temperature:3:11', 42, new DateTimeImmutable('2019-11-06 20:34:17.100'))
         ];
 
         $this->assertEquals($expectedRange, $range);
     }
 
     public function testAddAndRetrieveAsLastSamplesWithMultipleFilters(): void
     {
-        $from = new DateTimeImmutable('2019-11-06 20:34:17.103000');
-        $to = new DateTimeImmutable('2019-11-06 20:34:17.107000');
+        $from = new DateTimeImmutable('2019-11-06 20:34:17.000');
+        $to = new DateTimeImmutable('2019-11-06 20:34:18.000');
 
         $this->sut->create(
             'temperature:3:11',
@@ -115,17 +115,17 @@ public function testAddAndRetrieveAsLastSamplesWithMultipleFilters(): void
         $range = $this->sut->getLastSamples($filter);
 
         $expectedResult = [
-            new Sample('temperature:3:11', 42, new DateTimeImmutable('2019-11-06 20:34:17.107000')),
-            new Sample('temperature:3:12', 42, new DateTimeImmutable('2019-11-06 20:34:17.107000'))
+            new Sample('temperature:3:11', 42, new DateTimeImmutable('2019-11-06 20:34:18.000')),
+            new Sample('temperature:3:12', 42, new DateTimeImmutable('2019-11-06 20:34:18.000'))
         ];
 
         $this->assertEquals($expectedResult, $range);
     }
 
     public function testAddAndRetrieveKeysWithMultipleFilters(): void
     {
-        $from = new DateTimeImmutable('2019-11-06 20:34:17.103000');
-        $to = new DateTimeImmutable('2019-11-06 20:34:17.107000');
+        $from = new DateTimeImmutable('2019-11-06 20:34:17.000');
+        $to = new DateTimeImmutable('2019-11-06 20:34:17.100');
 
         $this->sut->create(
             'temperature:3:11',