hide internal const (#2)

* hide internal const, rename version const

* rename consts

* adjust tests

* fix test

Author: nick-zh

kafka.c

@@ -316,12 +316,10 @@ void register_err_constants(INIT_FUNC_ARGS) /* {{{ */
  */
 PHP_MINIT_FUNCTION(kafka)
 {
-    COPY_CONSTANT(RD_KAFKA_CONSUMER);
     COPY_CONSTANT(RD_KAFKA_OFFSET_BEGINNING);
     COPY_CONSTANT(RD_KAFKA_OFFSET_END);
     COPY_CONSTANT(RD_KAFKA_OFFSET_STORED);
     COPY_CONSTANT(RD_KAFKA_PARTITION_UA);
-    COPY_CONSTANT(RD_KAFKA_PRODUCER);
     COPY_CONSTANT(RD_KAFKA_MSG_F_BLOCK);
     COPY_CONSTANT(RD_KAFKA_PURGE_F_QUEUE);
     COPY_CONSTANT(RD_KAFKA_PURGE_F_INFLIGHT);

tests/init_transaction_not_configured.phpt

@@ -5,9 +5,6 @@ initTransaction() not configured
 require __DIR__ . '/integration-tests-check.php';
 
 $conf = new Kafka\Configuration();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
-    $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
-}
 
 $conf->set('metadata.broker.list', getenv('TEST_KAFKA_BROKERS'));
 
@@ -26,4 +23,4 @@ try {
 _NOT_CONFIGURED
 -145
 %s/tests/init_transaction_not_configured.php
-14
+11

tests/produce_consume.phpt

@@ -10,9 +10,6 @@ require __DIR__ . '/integration-tests-check.php';
 $delivered = 0;
 
 $conf = new Kafka\Configuration();
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
-    $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
-}
 $conf->setErrorCb(function ($producer, $errorCode, $errstr) {
     printf("%s: %s\n", rd_kafka_err2str($errorCode), $errstr);
     exit;

tests/produce_consume_transactional.phpt

@@ -14,9 +14,6 @@ $delivered = 0;
 
 $conf = new Kafka\Configuration();
 $conf->set('transactional.id', 'transactional-producer');
-if (RD_KAFKA_VERSION >= 0x090000 && false !== getenv('TEST_KAFKA_BROKER_VERSION')) {
-    $conf->set('broker.version.fallback', getenv('TEST_KAFKA_BROKER_VERSION'));
-}
 
 $conf->setErrorCb(function ($producer, $errorCode, $errstr) {
     printf("%s: %s\n", rd_kafka_err2str($errorCode), $errstr);

tests/test_env.php.sample

@@ -3,7 +3,3 @@
 if (false === getenv('TEST_KAFKA_BROKERS')) {
     putenv('TEST_KAFKA_BROKERS=localhost:9092');
 }
-
-if (false === getenv('TEST_KAFKA_BROKER_VERSION')) {
-    putenv('TEST_KAFKA_BROKER_VERSION=2.3');
-}