Skip to content

Commit 0aee7cf

Browse files
arnaud-lbarnaud-lb
authored
Add private constructor on Metadata classes (#531)
1 parent 428a552 commit 0aee7cf

30 files changed

+341
-19
lines changed

‎metadata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ static HashTable *get_debug_info(Z_RDKAFKA_OBJ *object, int *is_temp) /* {{{ */
107107
array_init(&ary);
108108

109109
intern = rdkafka_get_debug_object(object_intern, object);
110-
if (!intern) {
110+
if (!intern || !intern->metadata) {
111111
return Z_ARRVAL(ary);
112112
}
113113

‎metadata.stub.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
class Metadata
1212
{
13+
/** @implementation-alias RdKafka::__construct */
14+
private function __construct() {}
15+
1316
/** @tentative-return-type */
1417
public function getOrigBrokerId(): int {}
1518

‎metadata_arginfo.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 7bdf537cb18915955d6c3f1d4775dcc9fc43eb4a */
2+
* Stub hash: 6c980079f802be29ef2c30e235a6071f5c0d628c */
3+
4+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata___construct, 0, 0, 0)
5+
ZEND_END_ARG_INFO()
36

47
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_Metadata_getOrigBrokerId, 0, 0, IS_LONG, 0)
58
ZEND_END_ARG_INFO()
@@ -13,13 +16,15 @@ ZEND_END_ARG_INFO()
1316
#define arginfo_class_RdKafka_Metadata_getTopics arginfo_class_RdKafka_Metadata_getBrokers
1417

1518

19+
ZEND_METHOD(RdKafka, __construct);
1620
ZEND_METHOD(RdKafka_Metadata, getOrigBrokerId);
1721
ZEND_METHOD(RdKafka_Metadata, getOrigBrokerName);
1822
ZEND_METHOD(RdKafka_Metadata, getBrokers);
1923
ZEND_METHOD(RdKafka_Metadata, getTopics);
2024

2125

2226
static const zend_function_entry class_RdKafka_Metadata_methods[] = {
27+
ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata___construct, ZEND_ACC_PRIVATE)
2328
ZEND_ME(RdKafka_Metadata, getOrigBrokerId, arginfo_class_RdKafka_Metadata_getOrigBrokerId, ZEND_ACC_PUBLIC)
2429
ZEND_ME(RdKafka_Metadata, getOrigBrokerName, arginfo_class_RdKafka_Metadata_getOrigBrokerName, ZEND_ACC_PUBLIC)
2530
ZEND_ME(RdKafka_Metadata, getBrokers, arginfo_class_RdKafka_Metadata_getBrokers, ZEND_ACC_PUBLIC)

‎metadata_broker.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static HashTable *get_debug_info(Z_RDKAFKA_OBJ *object, int *is_temp) /* {{{ */
9494
array_init(&ary);
9595

9696
intern = rdkafka_get_debug_object(object_intern, object);
97-
if (!intern) {
97+
if (!intern || !intern->metadata_broker) {
9898
return Z_ARRVAL(ary);
9999
}
100100

‎metadata_broker.stub.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
class Broker
1212
{
13+
/** @implementation-alias RdKafka::__construct */
14+
private function __construct() {}
15+
1316
/** @tentative-return-type */
1417
public function getId(): int {}
1518

‎metadata_broker_arginfo.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 53fa93c8908858d59ab75b39a77efdea9e843675 */
2+
* Stub hash: 74c6ee55c31bb86f5bcf71a46607f31688ce71dd */
3+
4+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Broker___construct, 0, 0, 0)
5+
ZEND_END_ARG_INFO()
36

47
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_Metadata_Broker_getId, 0, 0, IS_LONG, 0)
58
ZEND_END_ARG_INFO()
@@ -10,12 +13,14 @@ ZEND_END_ARG_INFO()
1013
#define arginfo_class_RdKafka_Metadata_Broker_getPort arginfo_class_RdKafka_Metadata_Broker_getId
1114

1215

16+
ZEND_METHOD(RdKafka, __construct);
1317
ZEND_METHOD(RdKafka_Metadata_Broker, getId);
1418
ZEND_METHOD(RdKafka_Metadata_Broker, getHost);
1519
ZEND_METHOD(RdKafka_Metadata_Broker, getPort);
1620

1721

1822
static const zend_function_entry class_RdKafka_Metadata_Broker_methods[] = {
23+
ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Broker___construct, ZEND_ACC_PRIVATE)
1924
ZEND_ME(RdKafka_Metadata_Broker, getId, arginfo_class_RdKafka_Metadata_Broker_getId, ZEND_ACC_PUBLIC)
2025
ZEND_ME(RdKafka_Metadata_Broker, getHost, arginfo_class_RdKafka_Metadata_Broker_getHost, ZEND_ACC_PUBLIC)
2126
ZEND_ME(RdKafka_Metadata_Broker, getPort, arginfo_class_RdKafka_Metadata_Broker_getPort, ZEND_ACC_PUBLIC)

‎metadata_broker_legacy_arginfo.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 53fa93c8908858d59ab75b39a77efdea9e843675 */
2+
* Stub hash: 74c6ee55c31bb86f5bcf71a46607f31688ce71dd */
3+
4+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Broker___construct, 0, 0, 0)
5+
ZEND_END_ARG_INFO()
36

