From 7f43ad153aaa825125d1939e496eec4eb06c8683 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 21 Aug 2023 08:45:28 +0200
Subject: update to 6.0.0RC2

---
 PHPINFO              |   2 +-
 REFLECTION           | 118 +++++++++++++++++++++++++--------------------------
 php-pecl-redis6.spec |   7 ++-
 3 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index e7696ff..abf2ebc 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 redis
 
 Redis Support => enabled
-Redis Version => 6.0.0RC1
+Redis Version => 6.0.0RC2
 Redis Sentinel Version => 1.0
 Available serializers => php, json, igbinary, msgpack
 Available compression => lzf, zstd, lz4
diff --git a/REFLECTION b/REFLECTION
index 9593d5e..185a7e9 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
+Extension [ <persistent> extension #121 redis version 6.0.0RC2 ] {
 
   - Dependencies {
     Dependency [ igbinary (Required) ]
@@ -174,7 +174,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
         Method [ <internal:redis, ctor> public method __construct ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> array $options = null ]
+            Parameter #0 [ <optional> ?array $options = null ]
           }
         }
 
@@ -432,7 +432,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
         Method [ <internal:redis> public method command ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> string $opt = null ]
+            Parameter #0 [ <optional> ?string $opt = null ]
             Parameter #1 [ <optional> mixed ...$args ]
           }
           - Return [ mixed ]
@@ -442,8 +442,8 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [3] {
             Parameter #0 [ <required> string $operation ]
-            Parameter #1 [ <optional> array|string|null $key_or_settings = NULL ]
-            Parameter #2 [ <optional> ?string $value = NULL ]
+            Parameter #1 [ <optional> array|string|null $key_or_settings = null ]
+            Parameter #2 [ <optional> ?string $value = null ]
           }
           - Return [ mixed ]
         }
@@ -454,10 +454,10 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #0 [ <required> string $host ]
             Parameter #1 [ <optional> int $port = 6379 ]
             Parameter #2 [ <optional> float $timeout = 0 ]
-            Parameter #3 [ <optional> string $persistent_id = null ]
+            Parameter #3 [ <optional> ?string $persistent_id = null ]
             Parameter #4 [ <optional> int $retry_interval = 0 ]
             Parameter #5 [ <optional> float $read_timeout = 0 ]
-            Parameter #6 [ <optional> array $context = null ]
+            Parameter #6 [ <optional> ?array $context = null ]
           }
           - Return [ bool ]
         }
@@ -467,7 +467,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $src ]
             Parameter #1 [ <required> string $dst ]
-            Parameter #2 [ <optional> array $options = null ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
           - Return [ Redis|bool ]
         }
@@ -607,7 +607,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> int $timeout ]
-            Parameter #2 [ <optional> ?string $mode = NULL ]
+            Parameter #2 [ <optional> ?string $mode = null ]
           }
           - Return [ Redis|bool ]
         }
@@ -617,7 +617,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> int $timestamp ]
-            Parameter #2 [ <optional> ?string $mode = NULL ]
+            Parameter #2 [ <optional> ?string $mode = null ]
           }
           - Return [ Redis|bool ]
         }
@@ -917,7 +917,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $key1 ]
             Parameter #1 [ <required> string $key2 ]
-            Parameter #2 [ <optional> ?array $options = NULL ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
           - Return [ Redis|array|string|int|false ]
         }
@@ -1053,7 +1053,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> string $key ]
-            Parameter #1 [ <optional> array $options = null ]
+            Parameter #1 [ <optional> ?array $options = null ]
           }
           - Return [ Redis|array|string ]
         }
@@ -1210,7 +1210,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> mixed $value ]
-            Parameter #2 [ <optional> array $options = null ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
           - Return [ Redis|array|int|bool|null ]
         }
@@ -1325,7 +1325,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #4 [ <required> int $timeout ]
             Parameter #5 [ <optional> bool $copy = false ]
             Parameter #6 [ <optional> bool $replace = false ]
-            Parameter #7 [ <optional> mixed $credentials = NULL ]
+            Parameter #7 [ <optional> mixed $credentials = null ]
           }
           - Return [ Redis|bool ]
         }
@@ -1378,10 +1378,10 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #0 [ <required> string $host ]
             Parameter #1 [ <optional> int $port = 6379 ]
             Parameter #2 [ <optional> float $timeout = 0 ]
