Fix newTopic() arginfo (#502)

arnaud-lb · Dec 7, 2021 · d840cf4 · d840cf4
1 parent 990a489
commit d840cf4
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 8 deletions.
diff --git a/kafka_consumer.stub.php b/kafka_consumer.stub.php
@@ -49,7 +49,7 @@ public function unsubscribe(): void {}
     public function getMetadata(bool $all_topics, Topic $only_topic, int $timeout_ms): Metadata {}
 
     /** @tentative-return-type */
-    public function newTopic(string $topic_name, ?Conf $topic_conf = null): KafkaConsumerTopic {}
+    public function newTopic(string $topic_name, ?TopicConf $topic_conf = null): KafkaConsumerTopic {}
 
     /** @tentative-return-type */
     public function getCommittedOffsets(array $topic_partitions, int $timeout_ms): array {}

diff --git a/kafka_consumer_arginfo.h b/kafka_consumer_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 777873a7819e8d15fbcdd0390c33489658fd4de3 */
+ * Stub hash: aee362c9762bd72d620b36f1e5686d96e09b9cac */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_KafkaConsumer___construct, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, conf, RdKafka\\Conf, 0)
@@ -41,7 +41,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_RdKafka_KafkaConsumer_newTopic, 0, 1, RdKafka\\KafkaConsumerTopic, 0)
 	ZEND_ARG_TYPE_INFO(0, topic_name, IS_STRING, 0)
-	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, topic_conf, RdKafka\\Conf, 1, "null")
+	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, topic_conf, RdKafka\\TopicConf, 1, "null")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_RdKafka_KafkaConsumer_getCommittedOffsets, 0, 2, IS_ARRAY, 0)

diff --git a/kafka_consumer_legacy_arginfo.h b/kafka_consumer_legacy_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 777873a7819e8d15fbcdd0390c33489658fd4de3 */
+ * Stub hash: aee362c9762bd72d620b36f1e5686d96e09b9cac */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka_KafkaConsumer___construct, 0, 0, 1)
 	ZEND_ARG_INFO(0, conf)

diff --git a/package.xml b/package.xml
@@ -122,6 +122,7 @@
     <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="new_topic_with_conf.phpt"/>
     <file role="test" name="pause_resume.phpt"/>
     <file role="test" name="produce_consume.phpt"/>
     <file role="test" name="produce_consume_queue.phpt"/>

diff --git a/rdkafka.stub.php b/rdkafka.stub.php
@@ -37,7 +37,7 @@ public function metadata(bool $all_topics, ?RdKafka\Topic $only_topic, int $time
         public function setLogLevel(int $level): void {}
 
         /** @tentative-return-type */
-        public function newTopic(string $topic_name, ?RdKafka\Conf $topic_conf = null): RdKafka\Topic {}
+        public function newTopic(string $topic_name, ?RdKafka\TopicConf $topic_conf = null): RdKafka\Topic {}
 
         /**
          * @alias RdKafka::getOutQLen

diff --git a/rdkafka_arginfo.h b/rdkafka_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 534b40ff0c32bc39196c1735bdd6d5676a073e6f */
+ * Stub hash: fbfdb28740208d5f909e9db261bea0aa26bfd471 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -25,7 +25,7 @@ ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(arginfo_class_RdKafka_newTopic, 0, 1, RdKafka\\Topic, 0)
 	ZEND_ARG_TYPE_INFO(0, topic_name, IS_STRING, 0)
-	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, topic_conf, RdKafka\\Conf, 1, "null")
+	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, topic_conf, RdKafka\\TopicConf, 1, "null")
 ZEND_END_ARG_INFO()
 
 #define arginfo_class_RdKafka_outqLen arginfo_class_RdKafka_getOutQLen

diff --git a/rdkafka_legacy_arginfo.h b/rdkafka_legacy_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 534b40ff0c32bc39196c1735bdd6d5676a073e6f */
+ * Stub hash: fbfdb28740208d5f909e9db261bea0aa26bfd471 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_RdKafka___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()

diff --git a/tests/new_topic_with_conf.phpt b/tests/new_topic_with_conf.phpt
@@ -0,0 +1,31 @@
+--TEST--
+newTopic with topic conf
+--SKIPIF--
+<?php
+require __DIR__ . '/integration-tests-check.php';
+--FILE--
+<?php
+require __DIR__ . '/integration-tests-check.php';
+
+$conf = new RdKafka\Conf();
+$conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS'));
+
+$topicName = "test";
+$topicConf = new RdKafka\TopicConf();
+
+$producer = new RdKafka\Producer($conf);
+var_dump(get_class($producer->newtopic($topicName, $topicConf)));
+
+$conf = new RdKafka\Conf();
+$conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS'));
+$conf->set('group.id', sprintf("test_rdkafka_group_%s", uniqid()));
+
+$consumer = new RdKafka\Consumer($conf);
+var_dump(get_class($consumer->newtopic($topicName, $topicConf)));
+
+$kafkaConsumer = new RdKafka\KafkaConsumer($conf);
+var_dump(get_class($kafkaConsumer->newtopic($topicName, $topicConf)));
+--EXPECT--
+string(21) "RdKafka\ProducerTopic"
+string(21) "RdKafka\ConsumerTopic"
+string(26) "RdKafka\KafkaConsumerTopic"