47
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Broker_getId, 0, 0, 0)
58
ZEND_END_ARG_INFO()
@@ -9,12 +12,14 @@ ZEND_END_ARG_INFO()
912
#define arginfo_class_RdKafka_Metadata_Broker_getPort arginfo_class_RdKafka_Metadata_Broker_getId
1013

1114

15+
ZEND_METHOD(RdKafka, __construct);
1216
ZEND_METHOD(RdKafka_Metadata_Broker, getId);
1317
ZEND_METHOD(RdKafka_Metadata_Broker, getHost);
1418
ZEND_METHOD(RdKafka_Metadata_Broker, getPort);
1519

1620

1721
static const zend_function_entry class_RdKafka_Metadata_Broker_methods[] = {
22+
ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Broker___construct, ZEND_ACC_PRIVATE)
1823
ZEND_ME(RdKafka_Metadata_Broker, getId, arginfo_class_RdKafka_Metadata_Broker_getId, ZEND_ACC_PUBLIC)
1924
ZEND_ME(RdKafka_Metadata_Broker, getHost, arginfo_class_RdKafka_Metadata_Broker_getHost, ZEND_ACC_PUBLIC)
2025
ZEND_ME(RdKafka_Metadata_Broker, getPort, arginfo_class_RdKafka_Metadata_Broker_getPort, ZEND_ACC_PUBLIC)

‎metadata_collection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static HashTable *get_debug_info(Z_RDKAFKA_OBJ *object, int *is_temp) /* {{{ */
101101
array_init(&ary);
102102

103103
intern = rdkafka_get_debug_object(object_intern, object);
104-
if (!intern) {
104+
if (!intern || !intern->items) {
105105
return Z_ARRVAL(ary);
106106
}
107107

‎metadata_collection.stub.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
class Collection implements \Countable, \Iterator
1212
{
13+
/** @implementation-alias RdKafka::__construct */
14+
private function __construct() {}
15+
1316
/** @tentative-return-type */
1417
public function count(): int {}
1518

‎metadata_collection_arginfo.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: a84f8bd542d46b72179ff6aa0d9d17bed530a2de */
2+
* Stub hash: 43c071a00a4c0beb6b5c1f8f685e29b746c2d3fb */
3+
4+
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_Metadata_Collection___construct, 0, 0, 0)
5+
ZEND_END_ARG_INFO()
36

47
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_Metadata_Collection_count, 0, 0, IS_LONG, 0)
58
ZEND_END_ARG_INFO()
@@ -18,6 +21,7 @@ ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_Metadata
1821
ZEND_END_ARG_INFO()
1922

2023

24+
ZEND_METHOD(RdKafka, __construct);
2125
ZEND_METHOD(RdKafka_Metadata_Collection, count);
2226
ZEND_METHOD(RdKafka_Metadata_Collection, current);
2327
ZEND_METHOD(RdKafka_Metadata_Collection, key);
@@ -27,6 +31,7 @@ ZEND_METHOD(RdKafka_Metadata_Collection, valid);
2731

2832

2933
static const zend_function_entry class_RdKafka_Metadata_Collection_methods[] = {
34+
ZEND_MALIAS(RdKafka, __construct, __construct, arginfo_class_RdKafka_Metadata_Collection___construct, ZEND_ACC_PRIVATE)
3035
ZEND_ME(RdKafka_Metadata_Collection, count, arginfo_class_RdKafka_Metadata_Collection_count, ZEND_ACC_PUBLIC)
3136
ZEND_ME(RdKafka_Metadata_Collection, current, arginfo_class_RdKafka_Metadata_Collection_current, ZEND_ACC_PUBLIC)
3237
ZEND_ME(RdKafka_Metadata_Collection, key, arginfo_class_RdKafka_Metadata_Collection_key, ZEND_ACC_PUBLIC)

0 commit comments

Comments
 (0)