Release 1.219.0

ecotoneframework · Apr 15, 2024 · bf199ec · bf199ec
1 parent 0d94abe
commit bf199ec
Show file tree

Hide file tree

Showing 39 changed files with 82 additions and 95 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,
         );
     }
-}
+}
diff --git 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/...ages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/BasicMessagingModule.php b/...ages/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/...ging/Config/Annotation/ModuleConfiguration/EndpointHeaders/EndpointHeadersInterceptor.php b/...ging/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/...onfig/Annotation/ModuleConfiguration/EndpointHeaders/EndpointHeadersInterceptorModule.php b/...onfig/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/...es/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/ServiceActivatorModule.php b/...es/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
@@ -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
@@ -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
@@ -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,
             ]
         );
     }
-}
+}
diff --git 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
@@ -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
@@ -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
     {
 
     }
-}
+}
diff --git a/.../MessageEndpoint/ServiceActivator/MessageHandler/ExampleMessageHandlerChangingHeaders.php b/.../MessageEndpoint/ServiceActivator/MessageHandler/ExampleMessageHandlerChangingHeaders.php
@@ -12,4 +12,4 @@
     public function test(): void
     {
     }
-}
+}
diff --git a/...s/Messaging/Unit/Config/Annotation/ModuleConfiguration/EndpointHeadersInterceptorTest.php b/...s/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/...tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTest.php b/...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
@@ -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;
     }
-}
+}
diff --git 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
     ) {
     }
-}
+}
diff --git 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
     ) {
     }
-}
+}
diff --git 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
     ) {
     }
-}
+}
diff --git 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);
     }
-}
+}
diff --git 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;
     }
-}
+}