update to 6.0.0RC2

drop patch merged upstream

3 files changed, 298 insertions, 203 deletions

diff --git a/PHPINFO b/PHPINFO
index fa84f38..b8b9219 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 rdkafka
 
 rdkafka support => enabled
-version => 5.0.1
-build date => Nov 19 2021 00:00:00
+version => 6.0.0RC2
+build date => Nov 28 2021 00:00:00
 librdkafka version (runtime) => 1.8.2
 librdkafka version (build) => 1.8.2.255
diff --git a/REFLECTION b/REFLECTION
index 016d951..c0d73e9 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
+Extension [ <persistent> extension #97 rdkafka version 6.0.0RC2 ] {
 
   - Constants [184] {
     Constant [ int RD_KAFKA_CONSUMER ] { 1 }
@@ -192,40 +192,47 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
 
       - Parameters [0] {
       }
+      - Return [ array ]
     }
     Function [ <internal:rdkafka> function rd_kafka_err2name ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $err ]
+        Parameter #0 [ <required> int $err ]
       }
+      - Return [ ?string ]
     }
     Function [ <internal:rdkafka> function rd_kafka_err2str ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $err ]
+        Parameter #0 [ <required> int $err ]
       }
+      - Return [ ?string ]
     }
     Function [ <internal, deprecated:rdkafka> function rd_kafka_errno2err ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $errnox ]
+        Parameter #0 [ <required> int $errnox ]
       }
+      - Return [ int ]
     }
     Function [ <internal, deprecated:rdkafka> function rd_kafka_errno ] {
 
       - Parameters [0] {
       }
+      - Return [ int ]
     }
     Function [ <internal:rdkafka> function rd_kafka_offset_tail ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $cnt ]
+        Parameter #0 [ <required> int $cnt ]
       }
+      - Return [ int ]
     }
     Function [ <internal:rdkafka> function rd_kafka_thread_cnt ] {
 
       - Parameters [0] {
       }
+      - Return [ int ]
     }
   }
 
@@ -242,24 +249,30 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
       }
 
       - Properties [2] {
-        Property [ <default> private $error_cb ]
-        Property [ <default> private $dr_cb ]
+        Property [ private ?callable $error_cb ]
+        Property [ private ?callable $dr_cb ]
       }
 
-      - Methods [15] {
+      - Methods [16] {
+        Method [ <internal:rdkafka, ctor> private method __construct ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:rdkafka> public method addBrokers ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $broker_list ]
+            Parameter #0 [ <required> string $broker_list ]
           }
         }
 
         Method [ <internal:rdkafka> public method getMetadata ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $all_topics ]
-            Parameter #1 [ <optional> $only_topic ]
-            Parameter #2 [ <optional> $timeout_ms ]
+            Parameter #0 [ <required> bool $all_topics ]
+            Parameter #1 [ <required> ?RdKafka\Topic $only_topic ]
+            Parameter #2 [ <required> int $timeout_ms ]
           }
         }
 
@@ -272,24 +285,24 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal, deprecated:rdkafka> public method metadata ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $all_topics ]
-            Parameter #1 [ <optional> $only_topic ]
-            Parameter #2 [ <optional> $timeout_ms ]
+            Parameter #0 [ <required> bool $all_topics ]
+            Parameter #1 [ <required> ?RdKafka\Topic $only_topic ]
+            Parameter #2 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal, deprecated:rdkafka> public method setLogLevel ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $level ]
+            Parameter #0 [ <required> int $level ]
           }
         }
 
         Method [ <internal:rdkafka> public method newTopic ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $topic_name ]
-            Parameter #1 [ <optional> $topic_conf ]
+            Parameter #0 [ <required> string $topic_name ]
+            Parameter #1 [ <optional> ?RdKafka\Conf $topic_conf = null ]
           }
         }
 
@@ -302,61 +315,61 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method poll ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method flush ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method purge ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $purge_flags ]
+            Parameter #0 [ <required> int $purge_flags ]
           }
         }
 
         Method [ <internal, deprecated:rdkafka> public method setLogger ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $logger ]
