From cc40af30db2e5c3be804bceae65c38d5e0a50ddb Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 27 Jul 2023 17:56:02 +0200
Subject: [PATCH] Fix arginfo for arguments that default to null

---
 redis.stub.php           | 70 ++++++++++++++++++++--------------------
 redis_arginfo.h          | 58 ++++++++++++++++-----------------
 redis_array.stub.php     |  6 ++--
 redis_array_arginfo.h    |  6 ++--
 redis_cluster.stub.php   | 48 +++++++++++++--------------
 redis_cluster_arginfo.h  | 26 +++++++--------
 redis_sentinel.stub.php  |  2 +-
 redis_sentinel_arginfo.h |  2 +-
 8 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/redis.stub.php b/redis.stub.php
index 7739d66..05a7ebd 100644
--- a/redis.stub.php
+++ b/redis.stub.php
@@ -478,7 +478,7 @@ class Redis {
      *
      * @return Redis
      */
-    public function __construct(array $options = null);
+    public function __construct(?array $options = null);
 
     public function __destruct();
 
@@ -816,7 +816,7 @@ class Redis {
 
     public function close(): bool;
 
-    public function command(string $opt = null, mixed ...$args): mixed;
+    public function command(?string $opt = null, mixed ...$args): mixed;
 
     /**
      *  Execute the Redis CONFIG command in a variety of ways.
@@ -835,10 +835,10 @@ class Redis {
      * $redis->config('SET', 'timeout', 30);
      * $redis->config('SET', ['timeout' => 30, 'loglevel' => 'warning']);
      */
-    public function config(string $operation, array|string|null $key_or_settings = NULL, ?string $value = NULL): mixed;
+    public function config(string $operation, array|string|null $key_or_settings = null, ?string $value = null): mixed;
 
-    public function connect(string $host, int $port = 6379, float $timeout = 0, string $persistent_id = null,
-                            int $retry_interval = 0, float $read_timeout = 0, array $context = null): bool;
+    public function connect(string $host, int $port = 6379, float $timeout = 0, ?string $persistent_id = null,
+                            int $retry_interval = 0, float $read_timeout = 0, ?array $context = null): bool;
 
     /**
      * Make a copy of a key.
@@ -873,7 +873,7 @@ class Redis {
      * var_dump($redis->copy('source1', 'exists'));
      * var_dump($redis->copy('source1', 'exists', ['REPLACE' => true]));
      */
-    public function copy(string $src, string $dst, array $options = null): Redis|bool;
+    public function copy(string $src, string $dst, ?array $options = null): Redis|bool;
 
     /**
      * Return the number of keys in the currently selected Redis database.
@@ -1105,7 +1105,7 @@ class Redis {
      * @see https://redis.io/commands/expire
      *
      */
-    public function expire(string $key, int $timeout, ?string $mode = NULL): Redis|bool;
+    public function expire(string $key, int $timeout, ?string $mode = null): Redis|bool;
 
     /*
      * Set a key's expiration to a specific Unix timestamp in seconds.
@@ -1131,7 +1131,7 @@ class Redis {
      * @see https://redis.io/commands/expire
      * @see Redis::expire()
      */
-    public function expireAt(string $key, int $timestamp, ?string $mode = NULL): Redis|bool;
+    public function expireAt(string $key, int $timestamp, ?string $mode = null): Redis|bool;
 
     public function failover(?array $to = null, bool $abort = false, int $timeout = 0): Redis|bool;
 
@@ -1587,7 +1587,7 @@ class Redis {
      * $redis->set('seq2', 'aactcggcgcgagtaccaggccaaggtcgttccagagcaaagactcgtgccccgctgagc');
      * echo $redis->lcs('seq1', 'seq2') . "\n";
      */
-    public function lcs(string $key1, string $key2, ?array $options = NULL): Redis|string|array|int|false;
+    public function lcs(string $key1, string $key2, ?array $options = null): Redis|string|array|int|false;
 
     /**
      * Get the currently set read timeout on the connection.
@@ -1783,7 +1783,7 @@ class Redis {
      * @example $redis->hrandfield('settings');
      * @example $redis->hrandfield('settings', ['count' => 2, 'withvalues' => true]);
      */
-    public function hRandField(string $key, array $options = null): Redis|string|array;
+    public function hRandField(string $key, ?array $options = null): Redis|string|array;
 
     public function hSet(string $key, string $member, mixed $value): Redis|int|false;
 
@@ -1861,7 +1861,7 @@ class Redis {
      *
      * $redis->hmset('big-hash', $fields);
      *
-     * $it = NULL;
+     * $it = null;
      *
      * do {
      *     // Scan the hash but limit it to fields that match '*:1?3'
@@ -2041,7 +2041,7 @@ class Redis {
      *
      * @return Redis|null|bool|int|array Returns one or more of the matching indexes, or null/false if none were found.
      */
-    public function lPos(string $key, mixed $value, array $options = null): Redis|null|bool|int|array;
+    public function lPos(string $key, mixed $value, ?array $options = null): Redis|null|bool|int|array;
 
     /**
      * Prepend one or more elements to a list.
@@ -2178,7 +2178,7 @@ class Redis {
 
     public function migrate(string $host, int $port, string|array $key, int $dstdb, int $timeout,
                             bool $copy = false, bool $replace = false,
-                            #[\SensitiveParameter] mixed $credentials = NULL): Redis|bool;
+                            #[\SensitiveParameter] mixed $credentials = null): Redis|bool;
 
     /**
      * Move a key to a different database on the same redis instance.
@@ -2237,9 +2237,9 @@ class Redis {
      * @deprecated
      * @alias Redis::connect
      */
-    public function open(string $host, int $port = 6379, float $timeout = 0, string $persistent_id = NULL, int $retry_interval = 0, float $read_timeout = 0, array $context = NULL): bool;
+    public function open(string $host, int $port = 6379, float $timeout = 0, ?string $persistent_id = null, int $retry_interval = 0, float $read_timeout = 0, ?array $context = null): bool;
 
-    public function pconnect(string $host, int $port = 6379, float $timeout = 0, string $persistent_id = NULL, int $retry_interval = 0, float $read_timeout = 0, array $context = NULL): bool;
+    public function pconnect(string $host, int $port = 6379, float $timeout = 0, ?string $persistent_id = null, int $retry_interval = 0, float $read_timeout = 0, ?array $context = null): bool;
 
     /**
      * Remove the expiration from a key.
@@ -2262,7 +2262,7 @@ class Redis {
      *
      *  @return Redis|bool   True if an expiry was set on the key, and false otherwise.
      */
-    public function pexpire(string $key, int $timeout, ?string $mode = NULL): bool;
+    public function pexpire(string $key, int $timeout, ?string $mode = null): bool;
 
     /**
      * Set a key's expiration to a specific Unix Timestamp in milliseconds.  If connected to
@@ -2276,7 +2276,7 @@ class Redis {
      *
      *  @return Redis|bool   True if an expiration was set on the key, false otherwise.
      */
-    public function pexpireAt(string $key, int $timestamp, ?string $mode = NULL): Redis|bool;
+    public function pexpireAt(string $key, int $timestamp, ?string $mode = null): Redis|bool;
 
     /**
      * Add one or more elements to a Redis HyperLogLog key
@@ -2327,7 +2327,7 @@ class Redis {
      * @example $redis->ping();
      * @example $redis->ping('beep boop');
      */
-    public function ping(string $message = NULL): Redis|string|bool;
+    public function ping(?string $message = null): Redis|string|bool;
 
     /**
      * Enter into pipeline mode.
@@ -2353,7 +2353,7 @@ class Redis {
      * @deprecated
      * @alias Redis::pconnect
      */
-    public function popen(string $host, int $port = 6379, float $timeout = 0, string $persistent_id = NULL, int $retry_interval = 0, float $read_timeout = 0, array $context = NULL): bool;
+    public function popen(string $host, int $port = 6379, float $timeout = 0, ?string $persistent_id = null, int $retry_interval = 0, float $read_timeout = 0, ?array $context = null): bool;
 
     /**
      * Set a key with an expiration time in milliseconds
@@ -2542,7 +2542,7 @@ class Redis {
      *
      * $redis->restore('captains-backup', 0, $serialized);
      */
-    public function restore(string $key, int $ttl, string $value, ?array $options = NULL): Redis|bool;
+    public function restore(string $key, int $ttl, string $value, ?array $options = null): Redis|bool;
 
     /**
      * Query whether the connected instance is a primary or replica
@@ -2891,7 +2891,7 @@ class Redis {
      *
      * $redis->setOption(Redis::OPT_SCAN, Redis::SCAN_NORETRY);
      *
-     * $it = NULL;
+     * $it = null;
      *
      * do {
      *     $keys = $redis->scan($it, '*zorg*');
@@ -2902,7 +2902,7 @@ class Redis {
      *
      * $redis->setOption(Redis::OPT_SCAN, Redis::SCAN_RETRY);
      *
-     * $it = NULL;
+     * $it = null;
      *
      * // When Redis::SCAN_RETRY is enabled, we can use simpler logic, as we will never receive an
      * // empty array of keys when the iterator is nonzero.
@@ -2912,7 +2912,7 @@ class Redis {
      *     }
      * }
      */
-    public function scan(?int &$iterator, ?string $pattern = null, int $count = 0, string $type = NULL): array|false;
+    public function scan(?int &$iterator, ?string $pattern = null, int $count = 0, ?string $type = null): array|false;
 
     /**
      * Retrieve the number of members in a Redis set.
@@ -2985,7 +2985,7 @@ class Redis {
      * @example $redis->set('key', 'value');
      * @example $redis->set('key', 'expires_in_60_seconds', 60);
      */
-    public function set(string $key, mixed $value, mixed $options = NULL): Redis|string|bool;
+    public function set(string $key, mixed $value, mixed $options = null): Redis|string|bool;
 
     /**
      * Set a specific bit in a Redis string to zero or one
@@ -3106,7 +3106,7 @@ class Redis {
      * @see https://redis.io/commands/replicaof
      * @see Redis::replicaof()
      */
-    public function slaveof(string $host = NULL, int $port = 6379): Redis|bool;
+    public function slaveof(?string $host = null, int $port = 6379): Redis|bool;
 
     /**
      * Used to turn a Redis instance into a replica of another, or to remove
@@ -3132,7 +3132,7 @@ class Redis {
      * // attempting to promote the instance to a primary.
      * $redis->replicaof();
      */
-    public function replicaof(string $host = NULL, int $port = 6379): Redis|bool;
+    public function replicaof(?string $host = null, int $port = 6379): Redis|bool;
 
     /**
      * Update one or more keys last modified metadata.
@@ -3274,7 +3274,7 @@ class Redis {
      * $redis->setOption(Redis::OPT_SCAN, Redis::SCAN_NORETRY);
      *
      * $scanned = 0;
-     * $it = NULL;
+     * $it = null;
      *
      * // Without Redis::SCAN_RETRY we may receive empty results and
      * // a nonzero iterator.
@@ -3291,7 +3291,7 @@ class Redis {
      * $redis->setOption(Redis::OPT_SCAN, Redis::SCAN_RETRY);
      *
      * $scanned = 0;
-     * $it = NULL;
+     * $it = null;
      *
      * // With Redis::SCAN_RETRY PhpRedis will never return an empty array
      * // when the cursor is non-zero
@@ -3795,7 +3795,7 @@ class Redis {
      *
      * @return mixed                 This command return various results depending on the operation performed.
      */
-    public function xgroup(string $operation, string $key = null, string $group = null, string $id_or_consumer = null,
+    public function xgroup(string $operation, ?string $key = null, ?string $group = null, ?string $id_or_consumer = null,
                            bool $mkstream = false, int $entries_read = -2): mixed;
 
     /**
@@ -4105,7 +4105,7 @@ class Redis {
      * $redis->zPopMax('zs');
      * $redis->zPopMax('zs', 2);.
      */
-    public function zPopMax(string $key, int $count = null): Redis|array|false;
+    public function zPopMax(string $key, ?int $count = null): Redis|array|false;
 
     /**
      * Pop one or more of the lowest scoring elements from a sorted set.
@@ -4123,7 +4123,7 @@ class Redis {
      * $redis->zPopMin('zs');
      * $redis->zPopMin('zs', 2);
      */
-    public function zPopMin(string $key, int $count = null): Redis|array|false;
+    public function zPopMin(string $key, ?int $count = null): Redis|array|false;
 
     /**
      * Retrieve a range of elements of a sorted set between a start and end point.
@@ -4222,7 +4222,7 @@ class Redis {
      * See {@link Redis::zRange} for a full description of the possible options.
      */
     public function zrangestore(string $dstkey, string $srckey, string $start, string $end,
-                                array|bool|null $options = NULL): Redis|int|false;
+                                array|bool|null $options = null): Redis|int|false;
 
     /**
      * Retrieve one or more random members from a Redis sorted set.
@@ -4240,7 +4240,7 @@ class Redis {
      *
      * @example $redis->zRandMember('zs', ['COUNT' => 2, 'WITHSCORES' => true]);
      */
-    public function zRandMember(string $key, array $options = null): Redis|string|array;
+    public function zRandMember(string $key, ?array $options = null): Redis|string|array;
 
     /**
      * Get the rank of a member of a sorted set, by score.
@@ -4448,7 +4448,7 @@ class Redis {
      *
      * $redis->zDiff(['primes', 'evens', 'mod3']);
      */
-    public function zdiff(array $keys, array $options = null): Redis|array|false;
+    public function zdiff(array $keys, ?array $options = null): Redis|array|false;
 
     /**
      * Store the difference of one or more sorted sets in a destination sorted set.
@@ -4619,7 +4619,7 @@ class Redis {
      *
      * $redis->zUnionStore('dst', ['zs1', 'zs2', 'zs3']);
      */
-    public function zunionstore(string $dst, array $keys, ?array $weights = NULL, ?string $aggregate = NULL): Redis|int|false;
+    public function zunionstore(string $dst, array $keys, ?array $weights = null, ?string $aggregate = null): Redis|int|false;
 }
 
 class RedisException extends RuntimeException {}
diff --git a/redis_arginfo.h b/redis_arginfo.h
index 8429b51..41f6aab 100644
--- a/redis_arginfo.h
+++ b/redis_arginfo.h
@@ -2,7 +2,7 @@
  * Stub hash: 8cf0ecc2f5a43c6ede68d537a76faa23cb912d96 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___destruct, 0, 0, 0)
@@ -121,30 +121,30 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_Redis_close arginfo_class_Redis_clearLastError
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_command, 0, 0, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, opt, IS_STRING, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, opt, IS_STRING, 1, "null")
 	ZEND_ARG_VARIADIC_TYPE_INFO(0, args, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_config, 0, 1, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO(0, operation, IS_STRING, 0)
-	ZEND_ARG_TYPE_MASK(0, key_or_settings, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "NULL")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 1, "NULL")
+	ZEND_ARG_TYPE_MASK(0, key_or_settings, MAY_BE_ARRAY|MAY_BE_STRING|MAY_BE_NULL, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_connect, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, host, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "6379")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeout, IS_DOUBLE, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, persistent_id, IS_STRING, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, persistent_id, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, retry_interval, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, read_timeout, IS_DOUBLE, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_copy, 0, 2, Redis, MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO(0, src, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, dst, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_dbSize, 0, 0, Redis, MAY_BE_LONG|MAY_BE_FALSE)
@@ -210,13 +210,13 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_expire, 0, 2, Redis, MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, timeout, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_STRING, 1, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_expireAt, 0, 2, Redis, MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_STRING, 1, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_failover, 0, 0, Redis, MAY_BE_BOOL)
@@ -360,7 +360,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_lcs, 0, 2, Redis, MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, key1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, key2, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_getReadTimeout, 0, 0, IS_DOUBLE, 0)
@@ -428,7 +428,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_hRandField, 0, 1, Redis, MAY_BE_STRING|MAY_BE_ARRAY)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_hSet, 0, 3, Redis, MAY_BE_LONG|MAY_BE_FALSE)
@@ -508,7 +508,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_lPos, 0, 2, Redis, MAY_BE_NULL|MAY_BE_BOOL|MAY_BE_LONG|MAY_BE_ARRAY)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_lPush, 0, 1, Redis, MAY_BE_LONG|MAY_BE_FALSE)
@@ -565,7 +565,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_migrate, 0, 5, R
 	ZEND_ARG_TYPE_INFO(0, timeout, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, copy, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, replace, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, credentials, IS_MIXED, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, credentials, IS_MIXED, 0, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_move, 0, 2, Redis, MAY_BE_BOOL)
