Fixes

Author: RobiNN1

src/Config.php

@@ -62,7 +62,7 @@ private static function getEnvConfig(array $config): array {
     }
 
     /**
-     * Convert ENV variable to an array.
+     * Convert an ENV variable to an array.
      *
      * It allows the app to use ENV variables and config.php together.
      *

src/Dashboards/DashboardInterface.php

@@ -15,7 +15,7 @@ interface DashboardInterface {
     public static function check(): bool;
 
     /**
-     * Array that contains key, name, and optionally an icon or colors.
+     * Array that contains a key, name, and optionally an icon or colors.
      *
      * @return array<string, array<int, string>|string>
      */

src/Dashboards/Redis/Compatibility/Cluster/RedisCluster.php

@@ -195,7 +195,7 @@ public function size(string $key): int {
     /**
      * @throws RedisClusterException
      */
-    public function flushDatabase(): mixed {
+    public function flushDatabase(): bool {
         $nodes = $this->_masters();
 
         foreach ($nodes as $node) {

src/Dashboards/Redis/Compatibility/Predis.php

@@ -174,8 +174,8 @@ public function size(string $key): int {
         return is_int($size) ? $size : 0;
     }
 
-    public function flushDatabase(): mixed {
-        return $this->flushdb();
+    public function flushDatabase(): bool {
+        return (string) $this->flushdb() === 'OK';
     }
 
     public function databaseSize(): int {

src/Dashboards/Redis/Compatibility/Redis.php

@@ -30,7 +30,7 @@ class Redis extends \Redis implements RedisCompatibilityInterface {
     ];
 
     /**
-     * @param array<string, int|string> $server
+     * @param array<string, mixed> $server
      *
      * @throws DashboardException
      */

src/Dashboards/Redis/Compatibility/RedisCompatibilityInterface.php

@@ -68,7 +68,7 @@ public function size(string $key): int;
     /**
      * Alias to a flushDB().
      */
-    public function flushDatabase(): mixed;
+    public function flushDatabase(): bool;
 
     /**
      * Alias to a dbSize().

src/Dashboards/Redis/Compatibility/RedisJson.php

@@ -8,18 +8,18 @@
 
 namespace RobiNN\Pca\Dashboards\Redis\Compatibility;
 
-use RedisException;
+use Exception;
 
 trait RedisJson {
     /**
-     * @throws RedisException
+     * @throws Exception
      */
     public function jsonGet(string $key): string {
         return $this->rawCommand('JSON.GET', $key);
     }
 
     /**
-     * @throws RedisException
+     * @throws Exception
      */
     public function jsonSet(string $key, mixed $value): bool {
         $raw = $this->rawCommand('JSON.SET', $key, '$', $value);

tests/Dashboards/Redis/PredisTest.php

@@ -12,9 +12,15 @@
 
 class PredisTest extends RedisTestCase {
     public static function setUpBeforeClass(): void {
+        parent::setUpBeforeClass();
+
         if (!class_exists(Client::class)) {
             self::markTestSkipped('Predis is not installed. Skipping tests.');
         }
+
+        if (self::$is_cluster) {
+            self::markTestSkipped('There is currently no support for clusters with Predis. Skipping tests.');
+        }
     }
 
     protected string $client = 'predis';

tests/Dashboards/Redis/RedisTestCase.php

@@ -30,7 +30,13 @@ abstract class RedisTestCase extends TestCase {
 
     protected string $client;
 
-    protected bool $is_cluster = false;
+    protected static bool $is_cluster = false;
+
+    public static function setUpBeforeClass(): void {
+        parent::setUpBeforeClass();
+
+        self::$is_cluster = !empty(Config::get('redis')[0]['nodes']);
+    }
 
     /**
      * @throws DashboardException
@@ -39,10 +45,8 @@ protected function setUp(): void {
         $this->template = new Template();
         $this->dashboard = new RedisDashboard($this->template, $this->client);
 
-        $this->is_cluster = !empty(getenv('CLUSTER'));
-
-        if ($this->is_cluster) {
-            $config = ['nodes' => ['127.0.0.1:6380', '127.0.0.1:6381', '127.0.0.1:6382']];
+        if (self::$is_cluster) {
+            $config = ['nodes' => Config::get('redis')[0]['nodes']];
         } else {
             $config = [
                 'host'     => Config::get('redis')[0]['host'],