+            Parameter #0 [ <required> int $logger ]
           }
         }
 
         Method [ <internal:rdkafka> public method queryWatermarkOffsets ] {
 
           - Parameters [5] {
-            Parameter #0 [ <required> $topic ]
-            Parameter #1 [ <optional> $partition ]
-            Parameter #2 [ <optional> &$low ]
-            Parameter #3 [ <optional> &$high ]
-            Parameter #4 [ <optional> $timeout_ms ]
+            Parameter #0 [ <required> string $topic ]
+            Parameter #1 [ <required> int $partition ]
+            Parameter #2 [ <required> int &$low ]
+            Parameter #3 [ <required> int &$high ]
+            Parameter #4 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method offsetsForTimes ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $topic_partitions ]
-            Parameter #1 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> array $topic_partitions ]
+            Parameter #1 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method pausePartitions ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_partitions ]
+            Parameter #0 [ <required> array $topic_partitions ]
           }
         }
 
         Method [ <internal:rdkafka> public method resumePartitions ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_partitions ]
+            Parameter #0 [ <required> array $topic_partitions ]
           }
         }
       }
@@ -377,10 +390,10 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
       }
 
       - Methods [17] {
-        Method [ <internal:rdkafka, ctor> public method __construct ] {
+        Method [ <internal:rdkafka, overwrites RdKafka, ctor> public method __construct ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $conf ]
+            Parameter #0 [ <optional> ?RdKafka\Conf $conf = null ]
           }
         }
 
@@ -393,16 +406,16 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka, inherits RdKafka> public method addBrokers ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $broker_list ]
+            Parameter #0 [ <required> string $broker_list ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method getMetadata ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $all_topics ]
-            Parameter #1 [ <optional> $only_topic ]
-            Parameter #2 [ <optional> $timeout_ms ]
+            Parameter #0 [ <required> bool $all_topics ]
+            Parameter #1 [ <required> ?RdKafka\Topic $only_topic ]
+            Parameter #2 [ <required> int $timeout_ms ]
           }
         }
 
@@ -415,24 +428,24 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal, deprecated:rdkafka, inherits RdKafka> public method metadata ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $all_topics ]
-            Parameter #1 [ <optional> $only_topic ]
-            Parameter #2 [ <optional> $timeout_ms ]
+            Parameter #0 [ <required> bool $all_topics ]
+            Parameter #1 [ <required> ?RdKafka\Topic $only_topic ]
+            Parameter #2 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal, deprecated:rdkafka, inherits RdKafka> public method setLogLevel ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $level ]
+            Parameter #0 [ <required> int $level ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method newTopic ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $topic_name ]
-            Parameter #1 [ <optional> $topic_conf ]
+            Parameter #0 [ <required> string $topic_name ]
+            Parameter #1 [ <optional> ?RdKafka\Conf $topic_conf = null ]
           }
         }
 
@@ -445,61 +458,61 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka, inherits RdKafka> public method poll ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method flush ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method purge ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $purge_flags ]
+            Parameter #0 [ <required> int $purge_flags ]
           }
         }
 
         Method [ <internal, deprecated:rdkafka, inherits RdKafka> public method setLogger ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $logger ]
+            Parameter #0 [ <required> int $logger ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method queryWatermarkOffsets ] {
 
           - Parameters [5] {
-            Parameter #0 [ <required> $topic ]
-            Parameter #1 [ <optional> $partition ]
-            Parameter #2 [ <optional> &$low ]
-            Parameter #3 [ <optional> &$high ]
-            Parameter #4 [ <optional> $timeout_ms ]
+            Parameter #0 [ <required> string $topic ]
+            Parameter #1 [ <required> int $partition ]
+            Parameter #2 [ <required> int &$low ]
+            Parameter #3 [ <required> int &$high ]
+            Parameter #4 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method offsetsForTimes ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $topic_partitions ]
-            Parameter #1 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> array $topic_partitions ]
+            Parameter #1 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method pausePartitions ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_partitions ]
+            Parameter #0 [ <required> array $topic_partitions ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method resumePartitions ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_partitions ]
+            Parameter #0 [ <required> array $topic_partitions ]
           }
         }
       }
