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

ruzakaranbol · web-flow · commit 92babf8fb8f9 · 2022-02-21T15:57:45.000+01:00
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 number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`],`
`19`	`19`	`"require": {`
`20`	`20`	`"php": "^7.3\|^8.0",`
`21`		`- "ext-rdkafka": "^4.0\|^5.0",`
	`21`	`+ "ext-rdkafka": "^4.0\|^5.0\|^6.0",`
`22`	`22`	`"ext-json": "*"`
`23`	`23`	`},`
`24`	`24`	`"require-dev": {`
`@@ -44,5 +44,10 @@`
`44`	`44`	`"branch-alias": {`
`45`	`45`	`"dev-master": "2.0-dev"`
`46`	`46`	`}`
	`47`	`+ },`
	`48`	`+ "config": {`
	`49`	`+ "allow-plugins": {`
	`50`	`+ "infection/extension-installer": false`
	`51`	`+ }`
`47`	`52`	`}`
`48`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`
`16`	`16`	`final class KafkaConsumerRebalanceCallback`
`17`	`17`	`{`
`18`		`-`
`19`	`18`	`/**`
`20`	`19`	`* @param RdKafkaConsumer $consumer`
`21`	`20`	`* @param integer $errorCode`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`
`13`	`13`	`final class KafkaErrorCallback`
`14`	`14`	`{`
`15`		`-`
`16`	`15`	`/**`
`17`	`16`	`* @param mixed $kafka`
`18`	`17`	`* @param integer $errorCode`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`class KafkaConfiguration extends RdKafkaConf`
`13`	`13`	`{`
`14`		`-`
`15`	`14`	`/**`
`16`	`15`	`* @var string[]`
`17`	`16`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`
`21`	`21`	`abstract class AbstractKafkaConsumer implements KafkaConsumerInterface`
`22`	`22`	`{`
`23`		`-`
`24`	`23`	`/**`
`25`	`24`	`* @var KafkaConfiguration`
`26`	`25`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`
`15`	`15`	`final class KafkaConsumerBuilder implements KafkaConsumerBuilderInterface`
`16`	`16`	`{`
`17`		`-`
`18`	`17`	`public const CONSUMER_TYPE_LOW_LEVEL = 'low';`
`19`	`18`	`public const CONSUMER_TYPE_HIGH_LEVEL = 'high';`
`20`	`19`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`
`9`	`9`	`interface KafkaConsumerBuilderInterface`
`10`	`10`	`{`
`11`		`-`
`12`	`11`	`public const OFFSET_BEGINNING = RD_KAFKA_OFFSET_BEGINNING;`
`13`	`12`	`public const OFFSET_END = RD_KAFKA_OFFSET_END;`
`14`	`13`	`public const OFFSET_STORED = RD_KAFKA_OFFSET_STORED;`