Merge pull request #1285 from andrewmy/add-php-8.1

Add PHP 8.1 and 8.2, Symfony 6.2 to CI

Author: makasim

.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 "5.2.*"
+      - run: php ./bin/fix-symfony-version.php "5.4.*"
 
       - uses: "ramsey/composer-install@v1"
 
@@ -63,7 +63,7 @@ jobs:
           extensions: mongodb, redis, :xdebug
           ini-values: memory_limit=2048M
 
-      - run: php ./bin/fix-symfony-version.php "5.2.*"
+      - run: php ./bin/fix-symfony-version.php "5.4.*"
 
       - run: composer update --no-progress
 
@@ -77,14 +77,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.3', '7.4', '8.0']
-        symfony_version: ['5.2.*', '6.0.*']
+        php: ['7.4', '8.0', '8.1', '8.2']
+        symfony_version: ['5.4.*', '6.2.*']
         dependencies: ['--prefer-lowest', '--prefer-dist']
         exclude:
-          - php: '7.3'
-            symfony_version: '6.0.*'
           - php: '7.4'
-            symfony_version: '6.0.*'
+            symfony_version: '6.2.*'
+          - php: '8.0'
+            symfony_version: '6.2.*'
 
     name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
 
@@ -123,17 +123,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0'] # same as in the container
-        symfony_version: ['5.2.*', '6.0.*']
+        php: ['7.4', '8.0', '8.1', '8.2'] # same as in the container
+        symfony_version: ['5.4.*', '6.2.*']
         dependencies: ['--prefer-lowest', '--prefer-dist']
-        rdkafka_action: ['exclude-group', 'group']
         exclude:
-          - php: '7.3'
-            symfony_version: '6.0.*'
           - php: '7.4'
-            symfony_version: '6.0.*'
+            symfony_version: '6.2.*'
+          - php: '8.0'
+            symfony_version: '6.2.*'
 
-    name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, rdkafka_action=${{ matrix.rdkafka_action }}, deps=${{ matrix.dependencies }}
+    name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
 
     steps:
       - uses: actions/checkout@v2
@@ -167,4 +166,10 @@ jobs:
         env:
           PHP_VERSION: ${{ matrix.php }}
 
-      - run: bin/test.sh --${{ matrix.rdkafka_action }}=rdkafka
+      # 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' }}

composer.json

@@ -9,7 +9,7 @@
     "phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon"
   },
   "require": {
-    "php": "^7.3|^8.0",
+    "php": "^7.4|^8.0",
 
     "ext-amqp": "^1.9.3",
     "ext-gearman": "^2.0",
@@ -26,8 +26,8 @@
     "psr/container": "^1.1 || ^2.0",
     "makasim/temp-file": "^0.2",
     "google/cloud-pubsub": "^1.4.3",
-    "doctrine/orm": "^2.7.4",
-    "doctrine/persistence": "^1.3.3|^2.0",
+    "doctrine/orm": "^2.12",
+    "doctrine/persistence": "^2.0",
     "mongodb/mongodb": "^1.2",
     "pda/pheanstalk": "^3.1",
     "aws/aws-sdk-php": "^3.155",
@@ -53,19 +53,20 @@
     "phpunit/phpunit": "^9.5",
     "phpstan/phpstan": "^0.12",
     "queue-interop/queue-spec": "^0.6.2",
-    "symfony/browser-kit": "^5.1|^6.0",
-    "symfony/config": "^5.1|^6.0",
-    "symfony/process": "^5.1|^6.0",
-    "symfony/console": "^5.1|^6.0",
-    "symfony/dependency-injection": "^5.1|^6.0",
-    "symfony/event-dispatcher": "^5.1|^6.0",
-    "symfony/expression-language": "^5.1|^6.0",
-    "symfony/http-kernel": "^5.1|^6.0",
-    "symfony/filesystem": "^5.1|^6.0",
-    "symfony/framework-bundle": "^5.1|^6.0",
-    "symfony/yaml": "^5.1|^6.0",
+    "symfony/browser-kit": "^5.4|^6.0",
+    "symfony/config": "^5.4|^6.0",
+    "symfony/process": "^5.4|^6.0",
+    "symfony/console": "^5.4|^6.0",
+    "symfony/dependency-injection": "^5.4|^6.0",
+    "symfony/event-dispatcher": "^5.4|^6.0",
+    "symfony/expression-language": "^5.4|^6.0",
+    "symfony/http-kernel": "^5.4|^6.0",
+    "symfony/filesystem": "^5.4|^6.0",
+    "symfony/framework-bundle": "^5.4|^6.0",
+    "symfony/validator": "^5.4|^6.0",
+    "symfony/yaml": "^5.4|^6.0",
     "empi89/php-amqp-stubs": "*@dev",
-    "doctrine/doctrine-bundle": "^2.0",
+    "doctrine/doctrine-bundle": "^2.3.2",
     "doctrine/mongodb-odm-bundle": "^3.5|^4.3",
     "alcaeus/mongo-php-adapter": "^1.0",
     "kwn/php-rdkafka-stubs": "^2.0.3",
@@ -136,3 +137,4 @@
     }
   }
 }
