Skip to content

Commit bfde906

Browse files
makasimmakasim
authored
Merge pull request #1285 from andrewmy/add-php-8.1
Add PHP 8.1 and 8.2, Symfony 6.2 to CI
2 parents 5b9fa5e + 66e161f commit bfde906

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+119
-149
lines changed

‎.github/workflows/ci.yml

+20-15
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
extensions: mongodb, redis, :xdebug
2424
ini-values: memory_limit=2048M
2525

26-
- run: php ./bin/fix-symfony-version.php "5.2.*"
26+
- run: php ./bin/fix-symfony-version.php "5.4.*"
2727

2828
- uses: "ramsey/composer-install@v1"
2929

@@ -63,7 +63,7 @@ jobs:
6363
extensions: mongodb, redis, :xdebug
6464
ini-values: memory_limit=2048M
6565

66-
- run: php ./bin/fix-symfony-version.php "5.2.*"
66+
- run: php ./bin/fix-symfony-version.php "5.4.*"
6767

6868
- run: composer update --no-progress
6969

@@ -77,14 +77,14 @@ jobs:
7777
strategy:
7878
fail-fast: false
7979
matrix:
80-
php: ['7.3', '7.4', '8.0']
81-
symfony_version: ['5.2.*', '6.0.*']
80+
php: ['7.4', '8.0', '8.1', '8.2']
81+
symfony_version: ['5.4.*', '6.2.*']
8282
dependencies: ['--prefer-lowest', '--prefer-dist']
8383
exclude:
84-
- php: '7.3'
85-
symfony_version: '6.0.*'
8684
- php: '7.4'
87-
symfony_version: '6.0.*'
85+
symfony_version: '6.2.*'
86+
- php: '8.0'
87+
symfony_version: '6.2.*'
8888

8989
name: PHP ${{ matrix.php }} unit tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
9090

@@ -123,17 +123,16 @@ jobs:
123123
strategy:
124124
fail-fast: false
125125
matrix:
126-
php: ['7.4', '8.0'] # same as in the container
127-
symfony_version: ['5.2.*', '6.0.*']
126+
php: ['7.4', '8.0', '8.1', '8.2'] # same as in the container
127+
symfony_version: ['5.4.*', '6.2.*']
128128
dependencies: ['--prefer-lowest', '--prefer-dist']
129-
rdkafka_action: ['exclude-group', 'group']
130129
exclude:
131-
- php: '7.3'
132-
symfony_version: '6.0.*'
133130
- php: '7.4'
134-
symfony_version: '6.0.*'
131+
symfony_version: '6.2.*'
132+
- php: '8.0'
133+
symfony_version: '6.2.*'
135134

136-
name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, rdkafka_action=${{ matrix.rdkafka_action }}, deps=${{ matrix.dependencies }}
135+
name: PHP ${{ matrix.php }} functional tests on Sf ${{ matrix.symfony_version }}, deps=${{ matrix.dependencies }}
137136

138137
steps:
139138
- uses: actions/checkout@v2
@@ -167,4 +166,10 @@ jobs:
167166
env:
168167
PHP_VERSION: ${{ matrix.php }}
169168

170-
- run: bin/test.sh --${{ matrix.rdkafka_action }}=rdkafka
169+
# TODO: convert these two steps into one w/o excludes when Gearman extension gets a release for PHP 8.1
170+
# See https://github.com/php/pecl-networking-gearman/issues/16
171+
- run: bin/test.sh
172+
if: ${{ matrix.php != '8.1' && matrix.php != '8.2' }}
173+
174+
- run: bin/test.sh --exclude-group=gearman
175+
if: ${{ matrix.php == '8.1' && matrix.php != '8.2' }}

‎composer.json

