Skip to content

Commit 0c4b33c

Browse files
authored
Merge branch 'main' into fix-sigint-not-received-during-tests
2 parents 787cd35 + ce09eb1 commit 0c4b33c

File tree

28 files changed

+6632
-48
lines changed

28 files changed

+6632
-48
lines changed

Monorepo/ExampleApp/Symfony/config/reference.php

Lines changed: 816 additions & 0 deletions
Large diffs are not rendered by default.

Monorepo/ExampleAppEventSourcing/Symfony/config/reference.php

Lines changed: 816 additions & 0 deletions
Large diffs are not rendered by default.

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@
126126
"psr/log": "^2.0|^3.0",
127127
"queue-interop/queue-interop": "^0.8",
128128
"ramsey/uuid": "^4.0",
129-
"symfony/cache": "^5.4|^6.1|^7.0",
130-
"symfony/console": "^5.4|^6.0|^7.0",
131-
"symfony/framework-bundle": "^5.4|^6.0|^7.0",
132-
"symfony/dependency-injection": ">=v5.4.19 <6.0.0 || >=v6.0.19 <6.1.0 || >=v6.1.11 <6.2.0 || >=v6.2.5 <7.0.0 || >=v7.0.0 <8.0.0",
129+
"symfony/cache": "^6.4|^7.0|^8.0",
130+
"symfony/console": "^6.4|^7.0|^8.0",
131+
"symfony/framework-bundle": "^6.4|^7.0|^8.0",
132+
"symfony/dependency-injection": "^6.4|^7.0|^8.0",
133133
"wikimedia/composer-merge-plugin": "^2.1",
134134
"php-di/php-di": "^7.0.5",
135135
"open-telemetry/sdk": "^1.0.0",
@@ -148,12 +148,12 @@
148148
"phpstan/phpstan": "^1.8",
149149
"phpunit/phpunit": "^11.0",
150150
"predis/predis": "^1.1.10",
151-
"symfony/expression-language": "^6.0|^7.0",
151+
"symfony/expression-language": "^6.4|^7.0|^8.0",
152152
"symplify/monorepo-builder": "11.1.21",
153153
"aws/aws-sdk-php": ">=3.340.5",
154-
"symfony/messenger": "^5.4|^6.0|^7.0",
155-
"symfony/amqp-messenger": "^5.4.31|^6.0|^7.0",
156-
"symfony/doctrine-messenger": "^5.4|^6.0|^7.0",
154+
"symfony/messenger": "^6.4|^7.0|^8.0",
155+
"symfony/amqp-messenger": "^6.4|^7.0|^8.0",
156+
"symfony/doctrine-messenger": "^6.4|^7.0|^8.0",
157157
"doctrine/doctrine-bundle": "^2.7.2",
158158
"phpbench/phpbench": "^1.2|^1.3",
159159
"enqueue/amqp-ext": "^0.10.18",
@@ -165,7 +165,7 @@
165165
"timacdonald/log-fake": "^2.0",
166166
"symfony/monolog-bundle": "^3.10",
167167
"kwn/php-rdkafka-stubs": "^2.2",
168-
"symfony/var-exporter": "^5.4|^6.0|^7.0"
168+
"symfony/var-exporter": "^6.4|^7.0|^8.0"
169169
},
170170
"conflict": {
171171
"symfony/doctrine-messenger": ">7.0.5 < 7.1.0",

packages/Dbal/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"doctrine/annotations": "^1.13|^2.0",
4848
"wikimedia/composer-merge-plugin": "^2.1",
4949
"ecotone/jms-converter": "~1.277.3",
50-
"symfony/expression-language": "^6.0|^7.0"
50+
"symfony/expression-language": "^6.4|^7.0|^8.0"
5151
},
5252
"scripts": {
5353
"tests:phpstan": "vendor/bin/phpstan",

packages/Ecotone/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"phpunit/phpunit": "^10.5|^11.0",
5050
"behat/behat": "^3.10",
5151
"phpstan/phpstan": "^1.8",
52-
"symfony/expression-language": "^6.0|^7.0"
52+
"symfony/expression-language": "^6.4|^7.0|^8.0"
5353
},
5454
"scripts": {
5555
"tests:phpstan": "vendor/bin/phpstan",

packages/Ecotone/src/Messaging/Handler/Processor/MethodInvoker/Pointcut/PointcutParser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private function getTokens(string $expression): array
156156
fn ($token) => $token !== ''
157157
);
158158

159-
$parts = $this->groupParenthesesAtEndOfExpression($parts);
159+
$parts = $this->groupParenthesesAtEndOfExpression(array_values($parts));
160160

161161
return array_values($parts);
162162
}

packages/JmsConverter/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"require": {
4141
"ecotone/ecotone": "~1.277.3",
4242
"jms/serializer": "^3.32",
43-
"symfony/cache": "^5.4|^6.1|^7.0"
43+
"symfony/cache": "^6.4|^7.0|^8.0"
4444
},
4545
"require-dev": {
4646
"phpunit/phpunit": "^10.5|^11.0",

packages/Laravel/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"phpstan/phpstan": "^1.8",
4949
"orchestra/testbench": "^8.0|^9.0|^10.0|^11.0",
5050
"wikimedia/composer-merge-plugin": "^2.1",
51-
"symfony/expression-language": "^6.0|^7.0",
51+
"symfony/expression-language": "^6.4|^7.0|^8.0",
5252
"nesbot/carbon": "^2.71|^3.0",
5353
"moneyphp/money": "^4.1.0",
5454
"ecotone/dbal": "~1.277.3",

packages/OpenTelemetry/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"wikimedia/composer-merge-plugin": "^2.1",
4545
"open-telemetry/transport-grpc": "^1.0.0",
4646
"open-telemetry/exporter-otlp": "^1.0.0",
47-
"symfony/http-client": "^5.4|^6.2|7.0",
47+
"symfony/http-client": "^6.4|^7.0|^8.0",
4848
"guzzlehttp/promises": "^1.5",
4949
"php-http/message-factory": "^1.0",
5050
"nyholm/psr7": "^1.5",

packages/PdoEventSourcing/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
"phpunit/phpunit": "^10.5|^11.0",
4141
"phpstan/phpstan": "^1.8",
4242
"wikimedia/composer-merge-plugin": "^2.1",
43-
"symfony/process": "^5.4.24|^6.1|^7.0",
44-
"symfony/console": "^5.4|^6.1|^7.0"
43+
"symfony/process": "^6.4|^7.0|^8.0",
44+
"symfony/console": "^6.4|^7.0|^8.0"
4545
},
4646
"scripts": {
4747
"tests:phpstan": "vendor/bin/phpstan",

0 commit comments

Comments
 (0)