Skip to content

Commit

Permalink
Release 1.217.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dgafka authored and github-actions[bot] committed Apr 5, 2024
1 parent 258c026 commit 44f0eac
Show file tree
Hide file tree
Showing 17 changed files with 47 additions and 46 deletions.
4 changes: 2 additions & 2 deletions packages/Amqp/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -63,7 +63,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "amqp"
Expand Down
6 changes: 3 additions & 3 deletions packages/Dbal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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": {
Expand All @@ -56,7 +56,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "dbal"
Expand Down
2 changes: 1 addition & 1 deletion packages/Ecotone/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "ecotone"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,20 @@ final class ConvertedHeaderEndpoint
#[CommandHandler('withScalarConversion', endpointId: 'withScalarConversionEndpoint')]
public function handleWithScalarConversion(
#[Header('token')] UuidInterface $token
)
{
) {
$this->result = $token;
}

#[Asynchronous('async')]
#[CommandHandler('withFallbackConversion', endpointId: 'withFallbackConversionEndpoint')]
public function handleWithFallbackConversion(
#[Header('tokens')] array $tokens
)
{
) {
$this->result = $tokens;
}

public function result(): mixed
{
return $this->result;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ public function matches(TypeDescriptor $sourceType, MediaType $sourceMediaType,
{
return $targetMediaType->isCompatibleWith(MediaType::createApplicationJson()) || $sourceMediaType->isCompatibleWith(MediaType::createApplicationJson());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/**
Expand All @@ -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');

Expand All @@ -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');

Expand All @@ -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');

Expand All @@ -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),
];
}
}
}
4 changes: 2 additions & 2 deletions packages/Enqueue/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -53,7 +53,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "enqueue"
Expand Down
4 changes: 2 additions & 2 deletions packages/JmsConverter/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -57,7 +57,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "jms-converter"
Expand Down
6 changes: 3 additions & 3 deletions packages/Laravel/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -56,7 +56,7 @@
]
},
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "laravel"
Expand Down
6 changes: 3 additions & 3 deletions packages/LiteApplication/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -47,7 +47,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "lite-application"
Expand Down
4 changes: 2 additions & 2 deletions packages/OpenTelemetry/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}
},
"require": {
"ecotone/ecotone": "~1.216.0",
"ecotone/ecotone": "~1.217.0",
"open-telemetry/sdk": "^1.0.0"
},
"require-dev": {
Expand Down Expand Up @@ -61,7 +61,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "open-telemetry"
Expand Down
4 changes: 2 additions & 2 deletions packages/PdoEventSourcing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}
},
"require": {
"ecotone/dbal": "~1.216.0",
"ecotone/dbal": "~1.217.0",
"prooph/pdo-event-store": "^1.15.1"
},
"require-dev": {
Expand All @@ -49,7 +49,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "pdo-event-sourcing"
Expand Down
4 changes: 2 additions & 2 deletions packages/Redis/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}
},
"require": {
"ecotone/enqueue": "~1.216.0",
"ecotone/enqueue": "~1.217.0",
"enqueue/redis": "^0.10.9"
},
"require-dev": {
Expand All @@ -57,7 +57,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "redis"
Expand Down
4 changes: 2 additions & 2 deletions packages/Sqs/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -52,7 +52,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "sqs"
Expand Down
6 changes: 3 additions & 3 deletions packages/Symfony/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
Expand Down Expand Up @@ -84,7 +84,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "symfony"
Expand Down
2 changes: 1 addition & 1 deletion quickstart-examples/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.216.0-dev"
"dev-main": "1.217.0-dev"
},
"ecotone": {
"repository": "quickstart-examples"
Expand Down

0 comments on commit 44f0eac

Please sign in to comment.