+17-15
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon"
1010
},
1111
"require": {
12-
"php": "^7.3|^8.0",
12+
"php": "^7.4|^8.0",
1313

1414
"ext-amqp": "^1.9.3",
1515
"ext-gearman": "^2.0",
@@ -26,8 +26,8 @@
2626
"psr/container": "^1.1 || ^2.0",
2727
"makasim/temp-file": "^0.2",
2828
"google/cloud-pubsub": "^1.4.3",
29-
"doctrine/orm": "^2.7.4",
30-
"doctrine/persistence": "^1.3.3|^2.0",
29+
"doctrine/orm": "^2.12",
30+
"doctrine/persistence": "^2.0",
3131
"mongodb/mongodb": "^1.2",
3232
"pda/pheanstalk": "^3.1",
3333
"aws/aws-sdk-php": "^3.155",
@@ -53,19 +53,20 @@
5353
"phpunit/phpunit": "^9.5",
5454
"phpstan/phpstan": "^0.12",
5555
"queue-interop/queue-spec": "^0.6.2",
56-
"symfony/browser-kit": "^5.1|^6.0",
57-
"symfony/config": "^5.1|^6.0",
58-
"symfony/process": "^5.1|^6.0",
59-
"symfony/console": "^5.1|^6.0",
60-
"symfony/dependency-injection": "^5.1|^6.0",
61-
"symfony/event-dispatcher": "^5.1|^6.0",
62-
"symfony/expression-language": "^5.1|^6.0",
63-
"symfony/http-kernel": "^5.1|^6.0",
64-
"symfony/filesystem": "^5.1|^6.0",
65-
"symfony/framework-bundle": "^5.1|^6.0",
66-
"symfony/yaml": "^5.1|^6.0",
56+
"symfony/browser-kit": "^5.4|^6.0",
57+
"symfony/config": "^5.4|^6.0",
58+
"symfony/process": "^5.4|^6.0",
59+
"symfony/console": "^5.4|^6.0",
60+
"symfony/dependency-injection": "^5.4|^6.0",
61+
"symfony/event-dispatcher": "^5.4|^6.0",
62+
"symfony/expression-language": "^5.4|^6.0",
63+
"symfony/http-kernel": "^5.4|^6.0",
64+
"symfony/filesystem": "^5.4|^6.0",
65+
"symfony/framework-bundle": "^5.4|^6.0",
66+
"symfony/validator": "^5.4|^6.0",
67+
"symfony/yaml": "^5.4|^6.0",
6768
"empi89/php-amqp-stubs": "*@dev",
68-
"doctrine/doctrine-bundle": "^2.0",
69+
"doctrine/doctrine-bundle": "^2.3.2",
6970
"doctrine/mongodb-odm-bundle": "^3.5|^4.3",
7071
"alcaeus/mongo-php-adapter": "^1.0",
7172
"kwn/php-rdkafka-stubs": "^2.0.3",
@@ -136,3 +137,4 @@
136137
}
137138
}
138139
}
140+

‎docker/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ RUN set -x && \
2222
php${PHP_VERSION}-xml \
2323
php${PHP_VERSION}-mysql \
2424
php${PHP_VERSION}-curl \
25+
php${PHP_VERSION}-mongodb \
26+
php${PHP_VERSION}-mbstring \
2527
make \
2628
g++ \
2729
unzip \

‎pkg/amqp-bunny/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0",
9+
"php": "^7.4|^8.0",
1010
"queue-interop/amqp-interop": "^0.8.2",
1111
"queue-interop/queue-interop": "^0.8",
1212
"bunny/bunny": "^0.4|^0.5",

‎pkg/amqp-ext/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0",
9+
"php": "^7.4|^8.0",
1010
"ext-amqp": "^1.9.3",
1111
"queue-interop/amqp-interop": "^0.8.2",
1212
"queue-interop/queue-interop": "^0.8",

‎pkg/amqp-lib/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0",
9+
"php": "^7.4|^8.0",
1010
"php-amqplib/php-amqplib": "^3.2",
1111
"queue-interop/amqp-interop": "^0.8.2",
1212
"queue-interop/queue-interop": "^0.8",

‎pkg/amqp-tools/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0",
9+
"php": "^7.4|^8.0",
1010
"queue-interop/amqp-interop": "^0.8.2",
1111
"queue-interop/queue-interop": "^0.8",
1212
"enqueue/dsn": "^0.10"

