Merge pull request #52 from MacFJA/phpredis-raw-command-issue-46

Set option to Phpredis to return raw response

Author: MacFJA

CHANGELOG.md

@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Missing default values on highlight option ([Issue#38])
 - Don't throw an exception if the result of the index definition is incorrect ([Issue#46])
+- Phpredis extension don't return raw response ([Issue#46])
 
 ### Changed
 

phpstan.neon

@@ -3,6 +3,8 @@ parameters:
     paths:
         - src
         - tests
+    stubFiles:
+        - vendor/ukko/phpredis-phpdoc/src/Redis.php
     excludePaths:
         analyse:
             - tests/psalm/stubs/phpiredis.php

src/Redis/Client/PhpredisClient.php

@@ -40,7 +40,7 @@ private function __construct(Redis $redis)
     {
         if (!static::supports($redis)) {
             throw new RuntimeException($this->getMissingMessage('phpredis', true, [
-                Redis::class => ['rawCommand', 'multi', 'exec'],
+                Redis::class => ['rawCommand', 'multi', 'exec', 'getOption', 'setOption'],
             ]));
         }
         $this->redis = $redis;
@@ -49,13 +49,19 @@ private function __construct(Redis $redis)
     public function execute(Command $command)
     {
         $arguments = $command->getArguments();
+
+        $originalValue = $this->redis->getOption(Redis::OPT_REPLY_LITERAL) ?? false;
+        $this->redis->setOption(Redis::OPT_REPLY_LITERAL, true);
+
         if (0 === count($arguments)) {
             /** @psalm-suppress TooFewArguments */
             $rawResponse = $this->redis->rawCommand($command->getId());
         } else {
             $rawResponse = $this->redis->rawCommand($command->getId(), ...$arguments);
         }
 
+        $this->redis->setOption(Redis::OPT_REPLY_LITERAL, $originalValue);
+
         return $command->parseResponse($rawResponse);
     }
 
@@ -64,6 +70,8 @@ public static function supports($redis): bool
         return $redis instanceof Redis
             && method_exists($redis, 'rawCommand')
             && method_exists($redis, 'multi')
+            && method_exists($redis, 'setOption')
+            && method_exists($redis, 'getOption')
             && method_exists($redis, 'exec');
     }