@@ -592,10 +592,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_open, 0, 1, _IS_BOOL
 	ZEND_ARG_TYPE_INFO(0, host, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "6379")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timeout, IS_DOUBLE, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, persistent_id, IS_STRING, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, persistent_id, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, retry_interval, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, read_timeout, IS_DOUBLE, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Redis_pconnect arginfo_class_Redis_open
@@ -607,7 +607,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_pexpire, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, timeout, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_STRING, 1, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Redis_pexpireAt arginfo_class_Redis_expireAt
@@ -627,7 +627,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_pfmerge, 0, 2, R
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_ping, 0, 0, Redis, MAY_BE_STRING|MAY_BE_BOOL)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, message, IS_STRING, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, message, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_pipeline, 0, 0, Redis, MAY_BE_BOOL)
@@ -691,7 +691,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_restore, 0, 3, R
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, ttl, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Redis_role arginfo_class_Redis_getAuth
@@ -762,7 +762,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_Redis_scan, 0, 1, MAY_BE_A
 	ZEND_ARG_TYPE_INFO(1, iterator, IS_LONG, 1)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, pattern, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, count, IS_LONG, 0, "0")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_STRING, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, type, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Redis_scard arginfo_class_Redis_expiretime
@@ -776,7 +776,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_set, 0, 2, Redis, MAY_BE_STRING|MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_MIXED, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_MIXED, 0, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_setBit, 0, 3, Redis, MAY_BE_LONG|MAY_BE_FALSE)
@@ -810,7 +810,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_Redis_sismember arginfo_class_Redis_setnx
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_slaveof, 0, 0, Redis, MAY_BE_BOOL)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, host, IS_STRING, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, host, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "6379")
 ZEND_END_ARG_INFO()
 