@@ -520,17 +533,17 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
       }
 
       - Methods [20] {
-        Method [ <internal:rdkafka, ctor> public method __construct ] {
+        Method [ <internal:rdkafka, overwrites RdKafka, ctor> public method __construct ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $conf ]
+            Parameter #0 [ <optional> ?RdKafka\Conf $conf = null ]
           }
         }
 
         Method [ <internal:rdkafka> public method initTransactions ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
 
@@ -543,30 +556,30 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method commitTransaction ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method abortTransaction ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method addBrokers ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $broker_list ]
+            Parameter #0 [ <required> string $broker_list ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method getMetadata ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $all_topics ]
-            Parameter #1 [ <optional> $only_topic ]
-            Parameter #2 [ <optional> $timeout_ms ]
+            Parameter #0 [ <required> bool $all_topics ]
+            Parameter #1 [ <required> ?RdKafka\Topic $only_topic ]
+            Parameter #2 [ <required> int $timeout_ms ]
           }
         }
 
@@ -579,24 +592,24 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal, deprecated:rdkafka, inherits RdKafka> public method metadata ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $all_topics ]
-            Parameter #1 [ <optional> $only_topic ]
-            Parameter #2 [ <optional> $timeout_ms ]
+            Parameter #0 [ <required> bool $all_topics ]
+            Parameter #1 [ <required> ?RdKafka\Topic $only_topic ]
+            Parameter #2 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal, deprecated:rdkafka, inherits RdKafka> public method setLogLevel ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $level ]
+            Parameter #0 [ <required> int $level ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method newTopic ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $topic_name ]
-            Parameter #1 [ <optional> $topic_conf ]
+            Parameter #0 [ <required> string $topic_name ]
+            Parameter #1 [ <optional> ?RdKafka\Conf $topic_conf = null ]
           }
         }
 
@@ -609,67 +622,67 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka, inherits RdKafka> public method poll ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method flush ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method purge ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $purge_flags ]
+            Parameter #0 [ <required> int $purge_flags ]
           }
         }
 
         Method [ <internal, deprecated:rdkafka, inherits RdKafka> public method setLogger ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $logger ]
+            Parameter #0 [ <required> int $logger ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method queryWatermarkOffsets ] {
 
           - Parameters [5] {
-            Parameter #0 [ <required> $topic ]
-            Parameter #1 [ <optional> $partition ]
-            Parameter #2 [ <optional> &$low ]
-            Parameter #3 [ <optional> &$high ]
-            Parameter #4 [ <optional> $timeout_ms ]
+            Parameter #0 [ <required> string $topic ]
+            Parameter #1 [ <required> int $partition ]
+            Parameter #2 [ <required> int &$low ]
+            Parameter #3 [ <required> int &$high ]
+            Parameter #4 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method offsetsForTimes ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $topic_partitions ]
-            Parameter #1 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> array $topic_partitions ]
+            Parameter #1 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method pausePartitions ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_partitions ]
+            Parameter #0 [ <required> array $topic_partitions ]
           }
         }
 
         Method [ <internal:rdkafka, inherits RdKafka> public method resumePartitions ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_partitions ]
+            Parameter #0 [ <required> array $topic_partitions ]
           }
         }
       }
     }
 