-            Parameter #3 [ <optional> string $persistent_id = NULL ]
+            Parameter #3 [ <optional> ?string $persistent_id = null ]
             Parameter #4 [ <optional> int $retry_interval = 0 ]
             Parameter #5 [ <optional> float $read_timeout = 0 ]
-            Parameter #6 [ <optional> array $context = NULL ]
+            Parameter #6 [ <optional> ?array $context = null ]
           }
           - Return [ bool ]
         }
@@ -1392,10 +1392,10 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #0 [ <required> string $host ]
             Parameter #1 [ <optional> int $port = 6379 ]
             Parameter #2 [ <optional> float $timeout = 0 ]
-            Parameter #3 [ <optional> string $persistent_id = NULL ]
+            Parameter #3 [ <optional> ?string $persistent_id = null ]
             Parameter #4 [ <optional> int $retry_interval = 0 ]
             Parameter #5 [ <optional> float $read_timeout = 0 ]
-            Parameter #6 [ <optional> array $context = NULL ]
+            Parameter #6 [ <optional> ?array $context = null ]
           }
           - Return [ bool ]
         }
@@ -1413,7 +1413,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> int $timeout ]
-            Parameter #2 [ <optional> ?string $mode = NULL ]
+            Parameter #2 [ <optional> ?string $mode = null ]
           }
           - Return [ bool ]
         }
@@ -1423,7 +1423,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> int $timestamp ]
-            Parameter #2 [ <optional> ?string $mode = NULL ]
+            Parameter #2 [ <optional> ?string $mode = null ]
           }
           - Return [ Redis|bool ]
         }
@@ -1457,7 +1457,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
         Method [ <internal:redis> public method ping ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> string $message = NULL ]
+            Parameter #0 [ <optional> ?string $message = null ]
           }
           - Return [ Redis|string|bool ]
         }
@@ -1475,10 +1475,10 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #0 [ <required> string $host ]
             Parameter #1 [ <optional> int $port = 6379 ]
             Parameter #2 [ <optional> float $timeout = 0 ]
-            Parameter #3 [ <optional> string $persistent_id = NULL ]
+            Parameter #3 [ <optional> ?string $persistent_id = null ]
             Parameter #4 [ <optional> int $retry_interval = 0 ]
             Parameter #5 [ <optional> float $read_timeout = 0 ]
-            Parameter #6 [ <optional> array $context = NULL ]
+            Parameter #6 [ <optional> ?array $context = null ]
           }
           - Return [ bool ]
         }
@@ -1592,7 +1592,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> int $ttl ]
             Parameter #2 [ <required> string $value ]
-            Parameter #3 [ <optional> ?array $options = NULL ]
+            Parameter #3 [ <optional> ?array $options = null ]
           }
           - Return [ Redis|bool ]
         }
@@ -1756,7 +1756,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #0 [ <required> ?int &$iterator ]
             Parameter #1 [ <optional> ?string $pattern = null ]
             Parameter #2 [ <optional> int $count = 0 ]
-            Parameter #3 [ <optional> string $type = NULL ]
+            Parameter #3 [ <optional> ?string $type = null ]
           }
           - Return [ array|false ]
         }
@@ -1791,7 +1791,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> mixed $value ]
-            Parameter #2 [ <optional> mixed $options = NULL ]
+            Parameter #2 [ <optional> mixed $options = null ]
           }
           - Return [ Redis|string|bool ]
         }
@@ -1855,7 +1855,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
         Method [ <internal, deprecated:redis> public method slaveof ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> string $host = NULL ]
+            Parameter #0 [ <optional> ?string $host = null ]
             Parameter #1 [ <optional> int $port = 6379 ]
           }
           - Return [ Redis|bool ]
@@ -1864,7 +1864,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
         Method [ <internal:redis> public method replicaof ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> string $host = NULL ]
+            Parameter #0 [ <optional> ?string $host = null ]
             Parameter #1 [ <optional> int $port = 6379 ]
           }
           - Return [ Redis|bool ]
@@ -2150,9 +2150,9 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [6] {
             Parameter #0 [ <required> string $operation ]
-            Parameter #1 [ <optional> string $key = null ]
-            Parameter #2 [ <optional> string $group = null ]
-            Parameter #3 [ <optional> string $id_or_consumer = null ]
+            Parameter #1 [ <optional> ?string $key = null ]
+            Parameter #2 [ <optional> ?string $group = null ]
+            Parameter #3 [ <optional> ?string $id_or_consumer = null ]
             Parameter #4 [ <optional> bool $mkstream = false ]
             Parameter #5 [ <optional> int $entries_read = -2 ]
           }