@@ -939,9 +939,9 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_xgroup, 0, 1, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO(0, operation, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, key, IS_STRING, 0, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, group, IS_STRING, 0, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, id_or_consumer, IS_STRING, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, key, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, group, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, id_or_consumer, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mkstream, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, entries_read, IS_LONG, 0, "-2")
 ZEND_END_ARG_INFO()
@@ -1034,7 +1034,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_zPopMax, 0, 1, Redis, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, count, IS_LONG, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, count, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Redis_zPopMin arginfo_class_Redis_zPopMax
@@ -1066,7 +1066,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_zrangestore, 0,
 	ZEND_ARG_TYPE_INFO(0, srckey, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, start, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, end, IS_STRING, 0)
-	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_BOOL|MAY_BE_NULL, "NULL")
+	ZEND_ARG_TYPE_MASK(0, options, MAY_BE_ARRAY|MAY_BE_BOOL|MAY_BE_NULL, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_Redis_zRandMember arginfo_class_Redis_hRandField
@@ -1123,7 +1123,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_zdiff, 0, 1, Redis, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, keys, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_zdiffstore, 0, 2, Redis, MAY_BE_LONG|MAY_BE_FALSE)
@@ -1158,8 +1158,8 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_Redis_zunionstore, 0, 2, Redis, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, dst, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, keys, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, weights, IS_ARRAY, 1, "NULL")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, aggregate, IS_STRING, 1, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, weights, IS_ARRAY, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, aggregate, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
 
