Insure compatibility with RedisTimeSeries 1.4.2

also bump the default php version to 7.4

Author: palicao

.travis.yml

@@ -1,12 +1,14 @@
 language: php
+dist: bionic
 
 php:
   - 7.2
   - 7.3
   - 7.4
 
 env:
-  - REDIS_HOST=localhost REDIS_TIMESERIES_VERSION=1.2.2
+  - REDIS_HOST=localhost REDIS_TIMESERIES_VERSION=1.2.7
+  - REDIS_HOST=localhost REDIS_TIMESERIES_VERSION=1.4.2
   - REDIS_HOST=localhost REDIS_TIMESERIES_VERSION=edge
 
 jobs:
@@ -25,7 +27,7 @@ before_install:
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
-  - if [ $(phpenv version-name) = "7.4" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$REDIS_TIMESERIES_VERSION" == "1.2.2" ]; then ./cc-test-reporter before-build; fi
+  - if [ $(phpenv version-name) = "7.4" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$REDIS_TIMESERIES_VERSION" == "1.4.2" ]; then ./cc-test-reporter before-build; fi
 
 script:
   - composer install
@@ -35,4 +37,4 @@ script:
 after_script:
   - docker stop redis
   - docker rm redis
-  - if [ $(phpenv version-name) = "7.4" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$REDIS_TIMESERIES_VERSION" == "1.2.2" ]; then ./cc-test-reporter after-build --coverage-input-type clover --id $CC_TEST_REPORTER_ID --exit-code $TRAVIS_TEST_RESULT; fi
+  - if [ $(phpenv version-name) = "7.4" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$REDIS_TIMESERIES_VERSION" == "1.4.2" ]; then ./cc-test-reporter after-build --coverage-input-type clover --id $CC_TEST_REPORTER_ID --exit-code $TRAVIS_TEST_RESULT; fi

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.3-cli
+FROM php:7.4-cli
 ARG DEBIAN_FRONTEND=noninteractive
 WORKDIR /app
 
@@ -11,7 +11,7 @@ RUN pecl install redis && \
     pecl install xdebug && \
     docker-php-ext-enable redis xdebug
 
-RUN wget https://github.com/composer/composer/releases/download/1.9.1/composer.phar -q &&\
+RUN wget https://github.com/composer/composer/releases/download/1.10.10/composer.phar -q &&\
     mv composer.phar /usr/bin/composer && \
     chmod +x /usr/bin/composer
 

README.md

@@ -14,6 +14,11 @@ Use [Redis Time Series](https://oss.redislabs.com/redistimeseries/) in PHP!
 ### Install
 `composer require palicao/php-redis-time-series`
 
+### Requirements
+The library is tested against:
+- PHP 7.2, 7.3 and 7.4
+- RedisTimeSeries 1.2.7 and 1.4.2 (but it should work with any 1.2 and 1.4 version)
+
 ### Construct
 ```
 $ts = new TimeSeries(
@@ -118,6 +123,7 @@ See https://oss.redislabs.com/redistimeseries/commands/#tsrange.
 ### `multiRange` and `multiRangeRaw`
 
 `TimeSeries::multiRange(Filter $filter, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null, ?int $count = null, ?AggregationRule $rule = null): Sample[]`
+
 `TimeSeries::multiRangeRaw(Filter $filter, ?DateTimeInterface $from = null, ?DateTimeInterface $to = null, ?int $count = null, ?AggregationRule $rule = null): array[]`
 
 Similar to `range`, but instead of querying by key, queries for a specific set of labels specified in `$filter`. `multiRangeRaw` will return the raw result from Redis, in order to preserve label information.

docker-compose.yml

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

src/Client/RedisClient.php

@@ -73,6 +73,9 @@ private function connectIfNeeded(): void
     public function executeCommand(array $params)
     {
         $this->connectIfNeeded();
+        // UNDOCUMENTED FEATURE: option 8 is REDIS_OPT_REPLY_LITERAL
+        $value = (PHP_VERSION_ID < 70300) ? '1' : 1;
+        $this->redis->setOption(8, $value);
         return $this->redis->rawCommand(...$params);
     }
 }