Add private constructor on Metadata classes (#531)

arnaud-lb · web-flow · commit 0aee7cf70a28 · 2022-07-26T20:44:00.000+02:00
diff --git a/metadata.c b/metadata.c
@@ -107,7 +107,7 @@ static HashTable *get_debug_info(Z_RDKAFKA_OBJ *object, int *is_temp) /* {{{ */
     array_init(&ary);
 
     intern = rdkafka_get_debug_object(object_intern, object);
-    if (!intern) {
+    if (!intern || !intern->metadata) {
         return Z_ARRVAL(ary);
     }
 
diff --git a/metadata.stub.php b/metadata.stub.php
@@ -10,6 +10,9 @@
 
 class Metadata
 {
+    /** @implementation-alias RdKafka::__construct */
+    private function __construct() {}
+
     /** @tentative-return-type */
     public function getOrigBrokerId(): int {}
 
diff --git a/metadata_arginfo.h b/metadata_arginfo.h
@@ -1,5 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 7bdf537cb18915955d6c3f1d4775dcc9fc43eb4a */
+ * Stub hash: 6c980079f802be29ef2c30e235a6071f5c0d628c */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_Metadata_getOrigBrokerId, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -13,13 +16,15 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_RdKafka_Metadata_getTopics arginfo_class_RdKafka_Metadata_getBrokers
 
 
+ZEND_METHOD(RdKafka, __construct);
 ZEND_METHOD(RdKafka_Metadata, getOrigBrokerId);
 ZEND_METHOD(RdKafka_Metadata, getOrigBrokerName);
 ZEND_METHOD(RdKafka_Metadata, getBrokers);
 ZEND_METHOD(RdKafka_Metadata, getTopics);
 
 
 static const zend_function_entry class_RdKafka_Metadata_methods[] = {
+	ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata___construct, ZEND_ACC_PRIVATE)
 	ZEND_ME(RdKafka_Metadata, getOrigBrokerId, arginfo_class_RdKafka_Metadata_getOrigBrokerId, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata, getOrigBrokerName, arginfo_class_RdKafka_Metadata_getOrigBrokerName, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata, getBrokers, arginfo_class_RdKafka_Metadata_getBrokers, ZEND_ACC_PUBLIC)
diff --git a/metadata_broker.c b/metadata_broker.c
@@ -94,7 +94,7 @@ static HashTable *get_debug_info(Z_RDKAFKA_OBJ *object, int *is_temp) /* {{{ */
     array_init(&ary);
 
     intern = rdkafka_get_debug_object(object_intern, object);
-    if (!intern) {
+    if (!intern || !intern->metadata_broker) {
         return Z_ARRVAL(ary);
     }
 
diff --git a/metadata_broker.stub.php b/metadata_broker.stub.php
@@ -10,6 +10,9 @@
 
 class Broker
 {
+    /** @implementation-alias RdKafka::__construct */
+    private function __construct() {}
+
     /** @tentative-return-type */
     public function getId(): int {}
 
diff --git a/metadata_broker_arginfo.h b/metadata_broker_arginfo.h
@@ -1,5 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 53fa93c8908858d59ab75b39a77efdea9e843675 */
+ * Stub hash: 74c6ee55c31bb86f5bcf71a46607f31688ce71dd */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Broker___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_Metadata_Broker_getId, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -10,12 +13,14 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_RdKafka_Metadata_Broker_getPort arginfo_class_RdKafka_Metadata_Broker_getId
 
 
+ZEND_METHOD(RdKafka, __construct);
 ZEND_METHOD(RdKafka_Metadata_Broker, getId);
 ZEND_METHOD(RdKafka_Metadata_Broker, getHost);
 ZEND_METHOD(RdKafka_Metadata_Broker, getPort);
 
 
 static const zend_function_entry class_RdKafka_Metadata_Broker_methods[] = {
+	ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Broker___construct, ZEND_ACC_PRIVATE)
 	ZEND_ME(RdKafka_Metadata_Broker, getId, arginfo_class_RdKafka_Metadata_Broker_getId, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Broker, getHost, arginfo_class_RdKafka_Metadata_Broker_getHost, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Broker, getPort, arginfo_class_RdKafka_Metadata_Broker_getPort, ZEND_ACC_PUBLIC)
diff --git a/metadata_broker_legacy_arginfo.h b/metadata_broker_legacy_arginfo.h
@@ -1,5 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 53fa93c8908858d59ab75b39a77efdea9e843675 */
+ * Stub hash: 74c6ee55c31bb86f5bcf71a46607f31688ce71dd */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Broker___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Broker_getId, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -9,12 +12,14 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_RdKafka_Metadata_Broker_getPort arginfo_class_RdKafka_Metadata_Broker_getId
 
 
+ZEND_METHOD(RdKafka, __construct);
 ZEND_METHOD(RdKafka_Metadata_Broker, getId);
 ZEND_METHOD(RdKafka_Metadata_Broker, getHost);
 ZEND_METHOD(RdKafka_Metadata_Broker, getPort);
 
 
 static const zend_function_entry class_RdKafka_Metadata_Broker_methods[] = {
+	ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Broker___construct, ZEND_ACC_PRIVATE)
 	ZEND_ME(RdKafka_Metadata_Broker, getId, arginfo_class_RdKafka_Metadata_Broker_getId, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Broker, getHost, arginfo_class_RdKafka_Metadata_Broker_getHost, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Broker, getPort, arginfo_class_RdKafka_Metadata_Broker_getPort, ZEND_ACC_PUBLIC)
diff --git a/metadata_collection.c b/metadata_collection.c
@@ -101,7 +101,7 @@ static HashTable *get_debug_info(Z_RDKAFKA_OBJ *object, int *is_temp) /* {{{ */
     array_init(&ary);
 
     intern = rdkafka_get_debug_object(object_intern, object);
-    if (!intern) {
+    if (!intern || !intern->items) {
         return Z_ARRVAL(ary);
     }
     
diff --git a/metadata_collection.stub.php b/metadata_collection.stub.php
@@ -10,6 +10,9 @@
 
 class Collection implements \Countable, \Iterator
 {
+    /** @implementation-alias RdKafka::__construct */
+    private function __construct() {}
+
     /** @tentative-return-type */
     public function count(): int {}
 
diff --git a/metadata_collection_arginfo.h b/metadata_collection_arginfo.h
@@ -1,5 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a84f8bd542d46b72179ff6aa0d9d17bed530a2de */
+ * Stub hash: 43c071a00a4c0beb6b5c1f8f685e29b746c2d3fb */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Collection___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_Metadata_Collection_count, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -18,6 +21,7 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_Metadata
 ZEND_END_ARG_INFO()
 
 
+ZEND_METHOD(RdKafka, __construct);
 ZEND_METHOD(RdKafka_Metadata_Collection, count);
 ZEND_METHOD(RdKafka_Metadata_Collection, current);
 ZEND_METHOD(RdKafka_Metadata_Collection, key);
@@ -27,6 +31,7 @@ ZEND_METHOD(RdKafka_Metadata_Collection, valid);
 
 
 static const zend_function_entry class_RdKafka_Metadata_Collection_methods[] = {
+	ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Collection___construct, ZEND_ACC_PRIVATE)
 	ZEND_ME(RdKafka_Metadata_Collection, count, arginfo_class_RdKafka_Metadata_Collection_count, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Collection, current, arginfo_class_RdKafka_Metadata_Collection_current, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Collection, key, arginfo_class_RdKafka_Metadata_Collection_key, ZEND_ACC_PUBLIC)
diff --git a/metadata_collection_legacy_arginfo.h b/metadata_collection_legacy_arginfo.h
@@ -1,5 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a84f8bd542d46b72179ff6aa0d9d17bed530a2de */
+ * Stub hash: 43c071a00a4c0beb6b5c1f8f685e29b746c2d3fb */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Collection___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Collection_count, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -15,6 +18,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_RdKafka_Metadata_Collection_valid arginfo_class_RdKafka_Metadata_Collection_count
 
 
+ZEND_METHOD(RdKafka, __construct);
 ZEND_METHOD(RdKafka_Metadata_Collection, count);
 ZEND_METHOD(RdKafka_Metadata_Collection, current);
 ZEND_METHOD(RdKafka_Metadata_Collection, key);
@@ -24,6 +28,7 @@ ZEND_METHOD(RdKafka_Metadata_Collection, valid);
 
 
 static const zend_function_entry class_RdKafka_Metadata_Collection_methods[] = {
+	ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Collection___construct, ZEND_ACC_PRIVATE)
 	ZEND_ME(RdKafka_Metadata_Collection, count, arginfo_class_RdKafka_Metadata_Collection_count, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Collection, current, arginfo_class_RdKafka_Metadata_Collection_current, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Collection, key, arginfo_class_RdKafka_Metadata_Collection_key, ZEND_ACC_PUBLIC)
diff --git a/metadata_legacy_arginfo.h b/metadata_legacy_arginfo.h
@@ -1,5 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 7bdf537cb18915955d6c3f1d4775dcc9fc43eb4a */
+ * Stub hash: 6c980079f802be29ef2c30e235a6071f5c0d628c */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_getOrigBrokerId, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -11,13 +14,15 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_RdKafka_Metadata_getTopics arginfo_class_RdKafka_Metadata_getOrigBrokerId
 
 
+ZEND_METHOD(RdKafka, __construct);
 ZEND_METHOD(RdKafka_Metadata, getOrigBrokerId);
 ZEND_METHOD(RdKafka_Metadata, getOrigBrokerName);
 ZEND_METHOD(RdKafka_Metadata, getBrokers);
 ZEND_METHOD(RdKafka_Metadata, getTopics);
 
 
 static const zend_function_entry class_RdKafka_Metadata_methods[] = {
+	ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata___construct, ZEND_ACC_PRIVATE)
 	ZEND_ME(RdKafka_Metadata, getOrigBrokerId, arginfo_class_RdKafka_Metadata_getOrigBrokerId, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata, getOrigBrokerName, arginfo_class_RdKafka_Metadata_getOrigBrokerName, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata, getBrokers, arginfo_class_RdKafka_Metadata_getBrokers, ZEND_ACC_PUBLIC)
diff --git a/metadata_partition.c b/metadata_partition.c
@@ -95,7 +95,7 @@ static HashTable *get_debug_info(Z_RDKAFKA_OBJ *object, int *is_temp) /* {{{ */
     array_init(&ary);
 
     intern = rdkafka_get_debug_object(object_intern, object);
-    if (!intern) {
+    if (!intern || !intern->metadata_partition) {
         return Z_ARRVAL(ary);
     }
 
diff --git a/metadata_partition.stub.php b/metadata_partition.stub.php
@@ -10,6 +10,9 @@
 
 class Partition
 {
+    /** @implementation-alias RdKafka::__construct */
+    private function __construct() {}
+
     /** @tentative-return-type */
     public function getId(): int {}
 
diff --git a/metadata_partition_arginfo.h b/metadata_partition_arginfo.h
@@ -1,5 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4c02c5ac3a6240ab8cbc90451bdc54a3de2c2d2f */
+ * Stub hash: ce824cf273ec8fec1fe3b6eaac015a51f3e9dc6b */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Partition___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_Metadata_Partition_getId, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
@@ -14,6 +17,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_RdKafka_Metadata_Partition_getIsrs arginfo_class_RdKafka_Metadata_Partition_getReplicas
 
 
+ZEND_METHOD(RdKafka, __construct);
 ZEND_METHOD(RdKafka_Metadata_Partition, getId);
 ZEND_METHOD(RdKafka_Metadata_Partition, getErr);
 ZEND_METHOD(RdKafka_Metadata_Partition, getLeader);
@@ -22,6 +26,7 @@ ZEND_METHOD(RdKafka_Metadata_Partition, getIsrs);
 
 
 static const zend_function_entry class_RdKafka_Metadata_Partition_methods[] = {
+	ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Partition___construct, ZEND_ACC_PRIVATE)
 	ZEND_ME(RdKafka_Metadata_Partition, getId, arginfo_class_RdKafka_Metadata_Partition_getId, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Partition, getErr, arginfo_class_RdKafka_Metadata_Partition_getErr, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Partition, getLeader, arginfo_class_RdKafka_Metadata_Partition_getLeader, ZEND_ACC_PUBLIC)
diff --git a/metadata_partition_legacy_arginfo.h b/metadata_partition_legacy_arginfo.h
@@ -1,5 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4c02c5ac3a6240ab8cbc90451bdc54a3de2c2d2f */
+ * Stub hash: ce824cf273ec8fec1fe3b6eaac015a51f3e9dc6b */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Partition___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Partition_getId, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -13,6 +16,7 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_RdKafka_Metadata_Partition_getIsrs arginfo_class_RdKafka_Metadata_Partition_getId
 
 
+ZEND_METHOD(RdKafka, __construct);
 ZEND_METHOD(RdKafka_Metadata_Partition, getId);
 ZEND_METHOD(RdKafka_Metadata_Partition, getErr);
 ZEND_METHOD(RdKafka_Metadata_Partition, getLeader);
@@ -21,6 +25,7 @@ ZEND_METHOD(RdKafka_Metadata_Partition, getIsrs);
 
 
 static const zend_function_entry class_RdKafka_Metadata_Partition_methods[] = {
+	ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Partition___construct, ZEND_ACC_PRIVATE)
 	ZEND_ME(RdKafka_Metadata_Partition, getId, arginfo_class_RdKafka_Metadata_Partition_getId, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Partition, getErr, arginfo_class_RdKafka_Metadata_Partition_getErr, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Partition, getLeader, arginfo_class_RdKafka_Metadata_Partition_getLeader, ZEND_ACC_PUBLIC)
diff --git a/metadata_topic.c b/metadata_topic.c
@@ -102,7 +102,7 @@ static HashTable *get_debug_info(Z_RDKAFKA_OBJ *object, int *is_temp) /* {{{ */
     array_init(&ary);
 
     intern = rdkafka_get_debug_object(object_intern, object);
-    if (!intern) {
+    if (!intern || !intern->metadata_topic) {
         return Z_ARRVAL(ary);
     }
 
diff --git a/metadata_topic.stub.php b/metadata_topic.stub.php
@@ -10,6 +10,9 @@
 
 class Topic
 {
+    /** @implementation-alias RdKafka::__construct */
+    private function __construct() {}
+
     /** @tentative-return-type */
     public function getTopic(): string {}
 
diff --git a/metadata_topic_arginfo.h b/metadata_topic_arginfo.h
@@ -1,5 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 90ddb49b26a651772f9b71a1233435f2a502af6d */
+ * Stub hash: 04fd71ae954bd0a09730d401c8160574e1045369 */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Topic___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_Metadata_Topic_getTopic, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
@@ -11,12 +14,14 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_RdKafka_Metadata_
 ZEND_END_ARG_INFO()
 
 
+ZEND_METHOD(RdKafka, __construct);
 ZEND_METHOD(RdKafka_Metadata_Topic, getTopic);
 ZEND_METHOD(RdKafka_Metadata_Topic, getErr);
 ZEND_METHOD(RdKafka_Metadata_Topic, getPartitions);
 
 
 static const zend_function_entry class_RdKafka_Metadata_Topic_methods[] = {
+	ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Topic___construct, ZEND_ACC_PRIVATE)
 	ZEND_ME(RdKafka_Metadata_Topic, getTopic, arginfo_class_RdKafka_Metadata_Topic_getTopic, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Topic, getErr, arginfo_class_RdKafka_Metadata_Topic_getErr, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Topic, getPartitions, arginfo_class_RdKafka_Metadata_Topic_getPartitions, ZEND_ACC_PUBLIC)
diff --git a/metadata_topic_legacy_arginfo.h b/metadata_topic_legacy_arginfo.h
@@ -1,5 +1,8 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 90ddb49b26a651772f9b71a1233435f2a502af6d */
+ * Stub hash: 04fd71ae954bd0a09730d401c8160574e1045369 */
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Topic___construct, 0, 0, 0)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Topic_getTopic, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -9,12 +12,14 @@ ZEND_END_ARG_INFO()
 #define arginfo_class_RdKafka_Metadata_Topic_getPartitions arginfo_class_RdKafka_Metadata_Topic_getTopic
 
 
+ZEND_METHOD(RdKafka, __construct);
 ZEND_METHOD(RdKafka_Metadata_Topic, getTopic);
 ZEND_METHOD(RdKafka_Metadata_Topic, getErr);
 ZEND_METHOD(RdKafka_Metadata_Topic, getPartitions);
 
 
 static const zend_function_entry class_RdKafka_Metadata_Topic_methods[] = {
+	ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Topic___construct, ZEND_ACC_PRIVATE)
 	ZEND_ME(RdKafka_Metadata_Topic, getTopic, arginfo_class_RdKafka_Metadata_Topic_getTopic, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Topic, getErr, arginfo_class_RdKafka_Metadata_Topic_getErr, ZEND_ACC_PUBLIC)
 	ZEND_ME(RdKafka_Metadata_Topic, getPartitions, arginfo_class_RdKafka_Metadata_Topic_getPartitions, ZEND_ACC_PUBLIC)
diff --git a/package.xml b/package.xml
@@ -124,6 +124,11 @@
     <file role="test" name="integration-tests-check.php"/>
     <file role="test" name="kafka_error_exception.phpt"/>
     <file role="test" name="message_headers.phpt"/>
+    <file role="test" name="metadata_001.phpt"/>
+    <file role="test" name="metadata_broker_001.phpt"/>
+    <file role="test" name="metadata_collection_001.phpt"/>
+    <file role="test" name="metadata_partition_001.phpt"/>
+    <file role="test" name="metadata_topic_001.phpt"/>
     <file role="test" name="new_topic_with_conf.phpt"/>
     <file role="test" name="pause_resume.phpt"/>
     <file role="test" name="produce_consume.phpt"/>
@@ -140,7 +145,8 @@
     <file role="test" name="test0.phpt"/>
     <file role="test" name="test_env.php.sample"/>
     <file role="test" name="topic_conf.phpt"/>
-    <file role="test" name="topic_partition.phpt"/>
+    <file role="test" name="topic_partition_001.phpt"/>
+    <file role="test" name="topic_partition_002.phpt"/>
    </dir>
   </dir>
  </contents>
diff --git a/php_rdkafka_priv.h b/php_rdkafka_priv.h
@@ -67,7 +67,7 @@
 
 #define Z_RDKAFKA_PROP_OBJ(object) object
 
-#define rdkafka_get_debug_object(type, object) get_object(object)
+#define rdkafka_get_debug_object(type, object) php_kafka_from_obj(type, Z_OBJ_P(object))
 
 #if PHP_MINOR_VERSION < 3
 /* Allocates object type and zeros it, but not the properties.
diff --git a/tests/metadata_001.phpt b/tests/metadata_001.phpt
diff --git a/tests/metadata_broker_001.phpt b/tests/metadata_broker_001.phpt
diff --git a/tests/metadata_collection_001.phpt b/tests/metadata_collection_001.phpt
diff --git a/tests/metadata_partition_001.phpt b/tests/metadata_partition_001.phpt
diff --git a/tests/metadata_topic_001.phpt b/tests/metadata_topic_001.phpt
diff --git a/tests/topic_partition_001.phpt b/tests/topic_partition_001.phpt
diff --git a/tests/topic_partition_002.phpt b/tests/topic_partition_002.phpt
diff --git a/topic_partition.c b/topic_partition.c

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ static HashTable get_debug_info(Z_RDKAFKA_OBJ object, int is_temp) / {{{ */`
`107`	`107`	`array_init(&ary);`
`108`	`108`
`109`	`109`	`intern = rdkafka_get_debug_object(object_intern, object);`
`110`		`- if (!intern) {`
	`110`	`+ if (!intern \|\| !intern->metadata) {`
`111`	`111`	`return Z_ARRVAL(ary);`
`112`	`112`	`}`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@`
`10`	`10`
`11`	`11`	`class Metadata`
`12`	`12`	`{`
	`13`	`+ /** @implementation-alias RdKafka::__construct */`
	`14`	`+ private function __construct() {}`
	`15`	`+`
`13`	`16`	`/** @tentative-return-type */`
`14`	`17`	`public function getOrigBrokerId(): int {}`
`15`	`18`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static HashTable get_debug_info(Z_RDKAFKA_OBJ object, int is_temp) / {{{ */`
`94`	`94`	`array_init(&ary);`
`95`	`95`
`96`	`96`	`intern = rdkafka_get_debug_object(object_intern, object);`
`97`		`- if (!intern) {`
	`97`	`+ if (!intern \|\| !intern->metadata_broker) {`
`98`	`98`	`return Z_ARRVAL(ary);`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ static HashTable get_debug_info(Z_RDKAFKA_OBJ object, int is_temp) / {{{ */`
`101`	`101`	`array_init(&ary);`
`102`	`102`
`103`	`103`	`intern = rdkafka_get_debug_object(object_intern, object);`
`104`		`- if (!intern) {`
	`104`	`+ if (!intern \|\| !intern->items) {`
`105`	`105`	`return Z_ARRVAL(ary);`
`106`	`106`	`}`
`107`	`107`