diff --git a/redis_array.stub.php b/redis_array.stub.php
index 8fca8ab..c84d636 100644
--- a/redis_array.stub.php
+++ b/redis_array.stub.php
@@ -10,7 +10,7 @@ class RedisArray {
 
     public function __call(string $function_name, array $arguments): mixed;
 
-    public function __construct(string|array $name_or_hosts, array $options = NULL);
+    public function __construct(string|array $name_or_hosts, ?array $options = null);
 
     public function _continuum(): bool|array;
 
@@ -22,7 +22,7 @@ class RedisArray {
 
     public function _instance(string $host): bool|null|Redis;
 
-    public function _rehash(callable $fn = NULL): bool|null;
+    public function _rehash(?callable $fn = null): bool|null;
 
     public function _target(string $key): bool|string|null;
 
@@ -50,7 +50,7 @@ class RedisArray {
 
     public function mset(array $pairs): bool;
 
-    public function multi(string $host, int $mode = NULL): bool|RedisArray;
+    public function multi(string $host, ?int $mode = null): bool|RedisArray;
 
     public function ping(): bool|array;
 
diff --git a/redis_array_arginfo.h b/redis_array_arginfo.h
index bfacd08..ea4d072 100644
--- a/redis_array_arginfo.h
+++ b/redis_array_arginfo.h
@@ -8,7 +8,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisArray___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_MASK(0, name_or_hosts, MAY_BE_STRING|MAY_BE_ARRAY, NULL)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_RedisArray__continuum, 0, 0, MAY_BE_BOOL|MAY_BE_ARRAY)
@@ -26,7 +26,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisArray__instance,
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_RedisArray__rehash, 0, 0, _IS_BOOL, 1)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fn, IS_CALLABLE, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fn, IS_CALLABLE, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_RedisArray__target, 0, 1, MAY_BE_BOOL|MAY_BE_STRING|MAY_BE_NULL)
@@ -77,7 +77,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisArray_multi, 0, 1, RedisArray, MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO(0, host, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mode, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_RedisArray_ping arginfo_class_RedisArray__continuum
diff --git a/redis_cluster.stub.php b/redis_cluster.stub.php
index c2ab9f4..f5508af 100644
--- a/redis_cluster.stub.php
+++ b/redis_cluster.stub.php
@@ -47,7 +47,7 @@ class RedisCluster {
      */
     public const FAILOVER_DISTRIBUTE_SLAVES = UNKNOWN;
 
-    public function __construct(string|null $name, array $seeds = NULL, int|float $timeout = 0, int|float $read_timeout = 0, bool $persistent = false, #[\SensitiveParameter] mixed $auth = NULL, array $context = NULL);
+    public function __construct(string|null $name, ?array $seeds = null, int|float $timeout = 0, int|float $read_timeout = 0, bool $persistent = false, #[\SensitiveParameter] mixed $auth = null, ?array $context = null);
 
     /**
      * @see Redis::_compress()
@@ -200,7 +200,7 @@ class RedisCluster {
     /**
      * @see Redis::client
      */
-    public function client(string|array $key_or_address, string $subcommand, ?string $arg = NULL): array|string|bool;
+    public function client(string|array $key_or_address, string $subcommand, ?string $arg = null): array|string|bool;
 
     /**
      * @see Redis::close
@@ -230,7 +230,7 @@ class RedisCluster {
     /**
      * @see https://redis.io/commands/copy
      */
-    public function copy(string $src, string $dst, array $options = null): RedisCluster|bool;
+    public function copy(string $src, string $dst, ?array $options = null): RedisCluster|bool;
 
     /**
      * @see Redis::decr()
@@ -305,12 +305,12 @@ class RedisCluster {
     /**
      * @see Redis::expire
      */
-    public function expire(string $key, int $timeout, ?string $mode = NULL): RedisCluster|bool;
+    public function expire(string $key, int $timeout, ?string $mode = null): RedisCluster|bool;
 
     /**
      * @see Redis::expireat
      */
-    public function expireat(string $key, int $timestamp, ?string $mode = NULL): RedisCluster|bool;
+    public function expireat(string $key, int $timestamp, ?string $mode = null): RedisCluster|bool;
 
     /**
      * @see Redis::expiretime()
@@ -415,7 +415,7 @@ class RedisCluster {
     /**
      * @see Redis::lcs
      */
-    public function lcs(string $key1, string $key2, ?array $options = NULL): RedisCluster|string|array|int|false;
+    public function lcs(string $key1, string $key2, ?array $options = null): RedisCluster|string|array|int|false;
 
     /**
      * @see Redis::getset
@@ -490,7 +490,7 @@ class RedisCluster {
     /**
      * @see https://redis.io/commands/hrandfield
      */
-    public function hrandfield(string $key, array $options = null): RedisCluster|string|array;
+    public function hrandfield(string $key, ?array $options = null): RedisCluster|string|array;
 
     /**
      * @see Redis::hset
@@ -583,7 +583,7 @@ class RedisCluster {
     /**
      * @see Redis::lpos
      */
-    public function lpos(string $key, mixed $value, array $options = null): Redis|null|bool|int|array;
+    public function lpos(string $key, mixed $value, ?array $options = null): Redis|null|bool|int|array;
 
     /**
      * @see Redis::lpush
@@ -648,12 +648,12 @@ class RedisCluster {
     /**
      * @see Redis::pexpire
      */
-    public function pexpire(string $key, int $timeout, ?string $mode = NULL): RedisCluster|bool;
+    public function pexpire(string $key, int $timeout, ?string $mode = null): RedisCluster|bool;
 
     /**
      * @see Redis::pexpireat
      */
-    public function pexpireat(string $key, int $timestamp, ?string $mode = NULL): RedisCluster|bool;
+    public function pexpireat(string $key, int $timestamp, ?string $mode = null): RedisCluster|bool;
 
 
     /**
@@ -684,7 +684,7 @@ class RedisCluster {
      * @return mixed This method always returns `true` if no message was sent, and the message itself
      *               if one was.
      */
-    public function ping(string|array $key_or_address, ?string $message = NULL): mixed;
+    public function ping(string|array $key_or_address, ?string $message = null): mixed;
 
     /**
      * @see Redis::psetex
@@ -739,7 +739,7 @@ class RedisCluster {
     /**
      * @see Redis::restore
      */
-    public function restore(string $key, int $timeout, string $value, ?array $options = NULL): RedisCluster|bool;
+    public function restore(string $key, int $timeout, string $value, ?array $options = null): RedisCluster|bool;
 
     /**
      * @see Redis::role
@@ -809,7 +809,7 @@ class RedisCluster {
     /**
      * @see https://redis.io/commands/set
      */
-    public function set(string $key, mixed $value, mixed $options = NULL): RedisCluster|string|bool;
+    public function set(string $key, mixed $value, mixed $options = null): RedisCluster|string|bool;
 
     /**
      * @see Redis::setbit
@@ -879,12 +879,12 @@ class RedisCluster {
     /**
      * @see Redis::sort()
      */
-    public function sort(string $key, ?array $options = NULL): RedisCluster|array|bool|int|string;
+    public function sort(string $key, ?array $options = null): RedisCluster|array|bool|int|string;
 
     /**
      * @see Redis::sort_ro()
      */
-    public function sort_ro(string $key, ?array $options = NULL): RedisCluster|array|bool|int|string;
+    public function sort_ro(string $key, ?array $options = null): RedisCluster|array|bool|int|string;
 
     /**
      * @see Redis::spop
@@ -984,7 +984,7 @@ class RedisCluster {
     /**
      * @see Redis::xgroup
      */
-    public function xgroup(string $operation, string $key = null, string $group = null, string $id_or_consumer = null,
+    public function xgroup(string $operation, ?string $key = null, ?string $group = null, ?string $id_or_consumer = null,
                            bool $mkstream = false, int $entries_read = -2): mixed;
 
     /**
@@ -1070,12 +1070,12 @@ class RedisCluster {
     /**
      * @see Redis::zpopmax
      */
-    public function zpopmax(string $key, int $value = null): RedisCluster|bool|array;
+    public function zpopmax(string $key, ?int $value = null): RedisCluster|bool|array;
 
     /**
      * @see Redis::zpopmin
      */
-    public function zpopmin(string $key, int $value = null): RedisCluster|bool|array;
+    public function zpopmin(string $key, ?int $value = null): RedisCluster|bool|array;
 
     /**
      * @see Redis::zrange
@@ -1091,7 +1091,7 @@ class RedisCluster {
     /**
      * @see https://redis.io/commands/zRandMember
      */
-    public function zrandmember(string $key, array $options = null): RedisCluster|string|array;
+    public function zrandmember(string $key, ?array $options = null): RedisCluster|string|array;
 
     /**
      * @see Redis::zrangebylex
@@ -1131,17 +1131,17 @@ class RedisCluster {
     /**
      * @see Redis::zrevrange
      */
-    public function zrevrange(string $key, string $min, string $max, array $options = null): RedisCluster|bool|array;
+    public function zrevrange(string $key, string $min, string $max, ?array $options = null): RedisCluster|bool|array;
 
     /**
      * @see Redis::zrevrangebylex
      */
-    public function zrevrangebylex(string $key, string $min, string $max, array $options = null): RedisCluster|bool|array;
+    public function zrevrangebylex(string $key, string $min, string $max, ?array $options = null): RedisCluster|bool|array;
 
     /**
      * @see Redis::zrevrangebyscore
      */
-    public function zrevrangebyscore(string $key, string $min, string $max, array $options = null): RedisCluster|bool|array;
+    public function zrevrangebyscore(string $key, string $min, string $max, ?array $options = null): RedisCluster|bool|array;
 
     /**
      * @see Redis::zrevrank
@@ -1166,7 +1166,7 @@ class RedisCluster {
     /**
      * @see Redis::zunionstore
      */
-    public function zunionstore(string $dst, array $keys, ?array $weights = NULL, ?string $aggregate = NULL): RedisCluster|int|false;
+    public function zunionstore(string $dst, array $keys, ?array $weights = null, ?string $aggregate = null): RedisCluster|int|false;
 
     /**
      * @see https://redis.io/commands/zinter
@@ -1186,7 +1186,7 @@ class RedisCluster {
     /**
      * @see https://redis.io/commands/zdiff
      */
-    public function zdiff(array $keys, array $options = null): RedisCluster|array|false;
+    public function zdiff(array $keys, ?array $options = null): RedisCluster|array|false;
 }
 
 class RedisClusterException extends RuntimeException {}
diff --git a/redis_cluster_arginfo.h b/redis_cluster_arginfo.h
index 2cd817d..a853337 100644
--- a/redis_cluster_arginfo.h
+++ b/redis_cluster_arginfo.h
@@ -3,12 +3,12 @@
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisCluster___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 1)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, seeds, IS_ARRAY, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, seeds, IS_ARRAY, 1, "null")
 	ZEND_ARG_TYPE_MASK(0, timeout, MAY_BE_LONG|MAY_BE_DOUBLE, "0")
 	ZEND_ARG_TYPE_MASK(0, read_timeout, MAY_BE_LONG|MAY_BE_DOUBLE, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, persistent, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, auth, IS_MIXED, 0, "NULL")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, auth, IS_MIXED, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_RedisCluster__compress, 0, 1, IS_STRING, 0)
@@ -168,7 +168,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_copy, 0, 2, RedisCluster, MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO(0, src, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, dst, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_decr, 0, 1, RedisCluster, MAY_BE_LONG|MAY_BE_FALSE)
@@ -406,7 +406,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_hrandfield, 0, 1, RedisCluster, MAY_BE_STRING|MAY_BE_ARRAY)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_hset, 0, 3, RedisCluster, MAY_BE_LONG|MAY_BE_FALSE)
@@ -479,7 +479,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_lpos, 0, 2, Redis, MAY_BE_NULL|MAY_BE_BOOL|MAY_BE_LONG|MAY_BE_ARRAY)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_lpush, 0, 2, RedisCluster, MAY_BE_LONG|MAY_BE_BOOL)
@@ -680,7 +680,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_set, 0, 2, RedisCluster, MAY_BE_STRING|MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_MIXED, 0, "NULL")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_MIXED, 0, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_setbit, 0, 3, RedisCluster, MAY_BE_LONG|MAY_BE_FALSE)
@@ -825,9 +825,9 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_RedisCluster_xgroup, 0, 1, IS_MIXED, 0)
 	ZEND_ARG_TYPE_INFO(0, operation, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, key, IS_STRING, 0, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, group, IS_STRING, 0, "null")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, id_or_consumer, IS_STRING, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, key, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, group, IS_STRING, 1, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, id_or_consumer, IS_STRING, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mkstream, _IS_BOOL, 0, "false")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, entries_read, IS_LONG, 0, "-2")
 ZEND_END_ARG_INFO()