+

docker/Dockerfile

@@ -22,6 +22,8 @@ RUN set -x && \
         php${PHP_VERSION}-xml \
         php${PHP_VERSION}-mysql \
         php${PHP_VERSION}-curl \
+        php${PHP_VERSION}-mongodb \
+        php${PHP_VERSION}-mbstring \
         make \
         g++ \
         unzip \

pkg/amqp-bunny/composer.json

@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^7.4|^8.0",
         "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",
         "bunny/bunny": "^0.4|^0.5",

pkg/amqp-ext/composer.json

@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^7.4|^8.0",
         "ext-amqp": "^1.9.3",
         "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",

pkg/amqp-lib/composer.json

@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^7.4|^8.0",
         "php-amqplib/php-amqplib": "^3.2",
         "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",

pkg/amqp-tools/composer.json

@@ -6,7 +6,7 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^7.4|^8.0",
         "queue-interop/amqp-interop": "^0.8.2",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/dsn": "^0.10"

pkg/async-command/composer.json

@@ -6,19 +6,19 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^7.4|^8.0",
         "enqueue/enqueue": "^0.10",
         "queue-interop/queue-interop": "^0.8",
-        "symfony/console": "^5.1|^6.0",
-        "symfony/process": "^5.1|^6.0"
+        "symfony/console": "^5.4|^6.0",
+        "symfony/process": "^5.4|^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "symfony/dependency-injection": "^5.1|^6.0",
-        "symfony/config": "^5.1|^6.0",
-        "symfony/http-kernel": "^5.1|^6.0",
-        "symfony/filesystem": "^5.1|^6.0",
-        "symfony/yaml": "^5.1|^6.0",
+        "symfony/dependency-injection": "^5.4|^6.0",
+        "symfony/config": "^5.4|^6.0",
+        "symfony/http-kernel": "^5.4|^6.0",
+        "symfony/filesystem": "^5.4|^6.0",
+        "symfony/yaml": "^5.4|^6.0",
         "enqueue/null": "0.10.x-dev",
         "enqueue/fs": "0.10.x-dev",
         "enqueue/test": "0.10.x-dev"
@@ -31,7 +31,7 @@
         "docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
     },
     "suggest": {
-        "symfony/dependency-injection": "^5.1|^6.0 If you'd like to use async event dispatcher container extension."
+        "symfony/dependency-injection": "^5.4|^6.0 If you'd like to use async event dispatcher container extension."
     },
     "autoload": {
         "psr-4": { "Enqueue\\AsyncCommand\\": "" },

pkg/async-event-dispatcher/composer.json

@@ -6,18 +6,18 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^7.4|^8.0",
         "enqueue/enqueue": "^0.10",
         "queue-interop/queue-interop": "^0.8",
-        "symfony/event-dispatcher": "^5.1|^6.0"
+        "symfony/event-dispatcher": "^5.4|^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "symfony/dependency-injection": "^5.1|^6.0",
-        "symfony/config": "^5.1|^6.0",
-        "symfony/http-kernel": "^5.1|^6.0",
-        "symfony/filesystem": "^5.1|^6.0",
-        "symfony/yaml": "^5.1|^6.0",
+        "symfony/dependency-injection": "^5.4|^6.0",
+        "symfony/config": "^5.4|^6.0",
+        "symfony/http-kernel": "^5.4|^6.0",
+        "symfony/filesystem": "^5.4|^6.0",
+        "symfony/yaml": "^5.4|^6.0",
         "enqueue/null": "0.10.x-dev",
         "enqueue/fs": "0.10.x-dev",
         "enqueue/test": "0.10.x-dev"
@@ -30,7 +30,7 @@
         "docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
     },
     "suggest": {
-        "symfony/dependency-injection": "^5.1|^6.0 If you'd like to use async event dispatcher container extension."
+        "symfony/dependency-injection": "^5.4|^6.0 If you'd like to use async event dispatcher container extension."
     },
     "autoload": {
         "psr-4": { "Enqueue\\AsyncEventDispatcher\\": "" },

pkg/dbal/composer.json

@@ -6,10 +6,10 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.3|^8.0",
+        "php": "^7.4|^8.0",
         "queue-interop/queue-interop": "^0.8",
         "doctrine/dbal": "^2.12|^3.1",
-        "doctrine/persistence": "^1.3.3|^2.0",
+        "doctrine/persistence": "^2.0",
         "ramsey/uuid": "^3.5|^4"
     },
     "require-dev": {