diff --git a/packages/Amqp/composer.json b/packages/Amqp/composer.json index 8e1b37b35..832d53a1a 100644 --- a/packages/Amqp/composer.json +++ b/packages/Amqp/composer.json @@ -39,7 +39,7 @@ }, "require": { "ext-amqp": "*", - "ecotone/enqueue": "~1.218.0", + "ecotone/enqueue": "~1.219.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.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "amqp" diff --git a/packages/Dbal/composer.json b/packages/Dbal/composer.json index c419c9d99..bb68042ee 100644 --- a/packages/Dbal/composer.json +++ b/packages/Dbal/composer.json @@ -30,7 +30,7 @@ } }, "require": { - "ecotone/enqueue": "~1.218.0", + "ecotone/enqueue": "~1.219.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.218.0", + "ecotone/jms-converter": "~1.219.0", "symfony/expression-language": "^6.0|^7.0" }, "scripts": { @@ -56,7 +56,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "dbal" diff --git a/packages/Ecotone/composer.json b/packages/Ecotone/composer.json index 4a8728180..6392ce642 100644 --- a/packages/Ecotone/composer.json +++ b/packages/Ecotone/composer.json @@ -62,7 +62,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "ecotone" diff --git a/packages/Ecotone/src/Lite/EcotoneLite.php b/packages/Ecotone/src/Lite/EcotoneLite.php index 45dbaab01..b72cc1843 100644 --- a/packages/Ecotone/src/Lite/EcotoneLite.php +++ b/packages/Ecotone/src/Lite/EcotoneLite.php @@ -11,7 +11,6 @@ use Ecotone\Lite\Test\FlowTestSupport; use Ecotone\Lite\Test\TestConfiguration; use Ecotone\Messaging\Channel\MessageChannelBuilder; -use Ecotone\Messaging\Config\Annotation\ModuleConfiguration\ExtensionObjectResolver; use Ecotone\Messaging\Config\ConfiguredMessagingSystem; use Ecotone\Messaging\Config\Container\ContainerConfig; use Ecotone\Messaging\Config\MessagingSystemConfiguration; @@ -248,7 +247,7 @@ private static function prepareForFlowTesting(?ServiceConfiguration $configurati } $configuration = $configuration ?: ServiceConfiguration::createWithDefaults(); - $testConfiguration = $testConfiguration ?? TestConfiguration::createWithDefaults(); + $testConfiguration ??= TestConfiguration::createWithDefaults(); if (! $configuration->areSkippedPackagesDefined()) { $configuration = $configuration diff --git a/packages/Ecotone/src/Lite/Test/FlowTestSupport.php b/packages/Ecotone/src/Lite/Test/FlowTestSupport.php index 12a2ae23c..622c360b3 100644 --- a/packages/Ecotone/src/Lite/Test/FlowTestSupport.php +++ b/packages/Ecotone/src/Lite/Test/FlowTestSupport.php @@ -23,7 +23,6 @@ use Ecotone\Modelling\Config\ModellingHandlerModule; use Ecotone\Modelling\Event; use Ecotone\Modelling\EventBus; -use Ecotone\Modelling\MessageBus; use Ecotone\Modelling\QueryBus; /** diff --git a/packages/Ecotone/src/Messaging/Attribute/InternalHandler.php b/packages/Ecotone/src/Messaging/Attribute/InternalHandler.php index 7fb07ced8..b8c375100 100644 --- a/packages/Ecotone/src/Messaging/Attribute/InternalHandler.php +++ b/packages/Ecotone/src/Messaging/Attribute/InternalHandler.php @@ -15,8 +15,7 @@ public function __construct( string $endpointId = '', array $requiredInterceptorNames = [], bool $changingHeaders = false, - ) - { + ) { parent::__construct( inputChannelName: $inputChannelName, endpointId: $endpointId, @@ -25,4 +24,4 @@ public function __construct( changingHeaders: $changingHeaders, ); } -} \ No newline at end of file +} diff --git a/packages/Ecotone/src/Messaging/Attribute/ServiceActivator.php b/packages/Ecotone/src/Messaging/Attribute/ServiceActivator.php index 614b97cf1..d40251e22 100644 --- a/packages/Ecotone/src/Messaging/Attribute/ServiceActivator.php +++ b/packages/Ecotone/src/Messaging/Attribute/ServiceActivator.php @@ -18,8 +18,7 @@ public function __construct( bool $requiresReply = false, array $requiredInterceptorNames = [], private bool $changingHeaders = false, - ) - { + ) { parent::__construct($inputChannelName, $endpointId, $outputChannelName, $requiredInterceptorNames); $this->requiresReply = $requiresReply; } diff --git a/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/BasicMessagingModule.php b/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/BasicMessagingModule.php index 334212f2e..543466b85 100644 --- a/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/BasicMessagingModule.php +++ b/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/BasicMessagingModule.php @@ -41,7 +41,6 @@ use Ecotone\Messaging\Handler\TypeDescriptor; use Ecotone\Messaging\MessageHeaders; use Ecotone\Messaging\NullableMessageChannel; -use Ecotone\Modelling\MessageBus; #[ModuleAnnotation] class BasicMessagingModule extends NoExternalConfigurationModule implements AnnotationModule diff --git a/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/EndpointHeaders/EndpointHeadersInterceptor.php b/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/EndpointHeaders/EndpointHeadersInterceptor.php index 8544e93dd..0adec1e9b 100644 --- a/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/EndpointHeaders/EndpointHeadersInterceptor.php +++ b/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/EndpointHeaders/EndpointHeadersInterceptor.php @@ -6,7 +6,6 @@ use Ecotone\Messaging\Attribute\Endpoint\AddHeader; use Ecotone\Messaging\Attribute\Endpoint\Delayed; -use Ecotone\Messaging\Attribute\Endpoint\ExpireAfter; use Ecotone\Messaging\Attribute\Endpoint\Priority; use Ecotone\Messaging\Attribute\Endpoint\RemoveHeader; use Ecotone\Messaging\Attribute\Endpoint\TimeToLive; diff --git a/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/EndpointHeaders/EndpointHeadersInterceptorModule.php b/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/EndpointHeaders/EndpointHeadersInterceptorModule.php index 867373a44..fa4708556 100644 --- a/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/EndpointHeaders/EndpointHeadersInterceptorModule.php +++ b/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/EndpointHeaders/EndpointHeadersInterceptorModule.php @@ -4,9 +4,6 @@ use Ecotone\AnnotationFinder\AnnotationFinder; use Ecotone\Messaging\Attribute\Endpoint\AddHeader; -use Ecotone\Messaging\Attribute\Endpoint\Delayed; -use Ecotone\Messaging\Attribute\Endpoint\ExpireAfter; -use Ecotone\Messaging\Attribute\Endpoint\Priority; use Ecotone\Messaging\Attribute\Endpoint\RemoveHeader; use Ecotone\Messaging\Attribute\ModuleAnnotation; use Ecotone\Messaging\Config\Annotation\AnnotationModule; diff --git a/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/ServiceActivatorModule.php b/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/ServiceActivatorModule.php index 6b060a776..8faaded9a 100644 --- a/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/ServiceActivatorModule.php +++ b/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/ServiceActivatorModule.php @@ -12,9 +12,9 @@ use Ecotone\Messaging\Handler\InterfaceToCallRegistry; use Ecotone\Messaging\Handler\MessageHandlerBuilderWithParameterConverters; use Ecotone\Messaging\Handler\ServiceActivator\ServiceActivatorBuilder; +use Ecotone\Messaging\Support\InvalidArgumentException; use Ecotone\Modelling\Attribute\Aggregate; use Ecotone\Modelling\Attribute\Saga; -use Ecotone\Messaging\Support\InvalidArgumentException; #[ModuleAnnotation] class ServiceActivatorModule extends MessageHandlerRegisterConfiguration diff --git a/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/SplitterModule.php b/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/SplitterModule.php index b6c988487..d18e47f08 100644 --- a/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/SplitterModule.php +++ b/packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/SplitterModule.php @@ -5,7 +5,6 @@ use Ecotone\AnnotationFinder\AnnotatedFinding; use Ecotone\Messaging\Attribute\ModuleAnnotation; use Ecotone\Messaging\Attribute\Splitter; -use Ecotone\Messaging\Attribute\Transformer; use Ecotone\Messaging\Config\Annotation\AnnotatedDefinitionReference; use Ecotone\Messaging\Config\ModulePackageList; use Ecotone\Messaging\Handler\InterfaceToCallRegistry; diff --git a/packages/Ecotone/src/Messaging/Handler/Processor/WrapWithMessageBuildProcessor.php b/packages/Ecotone/src/Messaging/Handler/Processor/WrapWithMessageBuildProcessor.php index 482708003..6a1c6db5a 100644 --- a/packages/Ecotone/src/Messaging/Handler/Processor/WrapWithMessageBuildProcessor.php +++ b/packages/Ecotone/src/Messaging/Handler/Processor/WrapWithMessageBuildProcessor.php @@ -25,8 +25,7 @@ public function __construct( private InterfaceToCall $interfaceToCall, private MessageProcessor $messageProcessor, private bool $shouldChangeMessageHeaders - ) - { + ) { } public static function createWith(InterfaceToCall $interfaceToCall, MessageProcessor $messageProcessor, bool $shouldChangeMessageHeaders = false) @@ -46,8 +45,8 @@ public function executeEndpoint(Message $message): ?Message } if ($this->shouldChangeMessageHeaders) { - Assert::isFalse($result instanceof Message, "Message should not be returned when changing headers in " . $this->interfaceToCall->toString()); - Assert::isTrue(is_array($result), "Result should be an array when changing headers in " . $this->interfaceToCall->toString()); + Assert::isFalse($result instanceof Message, 'Message should not be returned when changing headers in ' . $this->interfaceToCall->toString()); + Assert::isTrue(is_array($result), 'Result should be an array when changing headers in ' . $this->interfaceToCall->toString()); return MessageBuilder::fromMessage($message) ->setMultipleHeaders($result) diff --git a/packages/Ecotone/src/Messaging/Scheduling/TimeSpan.php b/packages/Ecotone/src/Messaging/Scheduling/TimeSpan.php index d7ddef310..46e968c2a 100644 --- a/packages/Ecotone/src/Messaging/Scheduling/TimeSpan.php +++ b/packages/Ecotone/src/Messaging/Scheduling/TimeSpan.php @@ -15,8 +15,7 @@ public function __construct( public int $minutes = 0, public int $hours = 0, public int $days = 0, - ) - { + ) { } @@ -34,8 +33,8 @@ public function getDefinition(): Definition $this->seconds, $this->minutes, $this->hours, - $this->days + $this->days, ] ); } -} \ No newline at end of file +} diff --git a/packages/Ecotone/src/Modelling/MessageBus.php b/packages/Ecotone/src/Modelling/MessageBus.php index 1691ea83a..531f691c0 100644 --- a/packages/Ecotone/src/Modelling/MessageBus.php +++ b/packages/Ecotone/src/Modelling/MessageBus.php @@ -4,8 +4,6 @@ namespace Ecotone\Modelling; -use Ecotone\Messaging\Conversion\MediaType; - interface MessageBus { /** diff --git a/packages/Ecotone/tests/Lite/Test/MessagingTestSupportFrameworkTest.php b/packages/Ecotone/tests/Lite/Test/MessagingTestSupportFrameworkTest.php index 0c6bed6fb..a989cdbf6 100644 --- a/packages/Ecotone/tests/Lite/Test/MessagingTestSupportFrameworkTest.php +++ b/packages/Ecotone/tests/Lite/Test/MessagingTestSupportFrameworkTest.php @@ -466,7 +466,7 @@ public function test_releasing_delayed_message_with_passed_milliseconds() [OrderService::class, PlaceOrderConverter::class, OrderWasPlacedConverter::class], [new OrderService(), new PlaceOrderConverter(), new OrderWasPlacedConverter()], enableAsynchronousProcessing: [ - SimpleMessageChannelBuilder::createQueueChannel('orders', true, MediaType::createApplicationXPHPArray()) + SimpleMessageChannelBuilder::createQueueChannel('orders', true, MediaType::createApplicationXPHPArray()), ] ); @@ -491,7 +491,7 @@ public function test_releasing_delayed_message() [OrderService::class, PlaceOrderConverter::class, OrderWasPlacedConverter::class], [new OrderService(), new PlaceOrderConverter(), new OrderWasPlacedConverter()], enableAsynchronousProcessing: [ - SimpleMessageChannelBuilder::createQueueChannel('orders', true, MediaType::createApplicationXPHPArray()) + SimpleMessageChannelBuilder::createQueueChannel('orders', true, MediaType::createApplicationXPHPArray()), ] ); diff --git a/packages/Ecotone/tests/Messaging/Fixture/AddHeaders/AddingMultipleHeaders.php b/packages/Ecotone/tests/Messaging/Fixture/AddHeaders/AddingMultipleHeaders.php index 433295b32..a3a8c60bd 100644 --- a/packages/Ecotone/tests/Messaging/Fixture/AddHeaders/AddingMultipleHeaders.php +++ b/packages/Ecotone/tests/Messaging/Fixture/AddHeaders/AddingMultipleHeaders.php @@ -19,10 +19,10 @@ final class AddingMultipleHeaders #[TimeToLive(1001)] #[Priority(1)] #[RemoveHeader('user')] - #[Asynchronous("async")] - #[CommandHandler("addHeaders", endpointId: "addHeadersEndpoint")] + #[Asynchronous('async')] + #[CommandHandler('addHeaders', endpointId: 'addHeadersEndpoint')] public function test(): void { } -} \ No newline at end of file +} diff --git a/packages/Ecotone/tests/Messaging/Fixture/Annotation/MessageEndpoint/ServiceActivator/MessageHandler/ExampleMessageHandlerChangingHeaders.php b/packages/Ecotone/tests/Messaging/Fixture/Annotation/MessageEndpoint/ServiceActivator/MessageHandler/ExampleMessageHandlerChangingHeaders.php index 946ab1e3b..fb8fa4976 100644 --- a/packages/Ecotone/tests/Messaging/Fixture/Annotation/MessageEndpoint/ServiceActivator/MessageHandler/ExampleMessageHandlerChangingHeaders.php +++ b/packages/Ecotone/tests/Messaging/Fixture/Annotation/MessageEndpoint/ServiceActivator/MessageHandler/ExampleMessageHandlerChangingHeaders.php @@ -12,4 +12,4 @@ public function test(): void { } -} \ No newline at end of file +} diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/EndpointHeadersInterceptorTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/EndpointHeadersInterceptorTest.php index 6724a6e5d..0a2208f48 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/EndpointHeadersInterceptorTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/EndpointHeadersInterceptorTest.php @@ -8,8 +8,8 @@ use Ecotone\Lite\Test\TestConfiguration; use Ecotone\Messaging\Channel\SimpleMessageChannelBuilder; use Ecotone\Messaging\MessageHeaders; -use Test\Ecotone\Messaging\Fixture\AddHeaders\AddingMultipleHeaders; use PHPUnit\Framework\TestCase; +use Test\Ecotone\Messaging\Fixture\AddHeaders\AddingMultipleHeaders; /** * Class EndpointHeadersInterceptorTest @@ -22,18 +22,22 @@ class EndpointHeadersInterceptorTest extends TestCase { public function test_adding_multiple_headers() { - $ecotoneLite = EcotoneLite::bootstrapFlowTesting([ - AddingMultipleHeaders::class - ], [ - AddingMultipleHeaders::class => new AddingMultipleHeaders() - ], enableAsynchronousProcessing: [ - SimpleMessageChannelBuilder::createQueueChannel('async') - ], - testConfiguration: TestConfiguration::createWithDefaults()->withSpyOnChannel('async')); + $ecotoneLite = EcotoneLite::bootstrapFlowTesting( + [ + AddingMultipleHeaders::class, + ], + [ + AddingMultipleHeaders::class => new AddingMultipleHeaders(), + ], + enableAsynchronousProcessing: [ + SimpleMessageChannelBuilder::createQueueChannel('async'), + ], + testConfiguration: TestConfiguration::createWithDefaults()->withSpyOnChannel('async') + ); $headers = $ecotoneLite ->sendCommandWithRoutingKey('addHeaders', metadata: [ - 'user' => '1233' + 'user' => '1233', ]) ->getRecordedEcotoneMessagesFrom('async')[0]->getHeaders()->headers(); diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTest.php index 16c334070..14b36ab49 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTest.php @@ -16,7 +16,6 @@ use Ecotone\Messaging\Handler\ServiceActivator\ServiceActivatorBuilder; use stdClass; use Test\Ecotone\Messaging\Fixture\Annotation\MessageEndpoint\ServiceActivator\AllConfigurationDefined\ServiceActivatorWithAllConfigurationDefined; -use Test\Ecotone\Messaging\Fixture\Annotation\MessageEndpoint\ServiceActivator\MessageHandler\ExampleMessageHandlerChangingHeaders; /** * Class AnnotationServiceActivatorConfigurationTest diff --git a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/AsynchronousPaymentHandler.php b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/AsynchronousPaymentHandler.php index 555504888..8869763a3 100644 --- a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/AsynchronousPaymentHandler.php +++ b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/AsynchronousPaymentHandler.php @@ -16,7 +16,7 @@ public function __construct(private bool $isPaymentTaken = false) } #[Asynchronous('async')] - #[CommandHandler('takePayment', endpointId: "takePaymentEndpoint")] + #[CommandHandler('takePayment', endpointId: 'takePaymentEndpoint')] public function takePayment(TakePayment $command): void { $this->isPaymentTaken = true; @@ -27,4 +27,4 @@ public function isPaymentTaken(): bool { return $this->isPaymentTaken; } -} \ No newline at end of file +} diff --git a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Command/TakePayment.php b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Command/TakePayment.php index 8bd098c4c..a4edc06ae 100644 --- a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Command/TakePayment.php +++ b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Command/TakePayment.php @@ -10,4 +10,4 @@ public function __construct( public string $orderId ) { } -} \ No newline at end of file +} diff --git a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Event/OrderProcessSagaStarted.php b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Event/OrderProcessSagaStarted.php index a82a0a815..bcaf51de1 100644 --- a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Event/OrderProcessSagaStarted.php +++ b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Event/OrderProcessSagaStarted.php @@ -10,4 +10,4 @@ public function __construct( public string $orderId ) { } -} \ No newline at end of file +} diff --git a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Event/OrderWasPlaced.php b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Event/OrderWasPlaced.php index 27c1e6fab..f222977fe 100644 --- a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Event/OrderWasPlaced.php +++ b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/Event/OrderWasPlaced.php @@ -10,4 +10,4 @@ public function __construct( public string $orderId ) { } -} \ No newline at end of file +} diff --git a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/OrderProcessSaga.php b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/OrderProcessSaga.php index 48f70132c..95edb586b 100644 --- a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/OrderProcessSaga.php +++ b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/OrderProcessSaga.php @@ -5,7 +5,6 @@ namespace Test\Ecotone\Modelling\Fixture\Workflow\Saga; use Ecotone\Messaging\Attribute\Parameter\Header; -use Ecotone\Modelling\Attribute\CommandHandler; use Ecotone\Modelling\Attribute\EventHandler; use Ecotone\Modelling\Attribute\Identifier; use Ecotone\Modelling\Attribute\Saga; @@ -22,27 +21,25 @@ final class OrderProcessSaga public function __construct( #[Identifier] private string $orderId, private bool $shouldTakePayment - ) - { + ) { $this->recordThat(new OrderProcessSagaStarted($orderId)); } #[EventHandler] public static function whenOrderWasPlaced( OrderWasPlaced $event, - #[Header("shouldTakePayment")] bool $shouldTakePayment = true - ): self - { + #[Header('shouldTakePayment')] bool $shouldTakePayment = true + ): self { return new self($event->orderId, $shouldTakePayment); } - #[EventHandler(outputChannelName: "takePayment")] + #[EventHandler(outputChannelName: 'takePayment')] public function triggerPayment(OrderProcessSagaStarted $event): ?TakePayment { - if (!$this->shouldTakePayment) { + if (! $this->shouldTakePayment) { return null; } return new TakePayment($event->orderId); } -} \ No newline at end of file +} diff --git a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/PaymentHandler.php b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/PaymentHandler.php index a04e467a2..b75f2e2c5 100644 --- a/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/PaymentHandler.php +++ b/packages/Ecotone/tests/Modelling/Fixture/Workflow/Saga/PaymentHandler.php @@ -25,4 +25,4 @@ public function isPaymentTaken(): bool { return $this->isPaymentTaken; } -} \ No newline at end of file +} diff --git a/packages/Ecotone/tests/Modelling/Unit/WorkflowTest.php b/packages/Ecotone/tests/Modelling/Unit/WorkflowTest.php index c4468fd37..3bb72afe3 100644 --- a/packages/Ecotone/tests/Modelling/Unit/WorkflowTest.php +++ b/packages/Ecotone/tests/Modelling/Unit/WorkflowTest.php @@ -5,15 +5,17 @@ namespace Modelling\Unit; use Ecotone\Lite\EcotoneLite; -use Ecotone\Lite\Test\TestConfiguration; use Ecotone\Messaging\Channel\SimpleMessageChannelBuilder; +use PHPUnit\Framework\TestCase; use Test\Ecotone\Modelling\Fixture\Workflow\Saga\AsynchronousPaymentHandler; use Test\Ecotone\Modelling\Fixture\Workflow\Saga\Command\TakePayment; -use PHPUnit\Framework\TestCase; use Test\Ecotone\Modelling\Fixture\Workflow\Saga\Event\OrderWasPlaced; use Test\Ecotone\Modelling\Fixture\Workflow\Saga\OrderProcessSaga; use Test\Ecotone\Modelling\Fixture\Workflow\Saga\PaymentHandler; +/** + * @internal + */ final class WorkflowTest extends TestCase { public function test_workflow_with_joined_output_command_handler(): void @@ -21,7 +23,7 @@ public function test_workflow_with_joined_output_command_handler(): void $ecotoneLite = EcotoneLite::bootstrapFlowTesting( [OrderProcessSaga::class, PaymentHandler::class], [ - PaymentHandler::class => new PaymentHandler() + PaymentHandler::class => new PaymentHandler(), ] ); @@ -43,7 +45,7 @@ public function test_workflow_with_message_filtering_on_saga(): void $ecotoneLite = EcotoneLite::bootstrapFlowTesting( [OrderProcessSaga::class, PaymentHandler::class], [ - PaymentHandler::class => new PaymentHandler() + PaymentHandler::class => new PaymentHandler(), ] ); @@ -60,10 +62,10 @@ public function test_workflow_with_joined_asynchronous_output_command_handler(): $ecotoneLite = EcotoneLite::bootstrapFlowTesting( [OrderProcessSaga::class, AsynchronousPaymentHandler::class], [ - AsynchronousPaymentHandler::class => new AsynchronousPaymentHandler() + AsynchronousPaymentHandler::class => new AsynchronousPaymentHandler(), ], enableAsynchronousProcessing: [ - SimpleMessageChannelBuilder::createQueueChannel('async') + SimpleMessageChannelBuilder::createQueueChannel('async'), ] ); @@ -101,4 +103,4 @@ public function test_workflow_with_separated_output_command_handler(): void ->getRecordedMessagePayloadsFrom('takePayment') ); } -} \ No newline at end of file +} diff --git a/packages/Enqueue/composer.json b/packages/Enqueue/composer.json index 4d04b43ae..30f546dc9 100644 --- a/packages/Enqueue/composer.json +++ b/packages/Enqueue/composer.json @@ -30,7 +30,7 @@ } }, "require": { - "ecotone/ecotone": "~1.218.0", + "ecotone/ecotone": "~1.219.0", "queue-interop/queue-interop": "^0.8", "enqueue/dsn": "^0.10.4" }, @@ -53,7 +53,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "enqueue" diff --git a/packages/JmsConverter/composer.json b/packages/JmsConverter/composer.json index eac093ce2..0c64209ee 100644 --- a/packages/JmsConverter/composer.json +++ b/packages/JmsConverter/composer.json @@ -35,7 +35,7 @@ } }, "require": { - "ecotone/ecotone": "~1.218.0", + "ecotone/ecotone": "~1.219.0", "jms/serializer": "^3.17", "symfony/cache": "^5.4|^6.1|^7.0" }, @@ -57,7 +57,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "jms-converter" diff --git a/packages/Laravel/composer.json b/packages/Laravel/composer.json index c59c25144..9f908e059 100644 --- a/packages/Laravel/composer.json +++ b/packages/Laravel/composer.json @@ -34,7 +34,7 @@ } }, "require": { - "ecotone/ecotone": "~1.218.0", + "ecotone/ecotone": "~1.219.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.218.0" + "ecotone/dbal": "~1.219.0" }, "extra": { "laravel": { @@ -56,7 +56,7 @@ ] }, "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "laravel" diff --git a/packages/LiteApplication/composer.json b/packages/LiteApplication/composer.json index c28936792..f99986dbd 100644 --- a/packages/LiteApplication/composer.json +++ b/packages/LiteApplication/composer.json @@ -33,8 +33,8 @@ } }, "require": { - "ecotone/ecotone": "~1.218.0", - "ecotone/jms-converter": "~1.218.0", + "ecotone/ecotone": "~1.219.0", + "ecotone/jms-converter": "~1.219.0", "php-di/php-di": "^7.0.1" }, "require-dev": { @@ -47,7 +47,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "lite-application" diff --git a/packages/OpenTelemetry/composer.json b/packages/OpenTelemetry/composer.json index f4f826eec..f459f2d63 100644 --- a/packages/OpenTelemetry/composer.json +++ b/packages/OpenTelemetry/composer.json @@ -31,7 +31,7 @@ } }, "require": { - "ecotone/ecotone": "~1.218.0", + "ecotone/ecotone": "~1.219.0", "open-telemetry/sdk": "^1.0.0" }, "require-dev": { @@ -61,7 +61,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "open-telemetry" diff --git a/packages/OpenTelemetry/src/Configuration/OpenTelemetryModule.php b/packages/OpenTelemetry/src/Configuration/OpenTelemetryModule.php index bbc9fee33..932313b28 100644 --- a/packages/OpenTelemetry/src/Configuration/OpenTelemetryModule.php +++ b/packages/OpenTelemetry/src/Configuration/OpenTelemetryModule.php @@ -29,7 +29,6 @@ use Ecotone\Modelling\CommandBus; use Ecotone\Modelling\DistributedBus; use Ecotone\Modelling\EventBus; -use Ecotone\Modelling\MessageBus; use Ecotone\Modelling\QueryBus; use Ecotone\OpenTelemetry\EcotoneForcedTraceFlush; use Ecotone\OpenTelemetry\TracerInterceptor; diff --git a/packages/OpenTelemetry/tests/Fixture/MessageHandlerFlow/ExampleMessageHandler.php b/packages/OpenTelemetry/tests/Fixture/MessageHandlerFlow/ExampleMessageHandler.php index 2eba94040..c91474dee 100644 --- a/packages/OpenTelemetry/tests/Fixture/MessageHandlerFlow/ExampleMessageHandler.php +++ b/packages/OpenTelemetry/tests/Fixture/MessageHandlerFlow/ExampleMessageHandler.php @@ -5,8 +5,8 @@ namespace Test\Ecotone\OpenTelemetry\Fixture\MessageHandlerFlow; use Ecotone\Messaging\Attribute\InternalHandler; -use Ecotone\Modelling\Attribute\CommandHandler; use Ecotone\Messaging\Message; +use Ecotone\Modelling\Attribute\CommandHandler; final class ExampleMessageHandler { @@ -21,4 +21,4 @@ public function handle(Message $message): void { } -} \ No newline at end of file +} diff --git a/packages/PdoEventSourcing/composer.json b/packages/PdoEventSourcing/composer.json index b9f199a57..f667893e2 100644 --- a/packages/PdoEventSourcing/composer.json +++ b/packages/PdoEventSourcing/composer.json @@ -30,7 +30,7 @@ } }, "require": { - "ecotone/dbal": "~1.218.0", + "ecotone/dbal": "~1.219.0", "prooph/pdo-event-store": "^1.15.1" }, "require-dev": { @@ -49,7 +49,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "pdo-event-sourcing" diff --git a/packages/Redis/composer.json b/packages/Redis/composer.json index 88274c78b..b491ca875 100644 --- a/packages/Redis/composer.json +++ b/packages/Redis/composer.json @@ -35,7 +35,7 @@ } }, "require": { - "ecotone/enqueue": "~1.218.0", + "ecotone/enqueue": "~1.219.0", "enqueue/redis": "^0.10.9" }, "require-dev": { @@ -57,7 +57,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "redis" diff --git a/packages/Sqs/composer.json b/packages/Sqs/composer.json index 869aa8b70..a17e60357 100644 --- a/packages/Sqs/composer.json +++ b/packages/Sqs/composer.json @@ -30,7 +30,7 @@ } }, "require": { - "ecotone/enqueue": "~1.218.0", + "ecotone/enqueue": "~1.219.0", "enqueue/sqs": "^0.10.15", "aws/aws-sdk-php": "<=3.269.5" }, @@ -52,7 +52,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "sqs" diff --git a/packages/Symfony/composer.json b/packages/Symfony/composer.json index c58db0be5..fca1d2077 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.218.0", + "ecotone/ecotone": "~1.219.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.218.0" + "ecotone/dbal": "~1.219.0" }, "config": { "sort-packages": true, @@ -84,7 +84,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "symfony" diff --git a/quickstart-examples/composer.json b/quickstart-examples/composer.json index 7c07dc22a..e047c5370 100644 --- a/quickstart-examples/composer.json +++ b/quickstart-examples/composer.json @@ -65,7 +65,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.218.0-dev" + "dev-main": "1.219.0-dev" }, "ecotone": { "repository": "quickstart-examples"