Feat(MPM-533): rdkafka6.0-support (#67)

jobcloud · Feb 21, 2022 · 92babf8 · 92babf8
1 parent 15b92ec
commit 92babf8
Show file tree

Hide file tree

Showing 33 changed files with 10 additions and 34 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2.1
 
 orbs:
-  ci-caching: jobcloud/ci-caching@1.0.2
-  ci-php: jobcloud/ci-php@0.32
+  ci-caching: jobcloud/ci-caching@3.0
+  ci-php: jobcloud/ci-php@2.1
 
 workflows:
   test-php-kafka-lib:

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ test: pcov-disable
 
 static-analysis: pcov-disable
 	mkdir -p build/logs/phpstan
-	${PHPSTAN} analyse --no-progress --memory-limit=64
+	${PHPSTAN} analyse --no-progress
 
 update-dependencies:
 	composer update

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
   ],
   "require": {
     "php": "^7.3|^8.0",
-    "ext-rdkafka": "^4.0|^5.0",
+    "ext-rdkafka": "^4.0|^5.0|^6.0",
     "ext-json": "*"
   },
   "require-dev": {
@@ -44,5 +44,10 @@
     "branch-alias": {
       "dev-master": "2.0-dev"
     }
+  },
+  "config": {
+    "allow-plugins": {
+      "infection/extension-installer": false
+    }
   }
 }
diff --git a/docker/dev/php/Dockerfile b/docker/dev/php/Dockerfile
@@ -31,7 +31,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
 
 # PHP: Install php extensions
 RUN pecl channel-update pecl.php.net && \
-    pecl install rdkafka pcov && \
+    pecl install rdkafka-6.0.1 pcov && \
     docker-php-ext-install pcntl && \
     php-ext-enable rdkafka pcntl pcov
 