‎pkg/async-command/composer.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0",
9+
"php": "^7.4|^8.0",
1010
"enqueue/enqueue": "^0.10",
1111
"queue-interop/queue-interop": "^0.8",
12-
"symfony/console": "^5.1|^6.0",
13-
"symfony/process": "^5.1|^6.0"
12+
"symfony/console": "^5.4|^6.0",
13+
"symfony/process": "^5.4|^6.0"
1414
},
1515
"require-dev": {
1616
"phpunit/phpunit": "^9.5",
17-
"symfony/dependency-injection": "^5.1|^6.0",
18-
"symfony/config": "^5.1|^6.0",
19-
"symfony/http-kernel": "^5.1|^6.0",
20-
"symfony/filesystem": "^5.1|^6.0",
21-
"symfony/yaml": "^5.1|^6.0",
17+
"symfony/dependency-injection": "^5.4|^6.0",
18+
"symfony/config": "^5.4|^6.0",
19+
"symfony/http-kernel": "^5.4|^6.0",
20+
"symfony/filesystem": "^5.4|^6.0",
21+
"symfony/yaml": "^5.4|^6.0",
2222
"enqueue/null": "0.10.x-dev",
2323
"enqueue/fs": "0.10.x-dev",
2424
"enqueue/test": "0.10.x-dev"
@@ -31,7 +31,7 @@
3131
"docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
3232
},
3333
"suggest": {
34-
"symfony/dependency-injection": "^5.1|^6.0 If you'd like to use async event dispatcher container extension."
34+
"symfony/dependency-injection": "^5.4|^6.0 If you'd like to use async event dispatcher container extension."
3535
},
3636
"autoload": {
3737
"psr-4": { "Enqueue\\AsyncCommand\\": "" },

‎pkg/async-event-dispatcher/composer.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0",
9+
"php": "^7.4|^8.0",
1010
"enqueue/enqueue": "^0.10",
1111
"queue-interop/queue-interop": "^0.8",
12-
"symfony/event-dispatcher": "^5.1|^6.0"
12+
"symfony/event-dispatcher": "^5.4|^6.0"
1313
},
1414
"require-dev": {
1515
"phpunit/phpunit": "^9.5",
16-
"symfony/dependency-injection": "^5.1|^6.0",
17-
"symfony/config": "^5.1|^6.0",
18-
"symfony/http-kernel": "^5.1|^6.0",
19-
"symfony/filesystem": "^5.1|^6.0",
20-
"symfony/yaml": "^5.1|^6.0",
16+
"symfony/dependency-injection": "^5.4|^6.0",
17+
"symfony/config": "^5.4|^6.0",
18+
"symfony/http-kernel": "^5.4|^6.0",
19+
"symfony/filesystem": "^5.4|^6.0",
20+
"symfony/yaml": "^5.4|^6.0",
2121
"enqueue/null": "0.10.x-dev",
2222
"enqueue/fs": "0.10.x-dev",
2323
"enqueue/test": "0.10.x-dev"
@@ -30,7 +30,7 @@
3030
"docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
3131
},
3232
"suggest": {
33-
"symfony/dependency-injection": "^5.1|^6.0 If you'd like to use async event dispatcher container extension."
33+
"symfony/dependency-injection": "^5.4|^6.0 If you'd like to use async event dispatcher container extension."
3434
},
3535
"autoload": {
3636
"psr-4": { "Enqueue\\AsyncEventDispatcher\\": "" },

‎pkg/dbal/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0",
9+
"php": "^7.4|^8.0",
1010
"queue-interop/queue-interop": "^0.8",
1111
"doctrine/dbal": "^2.12|^3.1",
12-
"doctrine/persistence": "^1.3.3|^2.0",
12+
"doctrine/persistence": "^2.0",
1313
"ramsey/uuid": "^3.5|^4"
1414
},
1515
"require-dev": {

‎pkg/dsn/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0"
9+
"php": "^7.4|^8.0"
1010
},
1111
"require-dev": {
1212
"phpunit/phpunit": "^9.5"

‎pkg/enqueue-bundle/Tests/Functional/App/config/config.yml

-3
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,3 @@ services:
126126
class: 'Enqueue\Bundle\Tests\Functional\App\AsyncListener'
127127
public: true
128128
arguments: ['@enqueue.client.default.producer', '@enqueue.events.registry']
129-
130-
locale_aware_listener:
131-
public: true

‎pkg/enqueue-bundle/composer.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0",
10-
"symfony/framework-bundle": "^5.1|^6.0",
9+
"php": "^7.4|^8.0",
10+
"symfony/framework-bundle": "^5.4|^6.0",
1111
"queue-interop/amqp-interop": "^0.8.2",
1212
"queue-interop/queue-interop": "^0.8",
1313
"enqueue/enqueue": "^0.10",
@@ -36,12 +36,13 @@
3636
"enqueue/async-event-dispatcher": "0.10.x-dev",
3737
"enqueue/async-command": "0.10.x-dev",
3838
"php-amqplib/php-amqplib": "^3.0",
39-
"doctrine/doctrine-bundle": "^2.0",
39+
"doctrine/doctrine-bundle": "^2.3.2",
4040
"doctrine/mongodb-odm-bundle": "^3.5|^4.3",
4141
"alcaeus/mongo-php-adapter": "^1.0",
42-
"symfony/browser-kit": "^5.1|^6.0",
43-
"symfony/expression-language": "^5.1|^6.0",
44-
"symfony/yaml": "^5.1|^6.0"
42+
"symfony/browser-kit": "^5.4|^6.0",
43+
"symfony/expression-language": "^5.4|^6.0",
44+
"symfony/validator": "^5.4|^6.0",
45+
"symfony/yaml": "^5.4|^6.0"
4546
},
4647
"suggest": {
4748
"enqueue/async-command": "If want to run Symfony command via message queue",

‎pkg/enqueue/Tests/Client/Driver/RdKafkaDriverTest.php

-6
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
use Interop\Queue\Queue as InteropQueue;
2020
use PHPUnit\Framework\TestCase;
2121

22-
/**
23-
* @group rdkafka
24-
*/
2522
class RdKafkaDriverTest extends TestCase
2623
{
2724
use ClassExtensionTrait;
@@ -102,9 +99,6 @@ protected function createQueue(string $name): InteropQueue
10299
return new RdKafkaTopic($name);
103100
}
104101

105-
/**
106-
* @return RdKafkaTopic
107-
*/
108102
protected function createTopic(string $name): RdKafkaTopic
109103
{
110104
return new RdKafkaTopic($name);

‎pkg/enqueue/composer.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0",
9+
"php": "^7.4|^8.0",
1010
"queue-interop/amqp-interop": "^0.8.2",
1111
"queue-interop/queue-interop": "^0.8",
1212
"enqueue/null": "^0.10",
@@ -17,12 +17,12 @@
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "^9.5",
20-
"symfony/console": "^5.1|^6.0",
21-
"symfony/dependency-injection": "^5.1|^6.0",
22-
"symfony/config": "^5.1|^6.0",
23-
"symfony/event-dispatcher": "^5.1|^6.0",
24-
"symfony/http-kernel": "^5.1|^6.0",
25-
"symfony/yaml": "^5.1|^6.0",
20+
"symfony/console": "^5.41|^6.0",
21+
"symfony/dependency-injection": "^5.4|^6.0",
22+
"symfony/config": "^5.4|^6.0",
23+
"symfony/event-dispatcher": "^5.4|^6.0",
24+
"symfony/http-kernel": "^5.4|^6.0",
25+
"symfony/yaml": "^5.4|^6.0",
2626
"enqueue/amqp-ext": "0.10.x-dev",
2727
"enqueue/amqp-lib": "0.10.x-dev",
2828
"enqueue/amqp-bunny": "0.10.x-dev",
@@ -42,9 +42,9 @@
4242
"enqueue/dsn": "0.10.x-dev"
4343
},
4444
"suggest": {
45-
"symfony/console": "^5.1|^6.0 If you want to use cli commands",
46-
"symfony/dependency-injection": "^5.1|^6.0",
47-
"symfony/config": "^5.1|^6.0",
45+
"symfony/console": "^5.4|^6.0 If you want to use cli commands",
46+
"symfony/dependency-injection": "^5.4|^6.0",
47+
"symfony/config": "^5.4|^6.0",
4848
"enqueue/amqp-ext": "AMQP transport (based on php extension)",
4949
"enqueue/stomp": "STOMP transport",
5050
"enqueue/fs": "Filesystem transport",

‎pkg/fs/composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.3|^8.0",
9+
"php": "^7.4|^8.0",
1010
"queue-interop/queue-interop": "^0.8",
1111
"enqueue/dsn": "^0.10",
12-
"symfony/filesystem": "^5.1|^6.0",
12+
"symfony/filesystem": "^5.4|^6.0",
1313
"makasim/temp-file": "^0.2@stable"
1414
},
1515
"require-dev": {
1616
"phpunit/phpunit": "^9.5",
1717
"enqueue/null": "0.10.x-dev",
1818
"enqueue/test": "0.10.x-dev",
1919
"queue-interop/queue-spec": "^0.6.2",
20-
"symfony/dependency-injection": "^5.1|^6.0",
21-
"symfony/yaml": "^5.1|^6.0"
20+
"symfony/dependency-injection": "^5.4|^6.0",
21+
"symfony/yaml": "^5.4|^6.0"
2222
},
2323
"support": {
2424
"email": "opensource@forma-pro.com",

‎pkg/gearman/Tests/GearmanContextTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
/**
1414
* @group functional
15+
* @group gearman
1516
*/
1617
class GearmanContextTest extends TestCase
1718
{

0 commit comments

Comments
 (0)