From 0527b9b849f6a79a45abc56ae089d943c91ac0f8 Mon Sep 17 00:00:00 2001
From: nick <nickjobszh@gmail.com>
Date: Mon, 28 Dec 2020 12:48:38 +0100
Subject: [PATCH 1/2] rename metadata err
---
configuration_arginfo.h | 2 +-
metadata_partition.c | 4 ++--
metadata_partition.stub.php | 2 +-
metadata_partition_arginfo.h | 8 ++++----
metadata_topic.c | 4 ++--
metadata_topic.stub.php | 2 +-
metadata_topic_arginfo.h | 8 ++++----
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/configuration_arginfo.h b/configuration_arginfo.h
index 1d7941a..af2a0bb 100644
--- a/configuration_arginfo.h
+++ b/configuration_arginfo.h
@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 2a9fd8de9f13ef85f4c02373cc6f2dc87114edd0 */
+ * Stub hash: f629d931de4ad3a347583a46a7fce628f567f8ee */
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Kafka_Configuration___construct, 0, 0, 0)
ZEND_END_ARG_INFO()
diff --git a/metadata_partition.c b/metadata_partition.c
index f6c3546..5e1a966 100644
--- a/metadata_partition.c
+++ b/metadata_partition.c
@@ -102,9 +102,9 @@ ZEND_METHOD(Kafka_Metadata_Partition, getId)
}
/* }}} */
-/* {{{ proto int Kafka\Metadata\Partition::getErr()
+/* {{{ proto int Kafka\Metadata\Partition::getErrorCode()
Partition error reported by broker */
-ZEND_METHOD(Kafka_Metadata_Partition, getErr)
+ZEND_METHOD(Kafka_Metadata_Partition, getErrorCode)
{
object_intern *intern;
diff --git a/metadata_partition.stub.php b/metadata_partition.stub.php
index 1157de4..d324e7e 100644
--- a/metadata_partition.stub.php
+++ b/metadata_partition.stub.php
@@ -8,7 +8,7 @@ class Partition
{
public function getId(): int {}
- public function getErr(): int {}
+ public function getErrorCode(): int {}
public function getLeader(): int {}
diff --git a/metadata_partition_arginfo.h b/metadata_partition_arginfo.h
index e2dba9d..d47ab40 100644
--- a/metadata_partition_arginfo.h
+++ b/metadata_partition_arginfo.h
@@ -1,10 +1,10 @@
/* This is a generated file, edit the .stub.php file instead.
- * Stub hash: e34e94f591ac3caf4ed3916d8d15252f96c8fc6b */
+ * Stub hash: 934cef11a377e54b4d5f8cea75e6d590ec071d50 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Metadata_Partition_getId, 0, 0, IS_LONG, 0)
ZEND_END_ARG_INFO()
-#define arginfo_class_Kafka_Metadata_Partition_getErr arginfo_class_Kafka_Metadata_Partition_getId
+#define arginfo_class_Kafka_Metadata_Partition_getErrorCode arginfo_class_Kafka_Metadata_Partition_getId
#define arginfo_class_Kafka_Metadata_Partition_getLeader arginfo_class_Kafka_Metadata_Partition_getId
@@ -15,7 +15,7 @@ ZEND_END_ARG_INFO()
ZEND_METHOD(Kafka_Metadata_Partition, getId);
-ZEND_METHOD(Kafka_Metadata_Partition, getErr);
+ZEND_METHOD(Kafka_Metadata_Partition, getErrorCode);
ZEND_METHOD(Kafka_Metadata_Partition, getLeader);
ZEND_METHOD(Kafka_Metadata_Partition, getReplicas);
ZEND_METHOD(Kafka_Metadata_Partition, getIsrs);
@@ -23,7 +23,7 @@ ZEND_METHOD(Kafka_Metadata_Partition, getIsrs);
static const zend_function_entry class_Kafka_Metadata_Partition_methods[] = {
ZEND_ME(Kafka_Metadata_Partition, getId, arginfo_class_Kafka_Metadata_Partition_getId, ZEND_ACC_PUBLIC)
- ZEND_ME(Kafka_Metadata_Partition, getErr, arginfo_class_Kafka_Metadata_Partition_getErr, ZEND_ACC_PUBLIC)
+ ZEND_ME(Kafka_Metadata_Partition, getErrorCode, arginfo_class_Kafka_Metadata_Partition_getErrorCode, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Metadata_Partition, getLeader, arginfo_class_Kafka_Metadata_Partition_getLeader, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Metadata_Partition, getReplicas, arginfo_class_Kafka_Metadata_Partition_getReplicas, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Metadata_Partition, getIsrs, arginfo_class_Kafka_Metadata_Partition_getIsrs, ZEND_ACC_PUBLIC)
diff --git a/metadata_topic.c b/metadata_topic.c
index 8a0ba1c..d818303 100644
--- a/metadata_topic.c
+++ b/metadata_topic.c
@@ -110,9 +110,9 @@ ZEND_METHOD(Kafka_Metadata_Topic, getTopic)
}
/* }}} */
-/* {{{ proto int Kafka\MetadataTopic::getErr()
+/* {{{ proto int Kafka\MetadataTopic::getErrorCode()
Error */
-ZEND_METHOD(Kafka_Metadata_Topic, getErr)
+ZEND_METHOD(Kafka_Metadata_Topic, getErrorCode)
{
object_intern *intern;
diff --git a/metadata_topic.stub.php b/metadata_topic.stub.php
index e5f65e2..14180db 100644
--- a/metadata_topic.stub.php
+++ b/metadata_topic.stub.php
@@ -8,7 +8,7 @@ class Topic
{
public function getTopic(): string {}
- public function getErr(): int {}
+ public function getErrorCode(): int {}
public function getPartitions(): Collection {}
}
diff --git a/metadata_topic_arginfo.h b/metadata_topic_arginfo.h
index b5172a1..211d1c3 100644
--- a/metadata_topic_arginfo.h
+++ b/metadata_topic_arginfo.h
@@ -1,10 +1,10 @@
/* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 3950e26cab1ce664cffda7d6df362e2b488d2fe3 */
+ * Stub hash: 175cea1b9f430a214ccba2de3ef94b39531fcc6b */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Metadata_Topic_getTopic, 0, 0, IS_STRING, 0)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Metadata_Topic_getErr, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Metadata_Topic_getErrorCode, 0, 0, IS_LONG, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Kafka_Metadata_Topic_getPartitions, 0, 0, Kafka\\Metadata\\Collection, 0)
@@ -12,13 +12,13 @@ ZEND_END_ARG_INFO()
ZEND_METHOD(Kafka_Metadata_Topic, getTopic);
-ZEND_METHOD(Kafka_Metadata_Topic, getErr);
+ZEND_METHOD(Kafka_Metadata_Topic, getErrorCode);
ZEND_METHOD(Kafka_Metadata_Topic, getPartitions);
static const zend_function_entry class_Kafka_Metadata_Topic_methods[] = {
ZEND_ME(Kafka_Metadata_Topic, getTopic, arginfo_class_Kafka_Metadata_Topic_getTopic, ZEND_ACC_PUBLIC)
- ZEND_ME(Kafka_Metadata_Topic, getErr, arginfo_class_Kafka_Metadata_Topic_getErr, ZEND_ACC_PUBLIC)
+ ZEND_ME(Kafka_Metadata_Topic, getErrorCode, arginfo_class_Kafka_Metadata_Topic_getErrorCode, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Metadata_Topic, getPartitions, arginfo_class_Kafka_Metadata_Topic_getPartitions, ZEND_ACC_PUBLIC)
ZEND_FE_END
};
From 0ede73ee6947181bec714212e2d816ce52660037 Mon Sep 17 00:00:00 2001
From: nick <nickjobszh@gmail.com>
Date: Mon, 28 Dec 2020 12:56:17 +0100
Subject: [PATCH 2/2] rename getTopic
---
metadata_topic.c | 4 ++--
metadata_topic.stub.php | 2 +-
metadata_topic_arginfo.h | 8 ++++----
tests/metadata.phpt | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/metadata_topic.c b/metadata_topic.c
index d818303..a64950b 100644
--- a/metadata_topic.c
+++ b/metadata_topic.c
@@ -92,9 +92,9 @@ static HashTable *get_debug_info(Z_KAFKA_OBJ *object, int *is_temp) /* {{{ */
}
/* }}} */
-/* {{{ proto string Kafka\MetadataTopic::getTopic()
+/* {{{ proto string Kafka\MetadataTopic::getName()
Topic name */
-ZEND_METHOD(Kafka_Metadata_Topic, getTopic)
+ZEND_METHOD(Kafka_Metadata_Topic, getName)
{
object_intern *intern;
diff --git a/metadata_topic.stub.php b/metadata_topic.stub.php
index 14180db..5a3a0b0 100644
--- a/metadata_topic.stub.php
+++ b/metadata_topic.stub.php
@@ -6,7 +6,7 @@
class Topic
{
- public function getTopic(): string {}
+ public function getName(): string {}
public function getErrorCode(): int {}
diff --git a/metadata_topic_arginfo.h b/metadata_topic_arginfo.h
index 211d1c3..1cefc6d 100644
--- a/metadata_topic_arginfo.h
+++ b/metadata_topic_arginfo.h
@@ -1,7 +1,7 @@
/* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 175cea1b9f430a214ccba2de3ef94b39531fcc6b */
+ * Stub hash: 9d73f729b3dca2b6ac7fd5fdc39ba23d768ca792 */
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Metadata_Topic_getTopic, 0, 0, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Metadata_Topic_getName, 0, 0, IS_STRING, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Kafka_Metadata_Topic_getErrorCode, 0, 0, IS_LONG, 0)
@@ -11,13 +11,13 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Kafka_Metadata_Topic_getPar
ZEND_END_ARG_INFO()
-ZEND_METHOD(Kafka_Metadata_Topic, getTopic);
+ZEND_METHOD(Kafka_Metadata_Topic, getName);
ZEND_METHOD(Kafka_Metadata_Topic, getErrorCode);
ZEND_METHOD(Kafka_Metadata_Topic, getPartitions);
static const zend_function_entry class_Kafka_Metadata_Topic_methods[] = {
- ZEND_ME(Kafka_Metadata_Topic, getTopic, arginfo_class_Kafka_Metadata_Topic_getTopic, ZEND_ACC_PUBLIC)
+ ZEND_ME(Kafka_Metadata_Topic, getName, arginfo_class_Kafka_Metadata_Topic_getName, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Metadata_Topic, getErrorCode, arginfo_class_Kafka_Metadata_Topic_getErrorCode, ZEND_ACC_PUBLIC)
ZEND_ME(Kafka_Metadata_Topic, getPartitions, arginfo_class_Kafka_Metadata_Topic_getPartitions, ZEND_ACC_PUBLIC)
ZEND_FE_END
diff --git a/tests/metadata.phpt b/tests/metadata.phpt
index b9b546b..fa7fc2e 100644
--- a/tests/metadata.phpt
+++ b/tests/metadata.phpt
@@ -43,7 +43,7 @@ echo $metadata->getOrigBrokerName() . PHP_EOL;
$topics = $metadata->getTopics();
while ($topics->valid()) {
- echo $topics->current()->getTopic() . PHP_EOL;
+ echo $topics->current()->getName() . PHP_EOL;
echo $topics->current()->getPartitions()->count() . PHP_EOL;
echo $topics->current()->getPartitions()->current()->getLeader() . PHP_EOL;
$topics->next();