-    Class [ <internal:rdkafka> class RdKafka\Exception extends Exception implements Throwable ] {
+    Class [ <internal:rdkafka> class RdKafka\Exception extends Exception implements Stringable, Throwable ] {
 
       - Constants [0] {
       }
@@ -681,47 +694,81 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
       }
 
       - Properties [4] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
+        Property [ protected $message = '' ]
+        Property [ protected $code = 0 ]
+        Property [ protected $file = NULL ]
+        Property [ protected $line = NULL ]
       }
 
       - Methods [10] {
         Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
+            Parameter #0 [ <optional> string $message = "" ]
+            Parameter #1 [ <optional> int $code = 0 ]
+            Parameter #2 [ <optional> ?Throwable $previous = null ]
           }
         }
 
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
+
+          - Parameters [0] {
+          }
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
+
+          - Parameters [0] {
+          }
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
+
+          - Parameters [0] {
+          }
+          - Return [ int ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
+
+          - Parameters [0] {
+          }
+          - Return [ ?Throwable ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
 
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Stringable> public method __toString ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
       }
     }
@@ -756,64 +803,64 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> string $value ]
           }
         }
 
         Method [ <internal, deprecated:rdkafka> public method setDefaultTopicConf ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_conf ]
+            Parameter #0 [ <required> RdKafka\TopicConf $topic_conf ]
           }
         }
 
         Method [ <internal:rdkafka> public method setErrorCb ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $callback ]
+            Parameter #0 [ <required> callable $callback ]
           }
         }
 
         Method [ <internal:rdkafka> public method setDrMsgCb ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $callback ]
+            Parameter #0 [ <required> callable $callback ]
           }
         }
 
         Method [ <internal:rdkafka> public method setStatsCb ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $callback ]
+            Parameter #0 [ <required> callable $callback ]
           }
         }
 
         Method [ <internal:rdkafka> public method setRebalanceCb ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $callback ]
+            Parameter #0 [ <required> callable $callback ]
           }
         }
 
         Method [ <internal:rdkafka> public method setConsumeCb ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $callback ]
+            Parameter #0 [ <required> callable $callback ]
           }
         }
 
         Method [ <internal:rdkafka> public method setOffsetCommitCb ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $callback ]
+            Parameter #0 [ <required> callable $callback ]
           }
         }
 
         Method [ <internal:rdkafka> public method setLogCb ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $callback ]
+            Parameter #0 [ <required> callable $callback ]
           }
         }
       }
@@ -849,21 +896,21 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> string $value ]
           }
         }
 
         Method [ <internal:rdkafka> public method setPartitioner ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $partitioner ]
+            Parameter #0 [ <required> int $partitioner ]
           }
         }
       }
     }
 
-    Class [ <internal:rdkafka> class RdKafka\KafkaErrorException extends RdKafka\Exception implements Throwable ] {
+    Class [ <internal:rdkafka> class RdKafka\KafkaErrorException extends RdKafka\Exception implements Throwable, Stringable ] {
 
       - Constants [0] {
       }
@@ -875,26 +922,26 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
       }
 
       - Properties [8] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
-        Property [ <default> private $error_string ]
-        Property [ <default> private $isFatal ]
-        Property [ <default> private $isRetriable ]
-        Property [ <default> private $transactionRequiresAbort ]
+        Property [ protected $message = '' ]
+        Property [ protected $code = 0 ]
+        Property [ protected $file = NULL ]
+        Property [ protected $line = NULL ]
+        Property [ private string $error_string ]
+        Property [ private bool $isFatal ]
+        Property [ private bool $isRetriable ]
+        Property [ private bool $transactionRequiresAbort ]
       }
 
       - Methods [14] {
         Method [ <internal:rdkafka, overwrites Exception, ctor> public method __construct ] {
 
           - Parameters [6] {
-            Parameter #0 [ <required> $message ]
-            Parameter #1 [ <required> $code ]
-            Parameter #2 [ <required> $error_string ]
-            Parameter #3 [ <required> $isFatal ]
-            Parameter #4 [ <required> $isRetriable ]
-            Parameter #5 [ <required> $transactionRequiresAbort ]
+            Parameter #0 [ <required> string $message ]
+            Parameter #1 [ <required> int $code ]
+            Parameter #2 [ <required> string $error_string ]
+            Parameter #3 [ <required> bool $isFatal ]
+            Parameter #4 [ <required> bool $isRetriable ]
+            Parameter #5 [ <required> bool $transactionRequiresAbort ]
           }
         }
 
@@ -923,30 +970,64 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         }
 
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
+
+          - Parameters [0] {
+          }
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
+
+          - Parameters [0] {
+          }
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
+
+          - Parameters [0] {
+          }
+          - Return [ int ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
+
+          - Parameters [0] {
+          }
+          - Return [ ?Throwable ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
 
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Stringable> public method __toString ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
         }
       }
     }
