refactor: replase universal getOption() to simple getPrefix()

Author: mtk3d

src/Prometheus/Storage/AbstractRedis.php

@@ -57,8 +57,8 @@ public function wipeStorage(): void
 
         $searchPattern = '';
 
-        $globalPrefix = $this->redis->getOption(RedisClient::OPT_PREFIX);
-        if (is_string($globalPrefix)) {
+        $globalPrefix = $this->redis->getPrefix();
+        if ($globalPrefix !== null) {
             $searchPattern .= $globalPrefix;
         }
 
@@ -371,11 +371,13 @@ protected function collectHistograms(): array
 
     protected function removePrefixFromKey(string $key): string
     {
-        if ($this->redis->getOption(RedisClient::OPT_PREFIX) === null) {
+        $prefix = $this->redis->getPrefix();
+
+        if ($prefix === null) {
             return $key;
         }
 
-        return substr($key, strlen($this->redis->getOption(RedisClient::OPT_PREFIX)));
+        return substr($key, strlen($prefix));
     }
 
     /**

src/Prometheus/Storage/RedisClients/PHPRedis.php

@@ -8,10 +8,6 @@
 
 class PHPRedis implements RedisClient
 {
-    private const OPTIONS_MAP = [
-        RedisClient::OPT_PREFIX => \Redis::OPT_PREFIX,
-    ];
-
     /**
      * @var \Redis
      */
@@ -57,13 +53,9 @@ public static function fromExistingConnection(\Redis $redis, array $options): se
         return $self;
     }
 
-    public function getOption(string $option): mixed
+    public function getPrefix(): ?string
     {
-        if (!isset(self::OPTIONS_MAP[$option])) {
-            return null;
-        }
-
-        return $this->redis->getOption(self::OPTIONS_MAP[$option]);
+        return $this->redis->getOption(\Redis::OPT_PREFIX) ?: null;
     }
 
     public function eval(string $script, array $args = [], int $num_keys = 0): void

src/Prometheus/Storage/RedisClients/Predis.php

@@ -10,10 +10,6 @@
 
 class Predis implements RedisClient
 {
-    private const OPTIONS_MAP = [
-        RedisClient::OPT_PREFIX => 'prefix',
-    ];
-
     private Client $client;
 
     public function __construct(Client $client)
@@ -40,18 +36,13 @@ public static function fromExistingConnection(Client $client): self
         return new self($client);
     }
 
-    public function getOption(string $option): mixed
+    public function getPrefix(): ?string
     {
-        if (! isset(self::OPTIONS_MAP[$option])) {
-            return null;
-        }
-
-        $mappedOption = self::OPTIONS_MAP[$option];
-        $value = $this->client->getOptions()->$mappedOption;
+        $value = $this->client->getOptions()->prefix;
 
         return $value instanceof \Predis\Command\Processor\KeyPrefixProcessor
             ? $value->getPrefix()
-            : $value;
+            : null;
     }
 
     public function eval(string $script, array $args = [], int $num_keys = 0): void

src/Prometheus/Storage/RedisClients/RedisClient.php

@@ -6,9 +6,7 @@
 
 interface RedisClient
 {
-    public const OPT_PREFIX = 'prefix';
-
-    public function getOption(string $option): mixed;
+    public function getPrefix(): ?string;
 
     /**
      * @param  mixed[]  $args