Upgrade to php 8.3

composer.json

@@ -12,9 +12,9 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^10.5|^11.5.3",
-        "orchestra/testbench": "^7.16|^8.0|^9.0|^10.0",
+        "orchestra/testbench": "^9.0|^10.0",
         "predis/predis": "^1",
-        "rector/rector": "^0.19.8",
+        "rector/rector": "^2.1",
         "laravel/pint": "dev-main"
     },
     "minimum-stability": "dev",

rector.php

@@ -7,7 +7,6 @@
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
         __DIR__.'/config',
-        __DIR__.'/dev',
         __DIR__.'/src',
         __DIR__.'/tests',
     ]);
@@ -17,6 +16,6 @@
 
     // define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_83,
     ]);
 };

src/Commit/RetryableCommitter.php

@@ -10,7 +10,7 @@
 
 class RetryableCommitter implements Committer
 {
-    private const RETRYABLE_ERRORS = [
+    private const array RETRYABLE_ERRORS = [
         RD_KAFKA_RESP_ERR_ILLEGAL_GENERATION,
         RD_KAFKA_RESP_ERR_REQUEST_TIMED_OUT,
         RD_KAFKA_RESP_ERR_REBALANCE_IN_PROGRESS,

src/Config/Config.php

@@ -9,11 +9,11 @@
 
 class Config
 {
-    final public const SASL_PLAINTEXT = 'SASL_PLAINTEXT';
+    final public const string SASL_PLAINTEXT = 'SASL_PLAINTEXT';
 
-    final public const SASL_SSL = 'SASL_SSL';
+    final public const string SASL_SSL = 'SASL_SSL';
 
-    final public const PRODUCER_ONLY_CONFIG_OPTIONS = [
+    final public const array PRODUCER_ONLY_CONFIG_OPTIONS = [
         'transactional.id',
         'transaction.timeout.ms',
         'enable.idempotence',
@@ -36,7 +36,7 @@ class Config
         'sticky.partitioning.linger.ms',
     ];
 
-    final public const CONSUMER_ONLY_CONFIG_OPTIONS = [
+    final public const array CONSUMER_ONLY_CONFIG_OPTIONS = [
         'partition.assignment.strategy',
         'session.timeout.ms',
         'heartbeat.interval.ms',

src/Consumers/Consumer.php

@@ -33,23 +33,23 @@
 
 class Consumer implements MessageConsumer
 {
-    private const IGNORABLE_CONSUMER_ERRORS = [
+    private const array IGNORABLE_CONSUMER_ERRORS = [
         RD_KAFKA_RESP_ERR__PARTITION_EOF,
         RD_KAFKA_RESP_ERR__TRANSPORT,
         RD_KAFKA_RESP_ERR_REQUEST_TIMED_OUT,
         RD_KAFKA_RESP_ERR__TIMED_OUT,
     ];
 
-    private const CONSUME_STOP_EOF_ERRORS = [
+    private const array CONSUME_STOP_EOF_ERRORS = [
         RD_KAFKA_RESP_ERR__PARTITION_EOF,
         RD_KAFKA_RESP_ERR__TIMED_OUT,
     ];
 
-    private const TIMEOUT_ERRORS = [
+    private const array TIMEOUT_ERRORS = [
         RD_KAFKA_RESP_ERR_REQUEST_TIMED_OUT,
     ];
 
-    private const IGNORABLE_COMMIT_ERRORS = [
+    private const array IGNORABLE_COMMIT_ERRORS = [
         RD_KAFKA_RESP_ERR__NO_OFFSET,
     ];
 
@@ -73,9 +73,9 @@ class Consumer implements MessageConsumer
 
     private bool $stopRequested = false;
 
-    private ?Closure $whenStopConsuming;
+    private readonly ?Closure $whenStopConsuming;
 
-    private Dispatcher $dispatcher;
+    private readonly Dispatcher $dispatcher;
 
     public function __construct(private readonly Config $config, private readonly MessageDeserializer $deserializer, ?CommitterFactory $committerFactory = null)
     {
@@ -390,7 +390,7 @@ private function buildHeadersForDlq(Message $message, ?Throwable $throwable = nu
 
         $throwableHeaders['kafka_throwable_message'] = $throwable->getMessage();
         $throwableHeaders['kafka_throwable_code'] = $throwable->getCode();
-        $throwableHeaders['kafka_throwable_class_name'] = get_class($throwable);
+        $throwableHeaders['kafka_throwable_class_name'] = $throwable::class;
 
         return array_merge($message->headers ?? [], $throwableHeaders);
     }

src/Events/CouldNotPublishMessage.php

@@ -4,11 +4,11 @@
 
 use Throwable;
 
-final class CouldNotPublishMessage
+final readonly class CouldNotPublishMessage
 {
     public function __construct(
-        public readonly int $errorCode,
-        public readonly string $message,
-        public readonly Throwable $throwable,
+        public int $errorCode,
+        public string $message,
+        public Throwable $throwable,
     ) {}
 }

src/Events/MessageConsumed.php

@@ -4,10 +4,10 @@
 
 use Junges\Kafka\Contracts\ConsumerMessage;
 
-final class MessageConsumed
+final readonly class MessageConsumed
 {
     public function __construct(
-        public readonly ConsumerMessage $message
+        public ConsumerMessage $message
     ) {}
 
     public function getMessageIdentifier(): string

src/Events/MessagePublished.php

@@ -4,10 +4,10 @@
 
 use Junges\Kafka\Contracts\ProducerMessage;
 
-final class MessagePublished
+final readonly class MessagePublished
 {
     public function __construct(
-        public readonly ProducerMessage $message,
+        public ProducerMessage $message,
     ) {}
 
     public function getMessageIdentifier(): string

src/Events/PublishingMessage.php

@@ -4,10 +4,10 @@
 
 use Junges\Kafka\Contracts\ProducerMessage;
 
-final class PublishingMessage
+final readonly class PublishingMessage
 {
     public function __construct(
-        public readonly ProducerMessage $message,
+        public ProducerMessage $message,
     ) {}
 
     public function getMessageIdentifier(): string

src/Exceptions/SchemaRegistryException.php

@@ -4,5 +4,5 @@
 
 class SchemaRegistryException extends LaravelKafkaException
 {
-    final public const SCHEMA_MAPPING_NOT_FOUND = 'There is no schema mapping topic: %s, type: %s';
+    final public const string SCHEMA_MAPPING_NOT_FOUND = 'There is no schema mapping topic: %s, type: %s';
 }

src/Exceptions/Serializers/AvroSerializerException.php

@@ -6,7 +6,7 @@
 
 class AvroSerializerException extends LaravelKafkaException
 {
-    final public const NO_SCHEMA_FOR_TOPIC_MESSAGE = 'There is no %s avro schema defined for the topic %s';
+    final public const string NO_SCHEMA_FOR_TOPIC_MESSAGE = 'There is no %s avro schema defined for the topic %s';
 
-    final public const UNABLE_TO_LOAD_DEFINITION_MESSAGE = 'Was unable to load definition for schema %s';
+    final public const string UNABLE_TO_LOAD_DEFINITION_MESSAGE = 'Was unable to load definition for schema %s';
 }

src/Exceptions/Transactions/TransactionFatalErrorException.php

@@ -7,7 +7,7 @@
 
 final class TransactionFatalErrorException extends LaravelKafkaException
 {
-    private const FATAL_EXCEPTION_MESSAGE = 'Transaction failed with a fatal error. You must create a new producer as this one can not be used anymore. [%s]';
+    private const string FATAL_EXCEPTION_MESSAGE = 'Transaction failed with a fatal error. You must create a new producer as this one can not be used anymore. [%s]';
 
     public static function new(KafkaErrorException $baseException): self
     {

src/Exceptions/Transactions/TransactionShouldBeAbortedException.php

@@ -7,7 +7,7 @@
 
 final class TransactionShouldBeAbortedException extends LaravelKafkaException
 {
-    private const ABORTABLE_EXCEPTION_MESSAGE = 'Transaction failed. You must abort your current transaction and start a new one. [%s]';
+    private const string ABORTABLE_EXCEPTION_MESSAGE = 'Transaction failed. You must abort your current transaction and start a new one. [%s]';
 
     public static function new(KafkaErrorException $baseException): self
     {

src/Exceptions/Transactions/TransactionShouldBeRetriedException.php

@@ -7,7 +7,7 @@
 
 final class TransactionShouldBeRetriedException extends LaravelKafkaException
 {
-    private const RETRIABLE_EXCEPTION_MESSAGE = 'This transaction failed, but can be retried. [%s]';
+    private const string RETRIABLE_EXCEPTION_MESSAGE = 'This transaction failed, but can be retried. [%s]';
 
     public static function new(KafkaErrorException $baseException): self
     {

src/Message/Message.php

@@ -8,6 +8,7 @@
 use JetBrains\PhpStorm\Pure;
 use Junges\Kafka\AbstractMessage;
 use Junges\Kafka\Contracts\ProducerMessage;
+use Override;
 
 class Message extends AbstractMessage implements Arrayable, ProducerMessage
 {
@@ -81,6 +82,7 @@ public function withHeader(string $key, string|int|float $value): ProducerMessag
         return $this;
     }
 
+    #[Override]
     public function getHeaders(): ?array
     {
         // Here we insert an uuid to be used to uniquely identify this message. If the

src/Providers/LaravelKafkaServiceProvider.php

@@ -17,6 +17,7 @@
 use Junges\Kafka\Message\Deserializers\JsonDeserializer;
 use Junges\Kafka\Message\Message;
 use Junges\Kafka\Message\Serializers\JsonSerializer;
+use Override;
 
 class LaravelKafkaServiceProvider extends ServiceProvider
 {
@@ -32,6 +33,7 @@ public function boot(): void
         }
     }
 
+    #[Override]
     public function register(): void
     {
         $this->app->bind(MessageSerializer::class, fn () => new JsonSerializer);

src/Support/InfiniteTimer.php

@@ -2,8 +2,11 @@
 
 namespace Junges\Kafka\Support;
 
+use Override;
+
 class InfiniteTimer extends Timer
 {
+    #[Override]
     public function isTimedOut(): bool
     {
         return false;

src/Support/Testing/Fakes/BuilderFake.php

@@ -7,13 +7,15 @@
 use Junges\Kafka\Consumers\CallableConsumer;
 use Junges\Kafka\Contracts\ConsumerBuilder as ConsumerBuilderContract;
 use Junges\Kafka\Contracts\MessageConsumer;
+use Override;
 
 class BuilderFake extends Builder implements ConsumerBuilderContract
 {
     /** @var \Junges\Kafka\Contracts\ConsumerMessage[] */
     private array $messages = [];
 
     /** {@inheritDoc} */
+    #[Override]
     public static function create(?string $brokers, array $topics = [], ?string $groupId = null): self
     {
         return new self(
@@ -32,6 +34,7 @@ public function setMessages(array $messages): self
     }
 
     /** Build the Kafka consumer. */
+    #[Override]
     public function build(): MessageConsumer
     {
         $config = new Config(

tests/Commit/KafkaCommitterTest.php

@@ -24,9 +24,7 @@ public function it_can_commit(): void
             ->shouldReceive('commit')->once()
             ->andReturnSelf();
 
-        $this->app->bind(KafkaConsumer::class, function () use ($kafkaConsumer) {
-            return $kafkaConsumer->getMock();
-        });
+        $this->app->bind(KafkaConsumer::class, fn () => $kafkaConsumer->getMock());
 
         $config = new Config(
             broker: 'broker',
@@ -54,9 +52,7 @@ public function it_can_commit_to_dlq(): void
             ->shouldReceive('commit')->once()
             ->andReturnSelf();
 
-        $this->app->bind(KafkaConsumer::class, function () use ($kafkaConsumer) {
-            return $kafkaConsumer->getMock();
-        });
+        $this->app->bind(KafkaConsumer::class, fn () => $kafkaConsumer->getMock());
 
         $config = new Config(
             broker: 'broker',

tests/Commit/RetryableCommitterTest.php

@@ -68,7 +68,7 @@ public function it_should_progressively_wait_for_the_next_retry(): void
 
         try {
             $retryableCommitter->commitMessage(new Message, true);
-        } catch (RdKafkaException $exception) {
+        } catch (RdKafkaException) {
         }
 
         $expectedSleeps = [1e6, 2e6, 4e6, 8e6, 16e6, 32e6];

tests/Commit/SeekToCurrentErrorCommitterTest.php

@@ -60,6 +60,6 @@ public function it_passes_dlq_commits(): void
 
         $seekToCurrentErrorCommitter = new SeekToCurrentErrorCommitter($mockedKafkaConsumer, $mockedCommitter);
 
-        $seekToCurrentErrorCommitter->commitDlq(new Message, true);
+        $seekToCurrentErrorCommitter->commitDlq(new Message);
     }
 }

tests/Console/Consumers/OptionsTest.php

@@ -5,12 +5,14 @@
 use Junges\Kafka\Console\Commands\KafkaConsumer\Options;
 use Junges\Kafka\Tests\Fakes\FakeHandler;
 use Junges\Kafka\Tests\LaravelKafkaTestCase;
+use Override;
 use PHPUnit\Framework\Attributes\Test;
 
 class OptionsTest extends LaravelKafkaTestCase
 {
     private array $config;
 
+    #[Override]
     protected function setUp(): void
     {
         parent::setUp();

tests/Consumers/ConsumerTest.php

@@ -559,7 +559,7 @@ public function commitAsync(mixed $messageOrOffsets = null): void
             }
         };
 
-        $customCommitterFactory = new class($customCommitter) implements CommitterFactory
+        $customCommitterFactory = new readonly class($customCommitter) implements CommitterFactory
         {
             public function __construct(private \Junges\Kafka\Contracts\Committer $committer) {}
 
@@ -701,8 +701,6 @@ private function mockConsumerWithMessageAndPartitions(Message $message, array $p
             ->andReturn($partitions)
             ->getMock();
 
-        $this->app->bind(KafkaConsumer::class, function () use ($mockedKafkaConsumer) {
-            return $mockedKafkaConsumer;
-        });
+        $this->app->bind(KafkaConsumer::class, fn () => $mockedKafkaConsumer);
     }
 }

tests/Consumers/ManualCommitTest.php

@@ -440,7 +440,7 @@ public function it_handles_commit_errors_gracefully(): void
             function (ConsumerMessage $message, Consumer $consumer) use (&$exceptionThrown) {
                 try {
                     $consumer->commit($message);
-                } catch (Throwable $e) {
+                } catch (Throwable) {
                     $exceptionThrown = true;
                 }
             },
@@ -495,7 +495,7 @@ public function it_ignores_no_offset_commit_errors(): void
             function (ConsumerMessage $message, Consumer $consumer) use (&$noExceptionThrown) {
                 try {
                     $consumer->commit($message);
-                } catch (\RdKafka\Exception $e) {
+                } catch (\RdKafka\Exception) {
                     $noExceptionThrown = false;
                 }
             },

tests/FailingCommitter.php

@@ -8,21 +8,13 @@
 
 final class FailingCommitter implements Committer
 {
-    private int $timesToFail;
-
-    private Exception $failure;
-
     private int $timesTriedToCommitMessage = 0;
 
     private int $timesTriedToCommitDlq = 0;
 
     private int $commitCount = 0;
 
-    public function __construct(Exception $failure, int $timesToFail)
-    {
-        $this->failure = $failure;
-        $this->timesToFail = $timesToFail;
-    }
+    public function __construct(private readonly Exception $failure, private readonly int $timesToFail) {}
 
     /**
      * @throws Exception