@@ -963,23 +1044,23 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
       }
 
       - Properties [3] {
-        Property [ <default> private $error_cb ]
-        Property [ <default> private $rebalance_cb ]
-        Property [ <default> private $dr_msg_cb ]
+        Property [ private ?callable $error_cb ]
+        Property [ private ?callable $rebalance_cb ]
+        Property [ private ?callable $dr_msg_cb ]
       }
 
       - Methods [18] {
         Method [ <internal:rdkafka, ctor> public method __construct ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $conf ]
+            Parameter #0 [ <required> RdKafka\Conf $conf ]
           }
         }
 
         Method [ <internal:rdkafka> public method assign ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $topic_partitions ]
+            Parameter #0 [ <optional> ?array $topic_partitions = null ]
           }
         }
 
@@ -992,7 +1073,7 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method commit ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $message_or_offsets ]
+            Parameter #0 [ <optional> RdKafka\Message|array|null $message_or_offsets = null ]
           }
         }
 
@@ -1005,21 +1086,21 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method commitAsync ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $message_or_offsets ]
+            Parameter #0 [ <optional> RdKafka\Message|array|null $message_or_offsets = null ]
           }
         }
 
         Method [ <internal:rdkafka> public method consume ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method subscribe ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topics ]
+            Parameter #0 [ <required> array $topics ]
           }
         }
 
@@ -1038,65 +1119,65 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method getMetadata ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $all_topics ]
-            Parameter #1 [ <required> $only_topic ]
-            Parameter #2 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> bool $all_topics ]
+            Parameter #1 [ <required> RdKafka\Topic $only_topic ]
+            Parameter #2 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method newTopic ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $topic_name ]
-            Parameter #1 [ <optional> $topic_conf ]
+            Parameter #0 [ <required> string $topic_name ]
+            Parameter #1 [ <optional> ?RdKafka\Conf $topic_conf = null ]
           }
         }
 
         Method [ <internal:rdkafka> public method getCommittedOffsets ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $topic_partitions ]
-            Parameter #1 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> array $topic_partitions ]
+            Parameter #1 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method getOffsetPositions ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_partitions ]
+            Parameter #0 [ <required> array $topic_partitions ]
           }
         }
 
         Method [ <internal:rdkafka> public method queryWatermarkOffsets ] {
 
           - Parameters [5] {
-            Parameter #0 [ <required> $topic ]
-            Parameter #1 [ <optional> $partition ]
-            Parameter #2 [ <optional> &$low ]
-            Parameter #3 [ <optional> &$high ]
-            Parameter #4 [ <optional> $timeout_ms ]
+            Parameter #0 [ <required> string $topic ]
+            Parameter #1 [ <required> int $partition ]
+            Parameter #2 [ <required> int &$low ]
+            Parameter #3 [ <required> int &$high ]
+            Parameter #4 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method offsetsForTimes ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $topic_partitions ]
-            Parameter #1 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> array $topic_partitions ]
+            Parameter #1 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method pausePartitions ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_partitions ]
+            Parameter #0 [ <required> array $topic_partitions ]
           }
         }
 
         Method [ <internal:rdkafka> public method resumePartitions ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_partitions ]
+            Parameter #0 [ <required> array $topic_partitions ]
           }
         }
       }
