Skip to content

Add PHP 8.1 and 8.2, Symfony 6.2 to CI #1285

New issue

Have a question about this project? No Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “No Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? No Sign in to your account

Merged
merged 15 commits into from
Mar 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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

Expand All @@ -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 }}

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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' }}
32 changes: 17 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -136,3 +137,4 @@
}
}
}

2 changes: 2 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion pkg/amqp-bunny/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/amqp-ext/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/amqp-lib/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/amqp-tools/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 9 additions & 9 deletions pkg/async-command/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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\\": "" },
Expand Down
16 changes: 8 additions & 8 deletions pkg/async-event-dispatcher/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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\\": "" },
Expand Down
4 changes: 2 additions & 2 deletions pkg/dbal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/dsn/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
"php": "^7.3|^8.0"
"php": "^7.4|^8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
Expand Down
3 changes: 0 additions & 3 deletions pkg/enqueue-bundle/Tests/Functional/App/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,3 @@ services:
class: 'Enqueue\Bundle\Tests\Functional\App\AsyncListener'
public: true
arguments: ['@enqueue.client.default.producer', '@enqueue.events.registry']

locale_aware_listener:
public: true
13 changes: 7 additions & 6 deletions pkg/enqueue-bundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"homepage": "https://enqueue.forma-pro.com/",
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"symfony/framework-bundle": "^5.1|^6.0",
"php": "^7.4|^8.0",
"symfony/framework-bundle": "^5.4|^6.0",
"queue-interop/amqp-interop": "^0.8.2",
"queue-interop/queue-interop": "^0.8",
"enqueue/enqueue": "^0.10",
Expand Down Expand Up @@ -36,12 +36,13 @@
"enqueue/async-event-dispatcher": "0.10.x-dev",
"enqueue/async-command": "0.10.x-dev",
"php-amqplib/php-amqplib": "^3.0",
"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",
"symfony/browser-kit": "^5.1|^6.0",
"symfony/expression-language": "^5.1|^6.0",
"symfony/yaml": "^5.1|^6.0"
"symfony/browser-kit": "^5.4|^6.0",
"symfony/expression-language": "^5.4|^6.0",
"symfony/validator": "^5.4|^6.0",
"symfony/yaml": "^5.4|^6.0"
},
"suggest": {
"enqueue/async-command": "If want to run Symfony command via message queue",
Expand Down
6 changes: 0 additions & 6 deletions pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
use Interop\Queue\Queue as InteropQueue;
use PHPUnit\Framework\TestCase;

/**
* @group rdkafka
*/
class RdKafkaDriverTest extends TestCase
{
use ClassExtensionTrait;
Expand Down Expand Up @@ -102,9 +99,6 @@ protected function createQueue(string $name): InteropQueue
return new RdKafkaTopic($name);
}

/**
* @return RdKafkaTopic
*/
protected function createTopic(string $name): RdKafkaTopic
{
return new RdKafkaTopic($name);
Expand Down
20 changes: 10 additions & 10 deletions pkg/enqueue/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/null": "^0.10",
Expand All @@ -17,12 +17,12 @@
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"symfony/console": "^5.1|^6.0",
"symfony/dependency-injection": "^5.1|^6.0",
"symfony/config": "^5.1|^6.0",
"symfony/event-dispatcher": "^5.1|^6.0",
"symfony/http-kernel": "^5.1|^6.0",
"symfony/yaml": "^5.1|^6.0",
"symfony/console": "^5.41|^6.0",
"symfony/dependency-injection": "^5.4|^6.0",
"symfony/config": "^5.4|^6.0",
"symfony/event-dispatcher": "^5.4|^6.0",
"symfony/http-kernel": "^5.4|^6.0",
"symfony/yaml": "^5.4|^6.0",
"enqueue/amqp-ext": "0.10.x-dev",
"enqueue/amqp-lib": "0.10.x-dev",
"enqueue/amqp-bunny": "0.10.x-dev",
Expand All @@ -42,9 +42,9 @@
"enqueue/dsn": "0.10.x-dev"
},
"suggest": {
"symfony/console": "^5.1|^6.0 If you want to use cli commands",
"symfony/dependency-injection": "^5.1|^6.0",
"symfony/config": "^5.1|^6.0",
"symfony/console": "^5.4|^6.0 If you want to use cli commands",
"symfony/dependency-injection": "^5.4|^6.0",
"symfony/config": "^5.4|^6.0",
"enqueue/amqp-ext": "AMQP transport (based on php extension)",
"enqueue/stomp": "STOMP transport",
"enqueue/fs": "Filesystem transport",
Expand Down
8 changes: 4 additions & 4 deletions pkg/fs/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
"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",
"enqueue/dsn": "^0.10",
"symfony/filesystem": "^5.1|^6.0",
"symfony/filesystem": "^5.4|^6.0",
"makasim/temp-file": "^0.2@stable"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"enqueue/null": "0.10.x-dev",
"enqueue/test": "0.10.x-dev",
"queue-interop/queue-spec": "^0.6.2",
"symfony/dependency-injection": "^5.1|^6.0",
"symfony/yaml": "^5.1|^6.0"
"symfony/dependency-injection": "^5.4|^6.0",
"symfony/yaml": "^5.4|^6.0"
},
"support": {
"email": "opensource@forma-pro.com",
Expand Down
1 change: 1 addition & 0 deletions pkg/gearman/Tests/GearmanContextTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

/**
* @group functional
* @group gearman
*/
class GearmanContextTest extends TestCase
{
Expand Down
Loading