diff --git a/packages/Amqp/composer.json b/packages/Amqp/composer.json index 04445b525..22cc354d4 100644 --- a/packages/Amqp/composer.json +++ b/packages/Amqp/composer.json @@ -39,7 +39,7 @@ }, "require": { "ext-amqp": "*", - "ecotone/enqueue": "~1.216.0", + "ecotone/enqueue": "~1.217.0", "enqueue/amqp-ext": "^0.10.18", "enqueue/dsn": "^0.10.4", "enqueue/enqueue": "^0.10.0" @@ -63,7 +63,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "amqp" diff --git a/packages/Dbal/composer.json b/packages/Dbal/composer.json index 5dd626e22..f50ff8806 100644 --- a/packages/Dbal/composer.json +++ b/packages/Dbal/composer.json @@ -30,7 +30,7 @@ } }, "require": { - "ecotone/enqueue": "~1.216.0", + "ecotone/enqueue": "~1.217.0", "enqueue/dbal": "^0.10.17", "doctrine/dbal": "^2.12.0|^3.0" }, @@ -43,7 +43,7 @@ "doctrine/cache": "^1.0.0", "doctrine/annotations": "^1.13", "wikimedia/composer-merge-plugin": "^2.0", - "ecotone/jms-converter": "~1.216.0", + "ecotone/jms-converter": "~1.217.0", "symfony/expression-language": "^6.0|^7.0" }, "scripts": { @@ -56,7 +56,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "dbal" diff --git a/packages/Ecotone/composer.json b/packages/Ecotone/composer.json index 1658e7b4e..9db1fbc09 100644 --- a/packages/Ecotone/composer.json +++ b/packages/Ecotone/composer.json @@ -62,7 +62,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "ecotone" diff --git a/packages/Ecotone/src/Messaging/Handler/Processor/MethodInvoker/Converter/HeaderConverter.php b/packages/Ecotone/src/Messaging/Handler/Processor/MethodInvoker/Converter/HeaderConverter.php index 2676874a8..a8978fd78 100644 --- a/packages/Ecotone/src/Messaging/Handler/Processor/MethodInvoker/Converter/HeaderConverter.php +++ b/packages/Ecotone/src/Messaging/Handler/Processor/MethodInvoker/Converter/HeaderConverter.php @@ -49,9 +49,9 @@ public function getArgumentFrom(Message $message) if (! $sourceValueType->isCompatibleWith($targetType)) { if ($this->canConvertTo($headerValue, MediaType::APPLICATION_X_PHP, $targetType)) { $headerValue = $this->doConversion($headerValue, MediaType::APPLICATION_X_PHP, $targetType); - }elseif ($sourceValueType->isScalar() && $this->canConvertTo($headerValue, DefaultHeaderMapper::FALLBACK_HEADER_CONVERSION_MEDIA_TYPE, $targetType)) { + } elseif ($sourceValueType->isScalar() && $this->canConvertTo($headerValue, DefaultHeaderMapper::FALLBACK_HEADER_CONVERSION_MEDIA_TYPE, $targetType)) { $headerValue = $this->doConversion($headerValue, DefaultHeaderMapper::FALLBACK_HEADER_CONVERSION_MEDIA_TYPE, $targetType); - }else { + } else { throw ConversionException::create("Can't convert {$this->headerName} from {$sourceValueType} to {$targetType}. Lack of PHP Converter or JSON Media Type Converter available."); } } diff --git a/packages/Ecotone/tests/Messaging/Fixture/Handler/HeaderConversion/ConvertedHeaderEndpoint.php b/packages/Ecotone/tests/Messaging/Fixture/Handler/HeaderConversion/ConvertedHeaderEndpoint.php index 3fe24e9fc..27ee1e649 100644 --- a/packages/Ecotone/tests/Messaging/Fixture/Handler/HeaderConversion/ConvertedHeaderEndpoint.php +++ b/packages/Ecotone/tests/Messaging/Fixture/Handler/HeaderConversion/ConvertedHeaderEndpoint.php @@ -17,8 +17,7 @@ final class ConvertedHeaderEndpoint #[CommandHandler('withScalarConversion', endpointId: 'withScalarConversionEndpoint')] public function handleWithScalarConversion( #[Header('token')] UuidInterface $token - ) - { + ) { $this->result = $token; } @@ -26,8 +25,7 @@ public function handleWithScalarConversion( #[CommandHandler('withFallbackConversion', endpointId: 'withFallbackConversionEndpoint')] public function handleWithFallbackConversion( #[Header('tokens')] array $tokens - ) - { + ) { $this->result = $tokens; } @@ -35,4 +33,4 @@ public function result(): mixed { return $this->result; } -} \ No newline at end of file +} diff --git a/packages/Ecotone/tests/Messaging/Fixture/Handler/HeaderConversion/JsonConverter.php b/packages/Ecotone/tests/Messaging/Fixture/Handler/HeaderConversion/JsonConverter.php index 6213a6634..f5ec26cf5 100644 --- a/packages/Ecotone/tests/Messaging/Fixture/Handler/HeaderConversion/JsonConverter.php +++ b/packages/Ecotone/tests/Messaging/Fixture/Handler/HeaderConversion/JsonConverter.php @@ -28,4 +28,4 @@ public function matches(TypeDescriptor $sourceType, MediaType $sourceMediaType, { return $targetMediaType->isCompatibleWith(MediaType::createApplicationJson()) || $sourceMediaType->isCompatibleWith(MediaType::createApplicationJson()); } -} \ No newline at end of file +} diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/HeaderConversionTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/HeaderConversionTest.php index b1ee91f7f..f837d8d10 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/HeaderConversionTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/HeaderConversionTest.php @@ -10,9 +10,12 @@ use Ecotone\Messaging\Conversion\MediaType; use PHPUnit\Framework\TestCase; use Ramsey\Uuid\Uuid; -use \Test\Ecotone\Messaging\Fixture\Handler\HeaderConversion\ConvertedHeaderEndpoint; +use Test\Ecotone\Messaging\Fixture\Handler\HeaderConversion\ConvertedHeaderEndpoint; use Test\Ecotone\Messaging\Fixture\Handler\HeaderConversion\JsonConverter; +/** + * @internal + */ final class HeaderConversionTest extends TestCase { /** @@ -28,13 +31,13 @@ public function test_using_scalar_in_metadata_for_conversion(ServiceConfiguratio enableAsynchronousProcessing: [ SimpleMessageChannelBuilder::createQueueChannel( 'async' - ) + ), ] ); $ecotoneLite ->sendCommandWithRoutingKey('withScalarConversion', metadata: [ - 'token' => '537edce7-7e56-4777-b6ec-a012c40b9d1b' + 'token' => '537edce7-7e56-4777-b6ec-a012c40b9d1b', ]) ->run('async'); @@ -57,13 +60,13 @@ public function test_using_object_in_metadata_for_conversion(ServiceConfiguratio enableAsynchronousProcessing: [ SimpleMessageChannelBuilder::createQueueChannel( 'async' - ) + ), ] ); $ecotoneLite ->sendCommandWithRoutingKey('withScalarConversion', metadata: [ - 'token' => Uuid::fromString('537edce7-7e56-4777-b6ec-a012c40b9d1b') + 'token' => Uuid::fromString('537edce7-7e56-4777-b6ec-a012c40b9d1b'), ]) ->run('async'); @@ -86,13 +89,13 @@ public function test_using_fallback_conversion_to_json(ServiceConfiguration $ser enableAsynchronousProcessing: [ SimpleMessageChannelBuilder::createQueueChannel( 'async' - ) + ), ] ); $ecotoneLite ->sendCommandWithRoutingKey('withFallbackConversion', metadata: [ - 'tokens' => [1, 2, 3, 4, 5] + 'tokens' => [1, 2, 3, 4, 5], ]) ->run('async'); @@ -110,11 +113,11 @@ public static function differentDefaultSerializations(): iterable { yield [ ServiceConfiguration::createWithAsynchronicityOnly() - ->withDefaultSerializationMediaType(MediaType::APPLICATION_X_PHP_SERIALIZED) + ->withDefaultSerializationMediaType(MediaType::APPLICATION_X_PHP_SERIALIZED), ]; yield [ ServiceConfiguration::createWithAsynchronicityOnly() - ->withDefaultSerializationMediaType(MediaType::APPLICATION_JSON) + ->withDefaultSerializationMediaType(MediaType::APPLICATION_JSON), ]; } -} \ No newline at end of file +} diff --git a/packages/Enqueue/composer.json b/packages/Enqueue/composer.json index f8b01194e..6f72afd35 100644 --- a/packages/Enqueue/composer.json +++ b/packages/Enqueue/composer.json @@ -30,7 +30,7 @@ } }, "require": { - "ecotone/ecotone": "~1.216.0", + "ecotone/ecotone": "~1.217.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10.4" }, @@ -53,7 +53,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "enqueue" diff --git a/packages/JmsConverter/composer.json b/packages/JmsConverter/composer.json index 265102e4c..a5c179a3e 100644 --- a/packages/JmsConverter/composer.json +++ b/packages/JmsConverter/composer.json @@ -35,7 +35,7 @@ } }, "require": { - "ecotone/ecotone": "~1.216.0", + "ecotone/ecotone": "~1.217.0", "jms/serializer": "^3.17", "symfony/cache": "^5.4|^6.1|^7.0" }, @@ -57,7 +57,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "jms-converter" diff --git a/packages/Laravel/composer.json b/packages/Laravel/composer.json index a79191403..bb7c77ea2 100644 --- a/packages/Laravel/composer.json +++ b/packages/Laravel/composer.json @@ -34,7 +34,7 @@ } }, "require": { - "ecotone/ecotone": "~1.216.0", + "ecotone/ecotone": "~1.217.0", "laravel/framework": "^9.5.2|^10.0|^11.0" }, "require-dev": { @@ -47,7 +47,7 @@ "symfony/expression-language": "^6.0|^7.0", "nesbot/carbon": "^2.71", "moneyphp/money": "^4.1.0", - "ecotone/dbal": "~1.216.0" + "ecotone/dbal": "~1.217.0" }, "extra": { "laravel": { @@ -56,7 +56,7 @@ ] }, "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "laravel" diff --git a/packages/LiteApplication/composer.json b/packages/LiteApplication/composer.json index a17ddf7b4..32b3d77ab 100644 --- a/packages/LiteApplication/composer.json +++ b/packages/LiteApplication/composer.json @@ -33,8 +33,8 @@ } }, "require": { - "ecotone/ecotone": "~1.216.0", - "ecotone/jms-converter": "~1.216.0", + "ecotone/ecotone": "~1.217.0", + "ecotone/jms-converter": "~1.217.0", "php-di/php-di": "^7.0.1" }, "require-dev": { @@ -47,7 +47,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "lite-application" diff --git a/packages/OpenTelemetry/composer.json b/packages/OpenTelemetry/composer.json index 1205ce5bf..60d9586b3 100644 --- a/packages/OpenTelemetry/composer.json +++ b/packages/OpenTelemetry/composer.json @@ -31,7 +31,7 @@ } }, "require": { - "ecotone/ecotone": "~1.216.0", + "ecotone/ecotone": "~1.217.0", "open-telemetry/sdk": "^1.0.0" }, "require-dev": { @@ -61,7 +61,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "open-telemetry" diff --git a/packages/PdoEventSourcing/composer.json b/packages/PdoEventSourcing/composer.json index ab16d6050..d5154f5a0 100644 --- a/packages/PdoEventSourcing/composer.json +++ b/packages/PdoEventSourcing/composer.json @@ -30,7 +30,7 @@ } }, "require": { - "ecotone/dbal": "~1.216.0", + "ecotone/dbal": "~1.217.0", "prooph/pdo-event-store": "^1.15.1" }, "require-dev": { @@ -49,7 +49,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "pdo-event-sourcing" diff --git a/packages/Redis/composer.json b/packages/Redis/composer.json index 31da83ac6..cd4427c51 100644 --- a/packages/Redis/composer.json +++ b/packages/Redis/composer.json @@ -35,7 +35,7 @@ } }, "require": { - "ecotone/enqueue": "~1.216.0", + "ecotone/enqueue": "~1.217.0", "enqueue/redis": "^0.10.9" }, "require-dev": { @@ -57,7 +57,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "redis" diff --git a/packages/Sqs/composer.json b/packages/Sqs/composer.json index e45ed1907..aba1f7e69 100644 --- a/packages/Sqs/composer.json +++ b/packages/Sqs/composer.json @@ -30,7 +30,7 @@ } }, "require": { - "ecotone/enqueue": "~1.216.0", + "ecotone/enqueue": "~1.217.0", "enqueue/sqs": "^0.10.15", "aws/aws-sdk-php": "<=3.269.5" }, @@ -52,7 +52,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "sqs" diff --git a/packages/Symfony/composer.json b/packages/Symfony/composer.json index 19928ff6b..23cdb53db 100644 --- a/packages/Symfony/composer.json +++ b/packages/Symfony/composer.json @@ -24,7 +24,7 @@ ], "description": "Extends Ecotone with Symfony integration", "require": { - "ecotone/ecotone": "~1.216.0", + "ecotone/ecotone": "~1.217.0", "laminas/laminas-zendframework-bridge": "^1.0.0", "symfony/console": "^5.4|^6.0|^7.0", "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", @@ -43,7 +43,7 @@ "symfony/expression-language": "^6.0|^7.0", "symfony/messenger": "^5.4|^6.0|^7.0", "wikimedia/composer-merge-plugin": "^2.0", - "ecotone/dbal": "~1.216.0" + "ecotone/dbal": "~1.217.0" }, "config": { "sort-packages": true, @@ -84,7 +84,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "symfony" diff --git a/quickstart-examples/composer.json b/quickstart-examples/composer.json index 140daf246..258fc08ef 100644 --- a/quickstart-examples/composer.json +++ b/quickstart-examples/composer.json @@ -62,7 +62,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.216.0-dev" + "dev-main": "1.217.0-dev" }, "ecotone": { "repository": "quickstart-examples"