Skip to content

Commit 518ea5e

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/new-projecting-system-dx
2 parents 50651f5 + a6c4f97 commit 518ea5e

File tree

6 files changed

+7
-18
lines changed

6 files changed

+7
-18
lines changed

.github/workflows/split-testing.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
fail-fast: true
2121
matrix:
2222
include:
23-
- php-version: '8.1'
23+
- php-version: '8.2'
2424
- php-version: '8.4'
25-
- php-version: '8.1'
25+
- php-version: '8.2'
2626
stability: prefer-lowest
2727

2828
services:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
}
111111
},
112112
"require": {
113-
"php": "^8.1",
113+
"php": "^8.2",
114114
"doctrine/dbal": "^3.9|^4.0",
115115
"doctrine/persistence": "^2.5|^3.4",
116116
"enqueue/amqp-lib": "^0.10.25",

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ services:
2525
APP_MERGE_PLUGIN: "yes"
2626
env_file:
2727
- ".env"
28-
app8_1:
29-
image: simplycodedsoftware/php:8.1.31
28+
app8_2:
29+
image: simplycodedsoftware/php:8.2.31
3030
volumes:
3131
- "$PWD:/data/app"
3232
working_dir: "/data/app"
3333
command: sleep 99999
34-
container_name: "ecotone_development_8_1"
34+
container_name: "ecotone_development_8_2"
3535
user: "${USER_PID:-1000}:${USER_PID:-1000}"
3636
extra_hosts:
3737
- "host.docker.internal:host-gateway"

packages/Ecotone/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939
},
4040
"require": {
41-
"php": "^8.1",
41+
"php": "^8.2",
4242
"laminas/laminas-code": "^4",
4343
"psr/clock": "^1.0",
4444
"psr/container": "^1.1.1|^2.0.1",

packages/Symfony/tests/phpunit/AmqpMessengerIntegrationTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ public function test_empty_queue(): void
5151

5252
public function test_single_command(): void
5353
{
54-
if (version_compare(PHP_VERSION, '8.1', '<')) {
55-
$this->markTestSkipped('TypeError: Symfony\Component\Messenger\Bridge\Amqp\Transport\Connection::nack(): Return value must be of type bool, null returned');
56-
}
57-
5854
$this->messaging->sendCommandWithRoutingKey('amqp.test.example_command', new AmqpExampleCommand('single_1'));
5955
$this->assertCount(0, $this->messaging->sendQueryWithRouting('amqp.consumer.getCommands'));
6056

@@ -66,10 +62,6 @@ public function test_single_command(): void
6662

6763
public function test_multiple_commands(): void
6864
{
69-
if (version_compare(PHP_VERSION, '8.1', '<')) {
70-
$this->markTestSkipped('TypeError: Symfony\Component\Messenger\Bridge\Amqp\Transport\Connection::nack(): Return value must be of type bool, null returned');
71-
}
72-
7365
$this->messaging->sendCommandWithRoutingKey('amqp.test.example_command', new AmqpExampleCommand('multi_1'));
7466
$this->messaging->sendCommandWithRoutingKey('amqp.test.example_command', new AmqpExampleCommand('multi_2'));
7567
/** Consumer not yet run */

release.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)