@@ -2309,7 +2309,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> string $key ]
-            Parameter #1 [ <optional> int $count = null ]
+            Parameter #1 [ <optional> ?int $count = null ]
           }
           - Return [ Redis|array|false ]
         }
@@ -2318,7 +2318,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> string $key ]
-            Parameter #1 [ <optional> int $count = null ]
+            Parameter #1 [ <optional> ?int $count = null ]
           }
           - Return [ Redis|array|false ]
         }
@@ -2364,7 +2364,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #1 [ <required> string $srckey ]
             Parameter #2 [ <required> string $start ]
             Parameter #3 [ <required> string $end ]
-            Parameter #4 [ <optional> array|bool|null $options = NULL ]
+            Parameter #4 [ <optional> array|bool|null $options = null ]
           }
           - Return [ Redis|int|false ]
         }
@@ -2373,7 +2373,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> string $key ]
-            Parameter #1 [ <optional> array $options = null ]
+            Parameter #1 [ <optional> ?array $options = null ]
           }
           - Return [ Redis|array|string ]
         }
@@ -2483,7 +2483,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> array $keys ]
-            Parameter #1 [ <optional> array $options = null ]
+            Parameter #1 [ <optional> ?array $options = null ]
           }
           - Return [ Redis|array|false ]
         }
@@ -2553,8 +2553,8 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [4] {
             Parameter #0 [ <required> string $dst ]
             Parameter #1 [ <required> array $keys ]
-            Parameter #2 [ <optional> ?array $weights = NULL ]
-            Parameter #3 [ <optional> ?string $aggregate = NULL ]
+            Parameter #2 [ <optional> ?array $weights = null ]
+            Parameter #3 [ <optional> ?string $aggregate = null ]
           }
           - Return [ Redis|int|false ]
         }
@@ -2589,7 +2589,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> array|string $name_or_hosts ]
-            Parameter #1 [ <optional> array $options = NULL ]
+            Parameter #1 [ <optional> ?array $options = null ]
           }
         }
 
@@ -2632,7 +2632,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
         Method [ <internal:redis> public method _rehash ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> callable $fn = NULL ]
+            Parameter #0 [ <optional> ?callable $fn = null ]
           }
           - Return [ ?bool ]
         }
@@ -2743,7 +2743,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> string $host ]
-            Parameter #1 [ <optional> int $mode = NULL ]
+            Parameter #1 [ <optional> ?int $mode = null ]
           }
           - Return [ RedisArray|bool ]
         }
@@ -2854,12 +2854,12 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [7] {
             Parameter #0 [ <required> ?string $name ]
-            Parameter #1 [ <optional> array $seeds = NULL ]
+            Parameter #1 [ <optional> ?array $seeds = null ]
             Parameter #2 [ <optional> int|float $timeout = 0 ]
             Parameter #3 [ <optional> int|float $read_timeout = 0 ]
             Parameter #4 [ <optional> bool $persistent = false ]
-            Parameter #5 [ <optional> mixed $auth = NULL ]
-            Parameter #6 [ <optional> array $context = NULL ]
+            Parameter #5 [ <optional> mixed $auth = null ]
+            Parameter #6 [ <optional> ?array $context = null ]
           }
         }
 
@@ -3182,7 +3182,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $src ]
             Parameter #1 [ <required> string $dst ]
-            Parameter #2 [ <optional> array $options = null ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
           - Return [ RedisCluster|bool ]
         }
@@ -3671,7 +3671,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> string $key ]
-            Parameter #1 [ <optional> array $options = null ]
+            Parameter #1 [ <optional> ?array $options = null ]
           }
           - Return [ RedisCluster|array|string ]
         }
@@ -3816,7 +3816,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> mixed $value ]
-            Parameter #2 [ <optional> array $options = null ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
           - Return [ Redis|array|int|bool|null ]
         }
@@ -4208,7 +4208,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> mixed $value ]
-            Parameter #2 [ <optional> mixed $options = NULL ]
+            Parameter #2 [ <optional> mixed $options = null ]
           }
           - Return [ RedisCluster|string|bool ]
         }