@@ -1114,16 +1195,16 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
       }
 
       - Properties [10] {
-        Property [ <default> public $err ]
-        Property [ <default> public $topic_name ]
-        Property [ <default> public $timestamp ]
-        Property [ <default> public $partition ]
-        Property [ <default> public $payload ]
-        Property [ <default> public $len ]
-        Property [ <default> public $key ]
-        Property [ <default> public $offset ]
-        Property [ <default> public $headers ]
-        Property [ <default> public $opaque ]
+        Property [ public int $err ]
+        Property [ public ?string $topic_name = NULL ]
+        Property [ public ?int $timestamp = NULL ]
+        Property [ public int $partition ]
+        Property [ public ?string $payload = NULL ]
+        Property [ public ?int $len = NULL ]
+        Property [ public ?string $key = NULL ]
+        Property [ public int $offset ]
+        Property [ public array $headers ]
+        Property [ public ?string $opaque = NULL ]
       }
 
       - Methods [1] {
@@ -1197,13 +1278,13 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
           }
         }
 
-        Method [ <internal:rdkafka> public method getPartitions ] {
+        Method [ <internal:rdkafka> public method getErr ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:rdkafka> public method getErr ] {
+        Method [ <internal:rdkafka> public method getPartitions ] {
 
           - Parameters [0] {
           }
@@ -1364,9 +1445,9 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka, ctor> public method __construct ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $topic ]
-            Parameter #1 [ <required> $partition ]
-            Parameter #2 [ <optional> $offset ]
+            Parameter #0 [ <required> string $topic ]
+            Parameter #1 [ <required> int $partition ]
+            Parameter #2 [ <optional> int $offset = 0 ]
           }
         }
 
@@ -1379,7 +1460,7 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method setTopic ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $topic_name ]
+            Parameter #0 [ <required> string $topic_name ]
           }
         }
 
@@ -1392,7 +1473,7 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method setPartition ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $partition ]
+            Parameter #0 [ <required> int $partition ]
           }
         }
 
@@ -1405,7 +1486,7 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method setOffset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $offset ]
+            Parameter #0 [ <required> int $offset ]
           }
         }
 
@@ -1441,7 +1522,7 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method consume ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $timeout_ms ]
           }
         }
       }
@@ -1494,58 +1575,58 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method consumeQueueStart ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $partition ]
-            Parameter #1 [ <required> $offset ]
-            Parameter #2 [ <required> $queue ]
+            Parameter #0 [ <required> int $partition ]
+            Parameter #1 [ <required> int $offset ]
+            Parameter #2 [ <required> RdKafka\Queue $queue ]
           }
         }
 
         Method [ <internal:rdkafka> public method consumeCallback ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $partition ]
-            Parameter #1 [ <required> $timeout_ms ]
-            Parameter #2 [ <required> $callback ]
+            Parameter #0 [ <required> int $partition ]
+            Parameter #1 [ <required> int $timeout_ms ]
+            Parameter #2 [ <required> callable $callback ]
           }
         }
 
         Method [ <internal:rdkafka> public method consumeStart ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $partition ]
-            Parameter #1 [ <required> $offset ]
+            Parameter #0 [ <required> int $partition ]
+            Parameter #1 [ <required> int $offset ]
           }
         }
 
         Method [ <internal:rdkafka> public method consumeStop ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $partition ]
+            Parameter #0 [ <required> int $partition ]
           }
         }
 
         Method [ <internal:rdkafka> public method consume ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $partition ]
-            Parameter #1 [ <required> $timeout_ms ]
+            Parameter #0 [ <required> int $partition ]
+            Parameter #1 [ <required> int $timeout_ms ]
           }
         }
 
         Method [ <internal:rdkafka> public method consumeBatch ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $partition ]
-            Parameter #1 [ <required> $timeout_ms ]
-            Parameter #2 [ <required> $batch_size ]
+            Parameter #0 [ <required> int $partition ]
+            Parameter #1 [ <required> int $timeout_ms ]
+            Parameter #2 [ <required> int $batch_size ]
           }
         }
 
         Method [ <internal:rdkafka> public method offsetStore ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $partition ]
-            Parameter #1 [ <required> $offset ]
+            Parameter #0 [ <required> int $partition ]
+            Parameter #1 [ <required> int $offset ]
           }
         }
 
