chore: add support for librdkafka v2.2.1, v2.8.0

dirx · dirx · commit 88d838504b55 · 2025-01-21T21:35:15.000+01:00
diff --git a/.github/workflows/test-extension-compatibility.yml b/.github/workflows/test-extension-compatibility.yml
@@ -15,7 +15,7 @@ jobs:
         php:
           - '8.1'
         librdkafka:
-          - 'v2.6.0'
+          - 'v2.8.0'
         rdkafka:
           - '6.x'
     services:
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -18,7 +18,7 @@ jobs:
           - '8.3'
           - '8.4'
         librdkafka:
-          - '2.6.1'
+          - '2.8.0'
     defaults:
       run:
         shell: bash
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,11 +28,12 @@ jobs:
           - '8.3'
           - '8.4'
         librdkafka:
+          - 'v2.8.0'
           - 'v2.6.1'
           - 'v2.5.3'
           - 'v2.4.0'
           - 'v2.3.0'
-          - 'v2.2.0'
+          - 'v2.2.1'
           - 'v2.1.1'
           - 'v2.0.2'
           - 'v1.9.2'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,11 @@ This pre-release improves compatible with the [PHP RdKafka extension](https://gi
 ### Added
 
 - Add support for PHP 8.3 and 8.4
-- Add support for librdkafka 2.1.0, 2.1.1, 2.2.0, 2.3.0, 2.4.0, 2.5.0, 2.5.3, 2.6.0, 2.6.1
+- Add support for librdkafka 2.1.0, 2.1.1, 2.2.0, 2.2.1, 2.3.0, 2.4.0, 2.5.0, 2.5.3, 2.6.0, 2.6.1, 2.8.0
+
+### Changed
+
+- Change internal usage for deprecated static FFI::new(), FFI:;cast(), FFI::type()
 
 ### Fixed
 
diff --git a/resources/docker/php74-librdkafka-ffi/Dockerfile b/resources/docker/php74-librdkafka-ffi/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-cli
 
 # enable ffi and install librdkafka
-ARG LIBRDKAFKA_VERSION=v2.6.1
+ARG LIBRDKAFKA_VERSION=v2.8.0
 ENV LIBRDKAFKA_VERSION=$LIBRDKAFKA_VERSION
 RUN set -e; \
     apt-get update; \
diff --git a/resources/docker/php80-librdkafka-ffi/Dockerfile b/resources/docker/php80-librdkafka-ffi/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:8.0-cli
 
 # enable ffi and install librdkafka
-ARG LIBRDKAFKA_VERSION=v2.6.1
+ARG LIBRDKAFKA_VERSION=v2.8.0
 ENV LIBRDKAFKA_VERSION=$LIBRDKAFKA_VERSION
 RUN set -e; \
     apt-get update; \
diff --git a/resources/docker/php81-librdkafka-ffi/Dockerfile b/resources/docker/php81-librdkafka-ffi/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:8.1-cli
 
 # enable ffi and install librdkafka
-ARG LIBRDKAFKA_VERSION=v2.6.1
+ARG LIBRDKAFKA_VERSION=v2.8.0
 ENV LIBRDKAFKA_VERSION=$LIBRDKAFKA_VERSION
 RUN set -e; \
     apt-get update; \
diff --git a/resources/docker/php82-librdkafka-ffi/Dockerfile b/resources/docker/php82-librdkafka-ffi/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:8.2-cli
 
 # enable ffi and install librdkafka
-ARG LIBRDKAFKA_VERSION=v2.6.1
+ARG LIBRDKAFKA_VERSION=v2.8.0
 ENV LIBRDKAFKA_VERSION=$LIBRDKAFKA_VERSION
 RUN set -e; \
     apt-get update; \
diff --git a/resources/docker/php83-librdkafka-ffi/Dockerfile b/resources/docker/php83-librdkafka-ffi/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:8.3-cli
 
 # enable ffi and install librdkafka
-ARG LIBRDKAFKA_VERSION=v2.6.1
+ARG LIBRDKAFKA_VERSION=v2.8.0
 ENV LIBRDKAFKA_VERSION=$LIBRDKAFKA_VERSION
 RUN set -e; \
     apt-get update; \
diff --git a/resources/docker/php84-librdkafka-ffi/Dockerfile b/resources/docker/php84-librdkafka-ffi/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:8.4-cli
 
 # enable ffi and install librdkafka
-ARG LIBRDKAFKA_VERSION=v2.6.1
+ARG LIBRDKAFKA_VERSION=v2.8.0
 ENV LIBRDKAFKA_VERSION=$LIBRDKAFKA_VERSION
 RUN set -e; \
     apt-get update; \
diff --git a/resources/ffigen/LibrdkafkaHeaderFiles.php b/resources/ffigen/LibrdkafkaHeaderFiles.php
@@ -94,7 +94,7 @@ private function loadSupportedVersions(): array
         foreach ($releases as $release) {
             if ($release->prerelease === false) {
                 $version = str_replace('v', '', $release->tag_name);
-                if (Comparator::greaterThanOrEqualTo($version, '1.0.0') && Comparator::lessThan($version, '2.7.0')) {
+                if (Comparator::greaterThanOrEqualTo($version, '1.0.0') && Comparator::lessThan($version, '2.9.0')) {
                     $supportedVersions[$version] = sprintf(
                         self::DOWNLOAD_BASE_URL_TEMPLATE,
                         $release->tag_name
diff --git a/src/RdKafka/FFI/Library.php b/src/RdKafka/FFI/Library.php
@@ -27,7 +27,7 @@ class Library
     use Methods;
 
     public const VERSION_AUTODETECT = '';
-    public const VERSION_LATEST = '2.6.1';
+    public const VERSION_LATEST = '2.8.0';
     public const PHP_LIBRARY_VERSION = '0.6.0';
 
     private static FFI $ffi;
diff --git a/src/RdKafka/FFI/Methods.php b/src/RdKafka/FFI/Methods.php
diff --git a/src/RdKafka/FFI/Versions/2.2.1.php b/src/RdKafka/FFI/Versions/2.2.1.php
diff --git a/src/RdKafka/FFI/Versions/2.8.0.php b/src/RdKafka/FFI/Versions/2.8.0.php
diff --git a/src/constants.php b/src/constants.php