@@ -4532,9 +4532,9 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [6] {
             Parameter #0 [ <required> string $operation ]
-            Parameter #1 [ <optional> string $key = null ]
-            Parameter #2 [ <optional> string $group = null ]
-            Parameter #3 [ <optional> string $id_or_consumer = null ]
+            Parameter #1 [ <optional> ?string $key = null ]
+            Parameter #2 [ <optional> ?string $group = null ]
+            Parameter #3 [ <optional> ?string $id_or_consumer = null ]
             Parameter #4 [ <optional> bool $mkstream = false ]
             Parameter #5 [ <optional> int $entries_read = -2 ]
           }
@@ -4715,7 +4715,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> string $key ]
-            Parameter #1 [ <optional> int $value = null ]
+            Parameter #1 [ <optional> ?int $value = null ]
           }
           - Return [ RedisCluster|array|bool ]
         }
@@ -4724,7 +4724,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> string $key ]
-            Parameter #1 [ <optional> int $value = null ]
+            Parameter #1 [ <optional> ?int $value = null ]
           }
           - Return [ RedisCluster|array|bool ]
         }
@@ -4756,7 +4756,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> string $key ]
-            Parameter #1 [ <optional> array $options = null ]
+            Parameter #1 [ <optional> ?array $options = null ]
           }
           - Return [ RedisCluster|array|string ]
         }
@@ -4839,7 +4839,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> string $min ]
             Parameter #2 [ <required> string $max ]
-            Parameter #3 [ <optional> array $options = null ]
+            Parameter #3 [ <optional> ?array $options = null ]
           }
           - Return [ RedisCluster|array|bool ]
         }
@@ -4850,7 +4850,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> string $min ]
             Parameter #2 [ <required> string $max ]
-            Parameter #3 [ <optional> array $options = null ]
+            Parameter #3 [ <optional> ?array $options = null ]
           }
           - Return [ RedisCluster|array|bool ]
         }
@@ -4861,7 +4861,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
             Parameter #0 [ <required> string $key ]
             Parameter #1 [ <required> string $min ]
             Parameter #2 [ <required> string $max ]
-            Parameter #3 [ <optional> array $options = null ]
+            Parameter #3 [ <optional> ?array $options = null ]
           }
           - Return [ RedisCluster|array|bool ]
         }
@@ -4949,7 +4949,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> array $keys ]
-            Parameter #1 [ <optional> array $options = null ]
+            Parameter #1 [ <optional> ?array $options = null ]
           }
           - Return [ RedisCluster|array|false ]
         }
@@ -5066,7 +5066,7 @@ Extension [ <persistent> extension #120 redis version 6.0.0RC1 ] {
         Method [ <internal:redis, ctor> public method __construct ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> array $options = null ]
+            Parameter #0 [ <optional> ?array $options = null ]
           }
         }
 
diff --git a/php-pecl-redis6.spec b/php-pecl-redis6.spec
index 541c7fb..e21905d 100644
--- a/php-pecl-redis6.spec
+++ b/php-pecl-redis6.spec
@@ -23,7 +23,7 @@
 %global ini_name     50-%{pecl_name}.ini
 
 %global upstream_version 6.0.0
-%global upstream_prever  RC1
+%global upstream_prever  RC2
 %global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}
 %global _configure       ../%{sources}/configure
 
@@ -278,7 +278,7 @@ cd %{sources}/tests
 : Launch redis server
 mkdir -p data
 pidfile=$PWD/redis.pid
-port=$(%{__php} -r 'echo 9000 + PHP_MAJOR_VERSION*100 + PHP_MINOR_VERSION*10 + PHP_INT_SIZE + 0%{?scl:1};')
+port=$(%{__php} -r 'echo 9000 + PHP_MAJOR_VERSION*100 + PHP_MINOR_VERSION*10 + PHP_INT_SIZE + %{?fedora}%{?rhel} + 0%{?scl:1};')
 %{_root_bindir}/redis-server   \
     --bind      127.0.0.1      \
     --port      $port          \
@@ -345,6 +345,9 @@ fi
 
 
 %changelog
+* Mon Aug 21 2023 Remi Collet <remi@remirepo.net> - 6.0.0~RC2-1
+- update to 6.0.0RC2
+
 * Wed Aug  2 2023 Remi Collet <remi@remirepo.net> - 6.0.0~RC1-1
 - update to 6.0.0RC1
 - rename to php-pecl-redis6 for new API
-- 
cgit