@@ -1581,8 +1662,8 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method offsetStore ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $partition ]
-            Parameter #1 [ <required> $offset ]
+            Parameter #0 [ <required> int $partition ]
+            Parameter #1 [ <required> int $offset ]
           }
         }
 
@@ -1618,24 +1699,24 @@ Extension [ <persistent> extension #128 rdkafka version 5.0.1 ] {
         Method [ <internal:rdkafka> public method produce ] {
 
           - Parameters [5] {
-            Parameter #0 [ <required> $partition ]
-            Parameter #1 [ <required> $msgflags ]
-            Parameter #2 [ <optional> $payload ]
-            Parameter #3 [ <optional> $key ]
-            Parameter #4 [ <optional> $msg_opaque ]
+            Parameter #0 [ <required> int $partition ]
+            Parameter #1 [ <required> int $msgflags ]
+            Parameter #2 [ <optional> ?string $payload = null ]
+            Parameter #3 [ <optional> ?string $key = null ]
+            Parameter #4 [ <optional> ?string $msg_opaque = null ]
           }
         }
 
         Method [ <internal:rdkafka> public method producev ] {
 
           - Parameters [7] {
-            Parameter #0 [ <required> $partition ]
-            Parameter #1 [ <required> $msgflags ]
-            Parameter #2 [ <optional> $payload ]
-            Parameter #3 [ <optional> $key ]
-            Parameter #4 [ <optional> $headers ]
-            Parameter #5 [ <optional> $timestamp_ms ]
-            Parameter #6 [ <optional> $msg_opaque ]
+            Parameter #0 [ <required> int $partition ]
+            Parameter #1 [ <required> int $msgflags ]
+            Parameter #2 [ <optional> ?string $payload = null ]
+            Parameter #3 [ <optional> ?string $key = null ]
+            Parameter #4 [ <optional> ?array $headers = null ]
+            Parameter #5 [ <optional> ?int $timestamp_ms = null ]
+            Parameter #6 [ <optional> ?string $msg_opaque = null ]
           }
         }
 
diff --git a/php-pecl-rdkafka6.spec b/php-pecl-rdkafka6.spec
index 1ff5284..bc5208b 100644
--- a/php-pecl-rdkafka6.spec
+++ b/php-pecl-rdkafka6.spec
@@ -18,11 +18,11 @@
 
 %global buildver %(pkg-config --silence-errors --modversion rdkafka 2>/dev/null || echo 65536)
 
-%global upstream_version 5.0.1
-#global upstream_prever  RC1
+%global upstream_version 6.0.0
+%global upstream_prever  RC2
 
 Summary:        Kafka client based on librdkafka
-Name:           %{?sub_prefix}php-pecl-%{pecl_name}5
+Name:           %{?sub_prefix}php-pecl-%{pecl_name}6
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        MIT
@@ -49,13 +49,15 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{rele
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 %endif
 
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 || "%{php_version}" > "7.4"
+%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9 || "%{php_version}" > "8.1"
 Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}          < 5
+Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}5         < 6
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:      %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 %else
 # A single version can be installed
 Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}          < 5
+Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}5         < 6
 %endif
 # no BC break (only PHP supported versions)
 Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}4         < 5
@@ -215,6 +217,18 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Sun Nov 28 2021 Remi Collet <remi@remirepo.net> - 6.0.0~RC2-1
+- update to 6.0.0RC2
+- drop patch merged upstream
+
+* Sat Nov 20 2021 Remi Collet <remi@remirepo.net> - 6.0.0~RC1-1
+- update to 6.0.0RC1
+- rename to php-pecl-rdkafka6
+- fix segfault using patch from
+  https://github.com/arnaud-lb/php-rdkafka/pull/492
+- open https://github.com/arnaud-lb/php-rdkafka/issues/493
+  discussion about nullable vs optional
+
 * Fri Nov 19 2021 Remi Collet <remi@remirepo.net> - 5.0.1-1
 - update to 5.0.1