Fixing CI

There's an issue with the downstream PPA "ondrej/php" where is cannot find the gearman
package.

Refactoring Dockerfile to use standard base images as a workaround

Author: JimTools

.github/workflows/ci.yml

@@ -162,10 +162,4 @@ jobs:
         env:
           PHP_VERSION: ${{ matrix.php }}
 
-      # TODO: convert these two steps into one w/o excludes when Gearman extension gets a release for PHP 8.1
-      # See https://github.com/php/pecl-networking-gearman/issues/16
-      - run: bin/test.sh
-        if: ${{ matrix.php != '8.1' && matrix.php != '8.2' }}
-
-      - run: bin/test.sh --exclude-group=gearman
-        if: ${{ matrix.php == '8.1' && matrix.php != '8.2' }}
+      - run: bin/test.sh --group=functional

docker-compose.yml

@@ -1,13 +1,11 @@
-version: '2'
-
 services:
   dev:
     # when image publishing gets sorted:
-#    image: enqueue/dev:${PHP_VERSION:-7.4}
+    # image: enqueue/dev:${PHP_VERSION:-8.2}
     build:
       context: docker
       args:
-        PHP_VERSION: "${PHP_VERSION:-8.1}"
+        PHP_VERSION: "${PHP_VERSION:-8.2}"
     depends_on:
       - rabbitmq
       - mysql

docker/Dockerfile

@@ -1,76 +1,39 @@
 ARG PHP_VERSION=8.2
-FROM makasim/nginx-php-fpm:${PHP_VERSION}-all-exts
+FROM php:${PHP_VERSION}-alpine
 
 ARG PHP_VERSION
 
-## libs
-RUN set -x && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends --no-install-suggests \
-        wget \
-        curl \
-        openssl \
-        ca-certificates \
-        nano \
-        netcat \
-        php${PHP_VERSION}-dev \
-        php${PHP_VERSION}-redis \
-        php${PHP_VERSION}-pgsql \
-        git \
-        python \
-        php${PHP_VERSION}-amqp \
-        php${PHP_VERSION}-xml \
-        php${PHP_VERSION}-mysql \
-        php${PHP_VERSION}-curl \
-        php${PHP_VERSION}-mongodb \
-        php${PHP_VERSION}-mbstring \
-        make \
-        g++ \
-        unzip \
-    && \
-    update-alternatives --install /usr/bin/php php /usr/bin/php${PHP_VERSION} 100
-
-## gearman
-RUN set -x && \
-    apt-get install -y --no-install-recommends --no-install-suggests \
-        libgearman-dev \
-    && \
-    mkdir -p $HOME/gearman && \
-    cd $HOME/gearman && \
-    git clone https://github.com/php/pecl-networking-gearman.git . && \
-    git checkout gearman-2.1.0 && \
-    phpize && ./configure && make && make install && \
-    if [ ! -f /etc/php/${PHP_VERSION}/cli/conf.d/20-gearman.ini ]; then \
-        echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/cli/conf.d/20-gearman.ini && \
-        echo "extension=gearman.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/20-gearman.ini \
-        ; \
-    fi;
-
-## librdkafka
-RUN set -x && \
-    mkdir -p $HOME/librdkafka && \
-    cd $HOME/librdkafka && \
-    git clone https://github.com/edenhill/librdkafka.git . && \
-    git checkout v1.0.0 && \
-    ./configure && make && make install
-
-## php-rdkafka
-RUN set -x && \
-    mkdir -p $HOME/php-rdkafka && \
-    cd $HOME/php-rdkafka && \
-    git clone https://github.com/arnaud-lb/php-rdkafka.git . && \
-    git checkout 5.0.1 && \
-    phpize && ./configure && make all && make install && \
-    echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION}/cli/conf.d/10-rdkafka.ini && \
-    echo "extension=rdkafka.so" > /etc/php/${PHP_VERSION}/fpm/conf.d/10-rdkafka.ini
-
-COPY ./php/cli.ini /etc/php/${PHP_VERSION}/cli/conf.d/1-dev_cli.ini
+RUN --mount=type=cache,target=/var/cache/apk apk add --no-cache $PHPIZE_DEPS \
+    libpq-dev \
+    librdkafka-dev \
+    rabbitmq-c-dev \
+    linux-headers && \
+    apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing \
+    gearman-dev
+
+# Install First Party Modules
+RUN docker-php-ext-install -j$(nproc) \
+    pcntl \
+    pdo_mysql \
+    pdo_pgsql
+
+#  Install Third Party Modules
+RUN --mount=type=cache,target=/tmp/pear pecl install redis \
+    mongodb-1.21.0 \
+    gearman \
+    rdkafka \
+    xdebug && \
+    pecl install --configureoptions 'with-librabbitmq-dir="autodetect"' amqp
+RUN docker-php-ext-enable redis mongodb gearman rdkafka xdebug amqp
+
+COPY ./php/cli.ini /usr/local/etc/php/conf.d/1-dev_cli
 COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh
+RUN mv /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini
 RUN chmod u+x /usr/local/bin/entrypoint.sh
 
 RUN mkdir -p /mqdev
 WORKDIR /mqdev
 
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
-CMD /usr/local/bin/entrypoint.sh
+CMD ["/usr/local/bin/entrypoint.sh"]

docker/bin/dev_entrypoiny.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 while true; do sleep 1; done

docker/bin/test.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 # wait for service
 # $1 host

pkg/rdkafka/Tests/RdKafkaConsumerTest.php

@@ -190,6 +190,7 @@ public function testShouldReceiveFromQueueAndReturnMessageIfMessageInQueue()
         $kafkaMessage = new Message();
         $kafkaMessage->err = \RD_KAFKA_RESP_ERR_NO_ERROR;
         $kafkaMessage->payload = 'theSerializedMessage';
+        $kafkaMessage->partition = 0;
 
         $kafkaConsumer = $this->createKafkaConsumerMock();
         $kafkaConsumer