From f6a02bd21abeff5ff4b421a288d47bd85fa1d200 Mon Sep 17 00:00:00 2001 From: Louis Cuny <53217-louis-cuny@users.noreply.drupalcode.org> Date: Tue, 21 May 2024 07:43:57 +0000 Subject: [PATCH] Issue #3318381 by astoker88, louis-cuny, fgm: Bump ext-rdkafka dependency for PHP 8.1 and D10 compatibility --- README.md | 10 +++++----- composer.json | 15 ++++----------- kafka.info.yml | 4 ++-- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 195bc8c..b52fea3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Kafka] for [Drupal] 8 +# [Kafka] for [Drupal] 9/10/11 [Kafka]: https://kafka.apache.org/ [Drupal]: https://drupal.org/ @@ -6,7 +6,7 @@ ## Features -* Drupal 9/8 [Queue API] backend. Queue names map to Kafka topics. +* Drupal 9/10/11 [Queue API] backend. Queue names map to Kafka topics. * Standard Drush commands to consume the queue: `drush queue-list` / `drush queue-run` * Code design documented in [`DESIGN.md`] * (planned): [PSR-3] Log appender. Logger channels map to Kafka topics. @@ -40,7 +40,7 @@ version 2.0 or later (SPDX: GPL-2.0+). ## Install -* Install the Drupal 9 (or 8.9) site without the module. +* Install the Drupal 9, 10 or 11 site without the module. * Get IP, port, and list of topics names for the Kafka broker (0.11 or later) you will be using. * Install the `librdkafka` client library as described under "Requirements". * Install the `php-rdkafka` PHP extension as described under "Requirements". @@ -55,11 +55,11 @@ version 2.0 or later (SPDX: GPL-2.0+). ## Requirements -* drupal/core: `^8.9 || ^9 || ^10` +* drupal/core: `^9 || ^10 || ^11` * Apache Kafka 0.10.1.0 or later * `libradkafka` * https://github.com/edenhill/librdkafka#installation -* `php-rdkafka` 5.0.0 or later for PHP ^7.3 || ^8 +* `php-rdkafka` 6.0.0 or later for PHP ^8 * https://arnaud.le-blanc.net/php-rdkafka-doc/phpdoc/rdkafka.installation.html diff --git a/composer.json b/composer.json index 4a24550..6365a03 100644 --- a/composer.json +++ b/composer.json @@ -10,21 +10,14 @@ "Drupal\\kafka\\Composer\\": "src/Composer" } }, - "description": "A Drupal 9/8 facade for Apache Kafka, based on librdkafka.", - "extra": { - "drush": { - "services": { - "drush.services.yml": "^9 || ^10" - } - } - }, + "description": "A Drupal 9/10/11 facade for Apache Kafka, based on librdkafka.", "license": "GPL-2.0-or-later", "minimum-stability": "dev", "name": "drupal/kafka", "require": { - "ext-rdkafka": "^5.0", - "php": "^7.3 || ^8.0", - "psr/log": "^1.0" + "ext-rdkafka": "^5.0 || ^6.0", + "php": ">=8.1", + "psr/log": "^1.0 || ^3.0" }, "scripts": { "pre-install-cmd": [ diff --git a/kafka.info.yml b/kafka.info.yml index f197b20..36288d2 100644 --- a/kafka.info.yml +++ b/kafka.info.yml @@ -1,6 +1,6 @@ name: Kafka type: module description: Queue API adapter for Apache Kafka -core_version_requirement: ^8 || ^9 || ^10 +core_version_requirement: ^9 || ^10 || ^11 package: Performance -php: 7.3 +php: 8.1 -- GitLab