diff --git a/src/Callback/KafkaConsumerRebalanceCallback.php b/src/Callback/KafkaConsumerRebalanceCallback.php
@@ -15,7 +15,6 @@
 
 final class KafkaConsumerRebalanceCallback
 {
-
     /**
      * @param RdKafkaConsumer $consumer
      * @param integer         $errorCode

diff --git a/src/Callback/KafkaErrorCallback.php b/src/Callback/KafkaErrorCallback.php
@@ -12,7 +12,6 @@
 
 final class KafkaErrorCallback
 {
-
     /**
      * @param mixed   $kafka
      * @param integer $errorCode

diff --git a/src/Conf/KafkaConfiguration.php b/src/Conf/KafkaConfiguration.php
@@ -11,7 +11,6 @@
 
 class KafkaConfiguration extends RdKafkaConf
 {
-
     /**
      * @var string[]
      */

diff --git a/src/Consumer/AbstractKafkaConsumer.php b/src/Consumer/AbstractKafkaConsumer.php
@@ -20,7 +20,6 @@
 
 abstract class AbstractKafkaConsumer implements KafkaConsumerInterface
 {
-
     /**
      * @var KafkaConfiguration
      */

diff --git a/src/Consumer/KafkaConsumerBuilder.php b/src/Consumer/KafkaConsumerBuilder.php
@@ -14,7 +14,6 @@
 
 final class KafkaConsumerBuilder implements KafkaConsumerBuilderInterface
 {
-
     public const CONSUMER_TYPE_LOW_LEVEL = 'low';
     public const CONSUMER_TYPE_HIGH_LEVEL = 'high';
 

diff --git a/src/Consumer/KafkaConsumerBuilderInterface.php b/src/Consumer/KafkaConsumerBuilderInterface.php
@@ -8,7 +8,6 @@
 
 interface KafkaConsumerBuilderInterface
 {
-
     public const OFFSET_BEGINNING = RD_KAFKA_OFFSET_BEGINNING;
     public const OFFSET_END = RD_KAFKA_OFFSET_END;
     public const OFFSET_STORED = RD_KAFKA_OFFSET_STORED;

diff --git a/src/Consumer/KafkaHighLevelConsumer.php b/src/Consumer/KafkaHighLevelConsumer.php
@@ -19,7 +19,6 @@
 
 final class KafkaHighLevelConsumer extends AbstractKafkaConsumer implements KafkaHighLevelConsumerInterface
 {
-
     /**
      * @var RdKafkaHighLevelConsumer
      */

diff --git a/src/Consumer/KafkaLowLevelConsumer.php b/src/Consumer/KafkaLowLevelConsumer.php
@@ -19,7 +19,6 @@
 
 final class KafkaLowLevelConsumer extends AbstractKafkaConsumer implements KafkaLowLevelConsumerInterface
 {
-
     /**
      * @var RdKafkaLowLevelConsumer
      */

diff --git a/src/Consumer/KafkaLowLevelConsumerInterface.php b/src/Consumer/KafkaLowLevelConsumerInterface.php
@@ -6,5 +6,4 @@
 
 interface KafkaLowLevelConsumerInterface extends KafkaConsumerInterface
 {
-
 }
diff --git a/src/Consumer/TopicSubscription.php b/src/Consumer/TopicSubscription.php
@@ -6,7 +6,6 @@
 
 final class TopicSubscription implements TopicSubscriptionInterface
 {
-
     /**
      * @var string
      */

diff --git a/src/Consumer/TopicSubscriptionInterface.php b/src/Consumer/TopicSubscriptionInterface.php
@@ -6,7 +6,6 @@
 
 interface TopicSubscriptionInterface
 {
-
     /**
      * @return string
      */

diff --git a/src/Exception/KafkaConsumerConsumeException.php b/src/Exception/KafkaConsumerConsumeException.php
@@ -8,7 +8,6 @@
 
 class KafkaConsumerConsumeException extends \Exception
 {
-
     public const NOT_SUBSCRIBED_EXCEPTION_MESSAGE = 'This consumer is currently not subscribed';
 
     /**

diff --git a/src/Exception/KafkaConsumerEndOfPartitionException.php b/src/Exception/KafkaConsumerEndOfPartitionException.php
@@ -6,5 +6,4 @@
 
 class KafkaConsumerEndOfPartitionException extends \Exception
 {
-
 }
diff --git a/src/Exception/KafkaConsumerTimeoutException.php b/src/Exception/KafkaConsumerTimeoutException.php
@@ -6,5 +6,4 @@
 
 class KafkaConsumerTimeoutException extends \Exception
 {
-
 }
diff --git a/src/Message/AbstractKafkaMessage.php b/src/Message/AbstractKafkaMessage.php
@@ -6,7 +6,6 @@
 
 abstract class AbstractKafkaMessage implements KafkaMessageInterface
 {
-
     /**
      * @var string|null
      */

diff --git a/src/Message/Decoder/JsonDecoder.php b/src/Message/Decoder/JsonDecoder.php
@@ -9,7 +9,6 @@
 
 class JsonDecoder implements DecoderInterface
 {
-
     /**
      * @param KafkaConsumerMessageInterface $consumerMessage
      * @return KafkaConsumerMessageInterface

diff --git a/src/Message/Decoder/NullDecoder.php b/src/Message/Decoder/NullDecoder.php
@@ -8,7 +8,6 @@
 
 final class NullDecoder implements DecoderInterface
 {
-
     /**
      * @param KafkaConsumerMessageInterface $consumerMessage
      * @return KafkaConsumerMessageInterface

diff --git a/src/Message/Encoder/AvroEncoder.php b/src/Message/Encoder/AvroEncoder.php
@@ -14,7 +14,6 @@
 
 final class AvroEncoder implements AvroEncoderInterface
 {
-
     /**
      * @var AvroSchemaRegistryInterface
      */

diff --git a/src/Message/Encoder/JsonEncoder.php b/src/Message/Encoder/JsonEncoder.php
@@ -8,7 +8,6 @@
 
 class JsonEncoder implements EncoderInterface
 {
-
     /**
      * @param KafkaProducerMessageInterface $producerMessage
      * @return KafkaProducerMessageInterface

diff --git a/src/Message/Encoder/NullEncoder.php b/src/Message/Encoder/NullEncoder.php
@@ -8,7 +8,6 @@
 
 final class NullEncoder implements EncoderInterface
 {
-
     /**
      * @param KafkaProducerMessageInterface $producerMessage
      * @return KafkaProducerMessageInterface

diff --git a/src/Message/KafkaAvroSchema.php b/src/Message/KafkaAvroSchema.php
@@ -6,7 +6,6 @@
 
 final class KafkaAvroSchema implements KafkaAvroSchemaInterface
 {
-
     /**
      * @var string
      */

diff --git a/src/Message/KafkaAvroSchemaInterface.php b/src/Message/KafkaAvroSchemaInterface.php
@@ -6,7 +6,6 @@
 
 interface KafkaAvroSchemaInterface
 {
-
     public const LATEST_VERSION = -1;
 
     /**

diff --git a/src/Message/KafkaConsumerMessage.php b/src/Message/KafkaConsumerMessage.php
@@ -6,7 +6,6 @@
 
 final class KafkaConsumerMessage extends AbstractKafkaMessage implements KafkaConsumerMessageInterface
 {
-
     /**
      * @var int
      */

diff --git a/src/Message/KafkaConsumerMessageInterface.php b/src/Message/KafkaConsumerMessageInterface.php
@@ -6,7 +6,6 @@
 
 interface KafkaConsumerMessageInterface extends KafkaMessageInterface
 {
-
     /**
      * @return integer
      */

diff --git a/src/Message/KafkaMessageInterface.php b/src/Message/KafkaMessageInterface.php
@@ -6,7 +6,6 @@
 
 interface KafkaMessageInterface
 {
-
     /**
      * Returns the message key or null if the message doesn't have a body
      * @return mixed

diff --git a/src/Message/KafkaProducerMessage.php b/src/Message/KafkaProducerMessage.php
@@ -6,7 +6,6 @@
 
 final class KafkaProducerMessage extends AbstractKafkaMessage implements KafkaProducerMessageInterface
 {
-
     /**
      * @param string  $topicName
      * @param integer $partition

diff --git a/src/Message/KafkaProducerMessageInterface.php b/src/Message/KafkaProducerMessageInterface.php
@@ -6,7 +6,6 @@
 
 interface KafkaProducerMessageInterface extends KafkaMessageInterface
 {
-
     /**
      * @param string  $topicName
      * @param integer $partition

diff --git a/src/Producer/KafkaProducer.php b/src/Producer/KafkaProducer.php
@@ -18,7 +18,6 @@
 
 final class KafkaProducer implements KafkaProducerInterface
 {
-
     /**
      * @var RdKafkaProducer
      */

diff --git a/src/Producer/KafkaProducerInterface.php b/src/Producer/KafkaProducerInterface.php
@@ -10,7 +10,6 @@
 
 interface KafkaProducerInterface
 {
-
     /**
      * @param KafkaProducerMessageInterface $message
      * @param boolean $autoPoll
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ @@
     final class KafkaConsumerRebalanceCallback
     {
         /**
          * @param RdKafkaConsumer $consumer
          * @param integer         $errorCode
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,5 +6,4 @@

		interface KafkaLowLevelConsumerInterface extends KafkaConsumerInterface
		{

		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,5 +6,4 @@

		class KafkaConsumerEndOfPartitionException extends \Exception
		{

		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,5 +6,4 @@

		class KafkaConsumerTimeoutException extends \Exception
		{

		}