chore: Update type hints to quiet psalm

Author: keelerm84

.github/workflows/ci.yml

@@ -20,6 +20,7 @@ jobs:
           - 6379:6379
 
     strategy:
+      fail-fast: false
       matrix:
         include:
           # 8.1 configurations

.gitignore

@@ -7,3 +7,4 @@ docs/build
 docs/.phpdoc
 phpunit/
 .phpunit.result.cache
+.php-cs-fixer.cache

composer.json

@@ -21,6 +21,7 @@
     ],
     "require": {
         "php": ">=8.1",
+        "ext-redis": "*",
         "launchdarkly/server-sdk": ">=6.3.0 <7.0.0"
     },
     "require-dev": {

src/LaunchDarkly/Impl/Integrations/PHPRedisFeatureRequester.php

@@ -2,32 +2,33 @@
 
 namespace LaunchDarkly\Impl\Integrations;
 
+use Redis;
+
 /**
  * @internal
  */
 class PHPRedisFeatureRequester extends FeatureRequesterBase
 {
-    /** @var array */
-    private $_redisOptions;
-    /** @var \Redis */
-    private $_redisInstance;
-    /** @var string */
-    private $_prefix;
+    private ?array $redisOptions = null;
+    private ?Redis $redisInstance = null;
+    private ?string $prefix;
 
-    public function __construct($baseUri, $sdkKey, $options)
+    public function __construct(string $baseUri, string $sdkKey, array $options)
     {
         parent::__construct($baseUri, $sdkKey, $options);
 
-        $this->_prefix = $options['redis_prefix'] ?? null;
-        if ($this->_prefix === null || $this->_prefix === '') {
-            $this->_prefix = 'launchdarkly';
+        /** @var ?string **/
+        $this->prefix = $options['redis_prefix'] ?? null;
+        if ($this->prefix === null || $this->prefix === '') {
+            $this->prefix = 'launchdarkly';
         }
 
+        /** @var ?Redis */
         $client = $this->_options['phpredis_client'] ?? null;
-        if ($client instanceof \Redis) {
-            $this->_redisInstance = $client;
+        if ($client instanceof Redis) {
+            $this->redisInstance = $client;
         } else {
-            $this->_redisOptions = [
+            $this->redisOptions = [
                 "timeout" => $options['redis_timeout'] ?? 5,
                 "host" => $options['redis_host'] ?? 'localhost',
                 "port" => $options['redis_port'] ?? 6379,
@@ -39,37 +40,34 @@ public function __construct($baseUri, $sdkKey, $options)
     protected function readItemString(string $namespace, string $key): ?string
     {
         $redis = $this->getConnection();
-        return $redis->hget("$this->_prefix:$namespace", $key);
+        return $redis->hget("$this->prefix:$namespace", $key);
     }
 
     protected function readItemStringList(string $namespace): ?array
     {
         $redis = $this->getConnection();
-        $raw = $redis->hgetall("$this->_prefix:$namespace");
+        $raw = $redis->hgetall("$this->prefix:$namespace");
         return $raw ? array_values($raw) : null;
     }
 
-    /**
-     * @return \Redis
-     */
-    protected function getConnection()
+    protected function getConnection(): Redis
     {
-        if ($this->_redisInstance instanceof \Redis) {
-            return $this->_redisInstance;
+        if ($this->redisInstance instanceof Redis) {
+            return $this->redisInstance;
         }
 
-        $redis = new \Redis();
+        $redis = new Redis();
         $redis->pconnect(
-            $this->_redisOptions["host"],
-            $this->_redisOptions["port"],
-            $this->_redisOptions["timeout"],
+            $this->redisOptions["host"],
+            $this->redisOptions["port"],
+            $this->redisOptions["timeout"],
             'launchdarkly/php-server-sdk-redis-phpredis'
         );
 
-        if ($this->_redisOptions['password']) {
-            $redis->auth($this->_redisOptions['password']);
+        if ($this->redisOptions['password']) {
+            $redis->auth($this->redisOptions['password']);
         }
 
-        return $this->_redisInstance = $redis;
+        return $this->redisInstance = $redis;
     }
 }

src/LaunchDarkly/Integrations/PHPRedis.php

@@ -39,7 +39,7 @@ public static function featureRequester($options = [])
             throw new \RuntimeException("phpredis extension is required to use Integrations\\PHPRedis");
         }
 
-        return function ($baseUri, $sdkKey, $baseOptions) use ($options) {
+        return function (string $baseUri, string $sdkKey, array $baseOptions) use ($options) {
             return new PHPRedisFeatureRequester($baseUri, $sdkKey, array_merge($baseOptions, $options));
         };
     }