@@ -928,7 +928,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_zpopmax, 0, 1, RedisCluster, MAY_BE_BOOL|MAY_BE_ARRAY)
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_LONG, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, value, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_RedisCluster_zpopmin arginfo_class_RedisCluster_zpopmax
@@ -986,7 +986,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_zrevrange
 	ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, min, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, max, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_RedisCluster_zrevrangebylex arginfo_class_RedisCluster_zrevrange
@@ -1035,7 +1035,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_class_RedisCluster_zdiff, 0, 1, RedisCluster, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, keys, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 
diff --git a/redis_sentinel.stub.php b/redis_sentinel.stub.php
index 486ac43..32551e1 100644
--- a/redis_sentinel.stub.php
+++ b/redis_sentinel.stub.php
@@ -8,7 +8,7 @@
 
 class RedisSentinel {
 
-    public function __construct(array $options = null);
+    public function __construct(?array $options = null);
 
 	/** @return bool|RedisSentinel */
     public function ckquorum(string $master);
diff --git a/redis_sentinel_arginfo.h b/redis_sentinel_arginfo.h
index e917b7d..7ef1ae4 100644
--- a/redis_sentinel_arginfo.h
+++ b/redis_sentinel_arginfo.h
@@ -2,7 +2,7 @@
  * Stub hash: f1f746cc848b1debcdf88eae015732720ba206c8 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisSentinel___construct, 0, 0, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RedisSentinel_ckquorum, 0, 0, 1)