Merge pull request #53 from MacFJA/handle-protected-command-pr-42

Handle protected command

Author: MacFJA

CHANGELOG.md

@@ -24,6 +24,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])
+- Error with version reading if `MODULE LIST` command is protected ([PR#42])
 
 ### Changed
 
@@ -247,3 +248,4 @@ First version
 [PR#14]: https://github.com/MacFJA/php-redisearch/pull/14
 [PR#15]: https://github.com/MacFJA/php-redisearch/pull/15
 [PR#17]: https://github.com/MacFJA/php-redisearch/pull/17
+[PR#42]: https://github.com/MacFJA/php-redisearch/pull/42

src/Redis/Initializer.php

@@ -52,6 +52,7 @@
 use MacFJA\RediSearch\Redis\Command\TagVals;
 use Predis\Profile\RedisProfile;
 use Rediska_Commands;
+use Throwable;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -139,7 +140,15 @@ public static function registerCommandsRediska(): void
 
     public static function getRediSearchVersion(Client $client): ?string
     {
-        $modules = $client->executeRaw('module', 'list') ?? [];
+        try {
+            $modules = $client->executeRaw('module', 'list') ?? [];
+        } catch (Throwable $exception) {
+            if (false === stripos($exception->getMessage(), 'unknown command')) {
+                throw $exception;
+            }
+
+            return null;
+        }
 
         foreach ($modules as $module) {
             $data = array_column(

tests/fixes/PR42Test.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Copyright MacFJA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace MacFJA\RediSearch\tests\fixes;
+
+use Exception;
+use MacFJA\RediSearch\Redis\Client;
+use MacFJA\RediSearch\Redis\Initializer;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @covers \MacFJA\RediSearch\Redis\Initializer
+ *
+ * @internal
+ */
+class PR42Test extends TestCase
+{
+    public function testUnavailableCommand(): void
+    {
+        $client = $this->createMock(Client::class);
+        $client->method('executeRaw')->willThrowException(new Exception('ERR unknown command `module`, with args beginning with: `list`'));
+
+        $response = Initializer::getRediSearchVersion($client);
+
+        static::assertNull($response);
+    }
+
+    public function testUnknownError(): void
+    {
+        $this->expectException(Exception::class);
+
+        $client = $this->createMock(Client::class);
+        $client->method('executeRaw')->willThrowException(new Exception('ERR unknown server error'));
+
+        Initializer::getRediSearchVersion($client);
+    }
+}