php-enqueue · makasim · Feb 17, 2021 · Jan 25, 2021 · Jan 25, 2021 · Jan 25, 2021
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
           extensions: mongodb, redis, :xdebug
           ini-values: memory_limit=2048M
 
-      - run: php ./bin/fix-symfony-version.php "4.3.*"
+      - run: php ./bin/fix-symfony-version.php "5.2.*"
 
       - uses: "ramsey/composer-install@v1"
 
@@ -50,7 +50,7 @@ jobs:
           extensions: mongodb, redis, :xdebug
           ini-values: memory_limit=2048M
 
-      - run: php ./bin/fix-symfony-version.php "4.3.*"
+      - run: php ./bin/fix-symfony-version.php "5.2.*"
 
       - uses: "ramsey/composer-install@v1"
 
@@ -102,6 +102,12 @@ jobs:
             functional_tests: false
             rdkafka_tests: false
             prepare_container: false
+          - php: 7.4
+            symfony_version: 5.2.*
+            unit_tests: true
+            functional_tests: false
+            rdkafka_tests: false
+            prepare_container: false
           - php: 7.3 # same as in the container
             symfony_version: 4.3.*
             unit_tests: false
@@ -120,6 +126,23 @@ jobs:
             functional_tests: false
             rdkafka_tests: true
             prepare_container: true
+          - php: "8.0"
+            symfony_version: 5.2.*
+            unit_tests: true
+            functional_tests: false
+            rdkafka_tests: false
+            prepare_container: false
+          - php: "8.0"
+            symfony_version: 5.2.*
+            unit_tests: false
+            functional_tests: true
+            rdkafka_tests: false
+            prepare_container: true
+          - php: "8.0"
+            symfony_version: 5.2.*
+            unit_tests: false
+            rdkafka_tests: true
+            prepare_container: true
 
     name: PHP ${{ matrix.php }} tests on Sf ${{ matrix.symfony_version }}, unit=${{ matrix.unit_tests }}, func=${{ matrix.functional_tests }}, rdkafka=${{ matrix.rdkafka_tests }}
 
@@ -140,6 +163,8 @@ jobs:
       - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 
       - run: bin/dev -b
+        env:
+          PHP_VERSION: "${{ matrix.php }}"
         if: matrix.prepare_container
 
       - run: bin/phpunit --exclude-group=functional

diff --git a/bin/dev b/bin/dev
@@ -6,7 +6,7 @@ set -e
 while getopts "bustefdp" OPTION; do
   case $OPTION in
     b)
-      docker-compose pull && docker-compose build
+      docker-compose pull -q && docker-compose build
       ;;
     u)
       docker-compose up

diff --git a/composer.json b/composer.json
@@ -8,8 +8,14 @@
     "cs-lint": "bin/php-cs-fixer fix --config=.php_cs.php --no-interaction --dry-run --diff",
     "phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon"
   },
+  "repositories": [
+    {
+      "type": "git",
+      "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git"
+    }
+  ],
   "require": {
-    "php": "^7.3",
+    "php": "^7.3|^8.0",
 
     "ext-amqp": "^1.9.3",
     "ext-gearman": "^2.0",
@@ -20,7 +26,7 @@
     "queue-interop/queue-interop": "^0.7|^0.8",
     "bunny/bunny": "^0.2.4|^0.3|^0.4",
     "php-amqplib/php-amqplib": "^2.7",
-    "doctrine/dbal": "^2.6,<2.10",
+    "doctrine/dbal": "^2.12",
     "ramsey/uuid": "^2|^3.5|^4.0",
     "psr/log": "^1",
     "psr/container": "^1",
@@ -30,10 +36,10 @@
     "mongodb/mongodb": "^1.2",
     "pda/pheanstalk": "^3",
     "aws/aws-sdk-php": "^3.26",
-    "stomp-php/stomp-php": "^4",
-    "php-http/guzzle6-adapter": "^1.1",
-    "php-http/client-common": "^1.7@dev",
-    "richardfullmer/rabbitmq-management-api": "^2.0",
+    "stomp-php/stomp-php": "^4|^5",
+    "php-http/guzzle7-adapter": "^0.1.1",
+    "php-http/client-common": "^2.2.1",
+    "richardfullmer/rabbitmq-management-api": "^2.1.1",
     "predis/predis": "^1.1",
     "thruway/client": "^0.5.0",
     "thruway/pawl-transport": "^0.5.0",
@@ -58,7 +64,7 @@
     "symfony/yaml": "^4.3|^5",
     "empi89/php-amqp-stubs": "*@dev",
     "doctrine/doctrine-bundle": "~1.2|^2",
-    "doctrine/mongodb-odm-bundle": "^3.5|^4",
+    "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
     "alcaeus/mongo-php-adapter": "^1.0",
     "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0",
     "friendsofphp/php-cs-fixer": "^2",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,12 @@ version: '2'
 
 services:
   dev:
-    image: enqueue/dev:latest
+    # when image publishing gets sorted:
+    # image: enqueue/dev:${PHP_VERSION}
+    build:
+      context: docker
+      args:
+        PHP_VERSION: "${PHP_VERSION:-7.3}"
     depends_on:
       - rabbitmq
       - mysql

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,24 +1,55 @@
-FROM formapro/nginx-php-fpm:7.3-latest-all-exts
+ARG PHP_VERSION=7.3
+FROM makasim/nginx-php-fpm:${PHP_VERSION}-all-exts
+
+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 php7.3-dev php7.3-redis php7.3-pgsql git python php-amqp
+    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 \
+        libgearman-dev \
+        php-pear \
+        make \
+    && \
+    pecl channel-update pecl.php.net && \
+    pecl install gearman && \
+    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 && \
     apt-get update && \
-    apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php7.3-dev make && \
+    apt-get install -y --no-install-recommends --no-install-suggests \
+        g++ \
+    && \
     mkdir -p $HOME/librdkafka && \
     cd $HOME/librdkafka && \
     git clone https://github.com/edenhill/librdkafka.git . && \
     git checkout v1.0.0 && \
     ./configure && make && make install && \
     pecl install rdkafka && \
-    echo "extension=rdkafka.so" > /etc/php/7.3/cli/conf.d/10-rdkafka.ini && \
-    echo "extension=rdkafka.so" > /etc/php/7.3/fpm/conf.d/10-rdkafka.ini
+    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/7.3/cli/conf.d/1-dev_cli.ini
+COPY ./php/cli.ini /etc/php/${PHP_VERSION}/cli/conf.d/1-dev_cli.ini
 COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh
 RUN chmod u+x /usr/local/bin/entrypoint.sh
 

diff --git a/docker/thruway/Dockerfile b/docker/thruway/Dockerfile
@@ -1,4 +1,4 @@
-FROM formapro/nginx-php-fpm:latest-all-exts
+FROM makasim/nginx-php-fpm:latest-all-exts
 
 RUN mkdir -p /thruway
 WORKDIR /thruway

diff --git a/pkg/amqp-bunny/.github/workflows/ci.yml b/pkg/amqp-bunny/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php }} tests
 

diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json
@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "queue-interop/amqp-interop": "^0.8",
         "queue-interop/queue-interop": "^0.8",
         "bunny/bunny": "^0.4",

diff --git a/pkg/amqp-ext/.github/workflows/ci.yml b/pkg/amqp-ext/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php }} tests
 

diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json
@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "ext-amqp": "^1.9.3",
         "queue-interop/amqp-interop": "^0.8",
         "queue-interop/queue-interop": "^0.8",

diff --git a/pkg/amqp-lib/.github/workflows/ci.yml b/pkg/amqp-lib/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php }} tests
 

diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json
@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "php-amqplib/php-amqplib": "^2.10",
         "queue-interop/amqp-interop": "^0.8",
         "queue-interop/queue-interop": "^0.8",

diff --git a/pkg/amqp-tools/.github/workflows/ci.yml b/pkg/amqp-tools/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php }} tests
 

diff --git a/pkg/amqp-tools/composer.json b/pkg/amqp-tools/composer.json
@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "queue-interop/amqp-interop": "^0.8",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/dsn": "^0.10"

diff --git a/pkg/async-command/.github/workflows/ci.yml b/pkg/async-command/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php }} tests
 

diff --git a/pkg/async-command/composer.json b/pkg/async-command/composer.json
@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": ">=7.1",
+        "php": "^7.3|^8.0",
         "enqueue/enqueue": "^0.10",
         "queue-interop/queue-interop": "^0.8",
         "symfony/console": "^4.3|^5",

diff --git a/pkg/async-event-dispatcher/.github/workflows/ci.yml b/pkg/async-event-dispatcher/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php }} tests
 

diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json
@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "enqueue/enqueue": "^0.10",
         "queue-interop/queue-interop": "^0.8",
         "symfony/event-dispatcher": "^4.3|^5"

diff --git a/pkg/dbal/.github/workflows/ci.yml b/pkg/dbal/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php }} tests
 

diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json
@@ -6,9 +6,9 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "queue-interop/queue-interop": "^0.8",
-        "doctrine/dbal": "^2.6",
+        "doctrine/dbal": "^2.12",
         "ramsey/uuid": "^3|^4"
     },
     "require-dev": {

diff --git a/pkg/dsn/.github/workflows/ci.yml b/pkg/dsn/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php }} tests
 

diff --git a/pkg/dsn/composer.json b/pkg/dsn/composer.json
@@ -6,10 +6,10 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.1.3"
+        "php": "^7.3|^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.5"
+        "phpunit/phpunit": "^9.5"
     },
     "support": {
         "email": "[email protected]",

diff --git a/pkg/enqueue-bundle/.github/workflows/ci.yml b/pkg/enqueue-bundle/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4']
+        php: ['7.3', '7.4', '8.0']
 
     name: PHP ${{ matrix.php }} tests
 

diff --git a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -113,7 +113,11 @@ public function testThrowIfClientDriverOptionsIsNotArray()
         $processor = new Processor();
 
         $this->expectException(InvalidTypeException::class);
-        $this->expectExceptionMessage('Invalid type for path "enqueue.default.client.driver_options". Expected array, but got string');
+        // Exception messages vary slightly between versions
+        $this->expectExceptionMessageMatches(
+            '/Invalid type for path "enqueue\.default\.client\.driver_options"\. Expected "?array"?, but got "?string"?/'
+        );
+
         $processor->processConfiguration($configuration, [[
             'default' => [
                 'transport' => 'null:',

diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json
@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "symfony/framework-bundle": "^4.3|^5",
         "queue-interop/amqp-interop": "^0.8",
         "queue-interop/queue-interop": "^0.8",
@@ -37,7 +37,7 @@
         "enqueue/async-command": "0.10.x-dev",
         "php-amqplib/php-amqplib": "^2.7",
         "doctrine/doctrine-bundle": "~1.2|^2",
-        "doctrine/mongodb-odm-bundle": "^3.5|^4",
+        "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
         "alcaeus/mongo-php-adapter": "^1.0",
         "symfony/browser-kit": "^4.3|^5",
         "symfony/expression-language": "^4.3|^5",