Release 1.200.0

ecotoneframework · Oct 23, 2023 · d419ffe · d419ffe
1 parent 24b8a32
commit d419ffe
Show file tree

Hide file tree

Showing 142 changed files with 272 additions and 285 deletions.
diff --git a/packages/Amqp/composer.json b/packages/Amqp/composer.json
@@ -39,7 +39,7 @@
     },
     "require": {
         "ext-amqp": "*",
-        "ecotone/enqueue": "~1.109.2",
+        "ecotone/enqueue": "~1.200.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.109.2-dev"
+            "dev-main": "1.200.0-dev"
         },
         "ecotone": {
             "repository": "amqp"

diff --git a/packages/Amqp/src/AmqpInboundChannelAdapterBuilder.php b/packages/Amqp/src/AmqpInboundChannelAdapterBuilder.php
@@ -8,8 +8,8 @@
 use Ecotone\Enqueue\EnqueueHeader;
 use Ecotone\Enqueue\EnqueueInboundChannelAdapterBuilder;
 use Ecotone\Enqueue\InboundMessageConverter;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Conversion\ConversionService;
 use Ecotone\Messaging\MessageConverter\DefaultHeaderMapper;

diff --git a/packages/Amqp/src/AmqpOutboundChannelAdapterBuilder.php b/packages/Amqp/src/AmqpOutboundChannelAdapterBuilder.php
@@ -7,8 +7,8 @@
 use Ecotone\Enqueue\CachedConnectionFactory;
 use Ecotone\Enqueue\EnqueueOutboundChannelAdapterBuilder;
 use Ecotone\Messaging\Channel\PollableChannel\Serialization\OutboundMessageConverter;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Conversion\ConversionService;
 

diff --git a/packages/Amqp/tests/Configuration/AmqpModuleTest.php b/packages/Amqp/tests/Configuration/AmqpModuleTest.php
@@ -2,31 +2,25 @@
 
 namespace Test\Ecotone\Amqp\Configuration;
 
-use Doctrine\Common\Annotations\AnnotationException;
 use Ecotone\Amqp\AmqpAdmin;
 use Ecotone\Amqp\AmqpBackedMessageChannelBuilder;
 use Ecotone\Amqp\AmqpBinding;
 use Ecotone\Amqp\AmqpExchange;
 use Ecotone\Amqp\AmqpQueue;
 use Ecotone\Amqp\Configuration\AmqpModule;
 use Ecotone\AnnotationFinder\InMemory\InMemoryAnnotationFinder;
-use Ecotone\Messaging\Config\Configuration;
-use Ecotone\Messaging\Config\ConfigurationException;
 use Ecotone\Messaging\Config\ConfiguredMessagingSystem;
 use Ecotone\Messaging\Config\InMemoryModuleMessaging;
 use Ecotone\Messaging\Config\MessagingSystemConfiguration;
-use Ecotone\Messaging\Config\ModuleReferenceSearchService;
 use Ecotone\Messaging\Config\ServiceConfiguration;
 use Ecotone\Messaging\Conversion\ArrayToJson\ArrayToJsonConverterBuilder;
 use Ecotone\Messaging\Conversion\MediaType;
 use Ecotone\Messaging\Handler\InMemoryReferenceSearchService;
 use Ecotone\Messaging\Handler\InterfaceToCallRegistry;
 use Ecotone\Messaging\MessagingException;
 use Ecotone\Messaging\PollableChannel;
-use Ecotone\Messaging\Support\InvalidArgumentException;
 use Ecotone\Messaging\Support\MessageBuilder;
 use Enqueue\AmqpExt\AmqpConnectionFactory;
-use ReflectionException;
 use Test\Ecotone\Amqp\AmqpMessagingTest;
 
 /**

diff --git a/packages/Dbal/composer.json b/packages/Dbal/composer.json
@@ -30,7 +30,7 @@
         }
     },
     "require": {
-        "ecotone/enqueue": "~1.109.2",
+        "ecotone/enqueue": "~1.200.0",
         "enqueue/dbal": "^0.10.17",
         "doctrine/dbal": "^2.12.0|^3.0"
     },
@@ -54,7 +54,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.109.2-dev"
+            "dev-main": "1.200.0-dev"
         },
         "ecotone": {
             "repository": "dbal"

diff --git a/packages/Dbal/src/DbalInboundChannelAdapterBuilder.php b/packages/Dbal/src/DbalInboundChannelAdapterBuilder.php
@@ -6,8 +6,8 @@
 use Ecotone\Enqueue\EnqueueHeader;
 use Ecotone\Enqueue\EnqueueInboundChannelAdapterBuilder;
 use Ecotone\Enqueue\InboundMessageConverter;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Conversion\ConversionService;
 use Ecotone\Messaging\MessageConverter\DefaultHeaderMapper;

diff --git a/packages/Dbal/src/DbalOutboundChannelAdapterBuilder.php b/packages/Dbal/src/DbalOutboundChannelAdapterBuilder.php
@@ -5,8 +5,8 @@
 use Ecotone\Enqueue\CachedConnectionFactory;
 use Ecotone\Enqueue\EnqueueOutboundChannelAdapterBuilder;
 use Ecotone\Messaging\Channel\PollableChannel\Serialization\OutboundMessageConverter;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Conversion\ConversionService;
 use Enqueue\Dbal\DbalConnectionFactory;

diff --git a/packages/Dbal/src/DocumentStore/DbalDocumentStoreBuilder.php b/packages/Dbal/src/DocumentStore/DbalDocumentStoreBuilder.php
@@ -4,9 +4,9 @@
 
 use Ecotone\Dbal\DbalReconnectableConnectionFactory;
 use Ecotone\Enqueue\CachedConnectionFactory;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
 use Ecotone\Messaging\Config\Container\InterfaceToCallReference;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Conversion\ConversionService;
 use Ecotone\Messaging\Handler\InputOutputMessageHandlerBuilder;

diff --git a/packages/Dbal/src/DocumentStore/DocumentStoreAggregateRepositoryBuilder.php b/packages/Dbal/src/DocumentStore/DocumentStoreAggregateRepositoryBuilder.php
@@ -2,8 +2,8 @@
 
 namespace Ecotone\Dbal\DocumentStore;
 
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Modelling\RepositoryBuilder;
 

diff --git a/packages/Dbal/src/ObjectManager/DoctrineORMRepositoryBuilder.php b/packages/Dbal/src/ObjectManager/DoctrineORMRepositoryBuilder.php
@@ -5,8 +5,8 @@
 namespace Ecotone\Dbal\ObjectManager;
 
 use Doctrine\Persistence\ManagerRegistry;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Modelling\RepositoryBuilder;
 use Enqueue\Dbal\ManagerRegistryConnectionFactory;

diff --git a/packages/Dbal/src/Recoverability/DbalDeadLetterBuilder.php b/packages/Dbal/src/Recoverability/DbalDeadLetterBuilder.php
@@ -4,9 +4,9 @@
 
 use Ecotone\Dbal\DbalReconnectableConnectionFactory;
 use Ecotone\Enqueue\CachedConnectionFactory;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
 use Ecotone\Messaging\Config\Container\InterfaceToCallReference;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Conversion\ConversionService;
 use Ecotone\Messaging\Gateway\MessagingEntrypoint;

diff --git a/packages/Ecotone/composer.json b/packages/Ecotone/composer.json
@@ -62,7 +62,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.109.2-dev"
+            "dev-main": "1.200.0-dev"
         },
         "ecotone": {
             "repository": "ecotone"

diff --git a/packages/Ecotone/src/Lite/EcotoneLite.php b/packages/Ecotone/src/Lite/EcotoneLite.php
@@ -179,7 +179,7 @@ private static function prepareConfiguration(ContainerInterface|array $container
             $definitionHolder = unserialize(file_get_contents($messagingSystemCachePath));
         }
 
-        if (!$definitionHolder) {
+        if (! $definitionHolder) {
             $messagingConfiguration = MessagingSystemConfiguration::prepare(
                 $pathToRootCatalog,
                 $configurationVariableService,

diff --git a/packages/Ecotone/src/Lite/InMemoryContainerImplementation.php b/packages/Ecotone/src/Lite/InMemoryContainerImplementation.php
@@ -21,6 +21,8 @@
 use Psr\Log\NullLogger;
 use ReflectionMethod;
 
+use function str_starts_with;
+
 class InMemoryContainerImplementation implements ContainerImplementation
 {
     public const ALIAS_PREFIX = 'ecotone.testing.';
@@ -56,9 +58,9 @@ private function resolveArgument(mixed $argument, ContainerBuilder $builder): mi
             return $this->resolveReference($argument, $builder);
         } else {
             if (is_object($argument) && ! ($argument instanceof DefinedObject)) {
-                if (! \str_starts_with(get_class($argument), 'Test\\')) {
+                if (! str_starts_with(get_class($argument), 'Test\\')) {
                     // We accept only not-dumpable instances from the 'Test\' namespace
-                    throw new InvalidArgumentException("Argument is not a self defined object: " . get_class($argument));
+                    throw new InvalidArgumentException('Argument is not a self defined object: ' . get_class($argument));
                 }
             }
             return $argument;

diff --git a/packages/Ecotone/src/Lite/LazyInMemoryContainer.php b/packages/Ecotone/src/Lite/LazyInMemoryContainer.php
@@ -103,4 +103,4 @@ private function resolveReference(Reference $reference): mixed
         }
         throw new InvalidArgumentException("Reference {$id} was not found in definitions");
     }
-}
+}
diff --git a/packages/Ecotone/src/Lite/Test/Configuration/InMemoryRepositoryBuilder.php b/packages/Ecotone/src/Lite/Test/Configuration/InMemoryRepositoryBuilder.php
@@ -4,8 +4,8 @@
 
 namespace Ecotone\Lite\Test\Configuration;
 
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Modelling\InMemoryEventSourcedRepository;
 use Ecotone\Modelling\InMemoryStandardRepository;
 use Ecotone\Modelling\RepositoryBuilder;

diff --git a/packages/Ecotone/src/Lite/Test/Configuration/SerializationChannelAdapterBuilder.php b/packages/Ecotone/src/Lite/Test/Configuration/SerializationChannelAdapterBuilder.php
@@ -5,8 +5,8 @@
 namespace Ecotone\Lite\Test\Configuration;
 
 use Ecotone\Messaging\Channel\ChannelInterceptorBuilder;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Conversion\ConversionService;
 use Ecotone\Messaging\Conversion\MediaType;

diff --git a/packages/Ecotone/src/Lite/Test/Configuration/SpiedChannelAdapterBuilder.php b/packages/Ecotone/src/Lite/Test/Configuration/SpiedChannelAdapterBuilder.php
@@ -5,11 +5,10 @@
 namespace Ecotone\Lite\Test\Configuration;
 
 use Ecotone\Messaging\Channel\ChannelInterceptorBuilder;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Precedence;
-use InvalidArgumentException;
 
 final class SpiedChannelAdapterBuilder implements ChannelInterceptorBuilder
 {

diff --git a/...ges/Ecotone/src/Messaging/Channel/Collector/Config/CollectorChannelInterceptorBuilder.php b/...ges/Ecotone/src/Messaging/Channel/Collector/Config/CollectorChannelInterceptorBuilder.php
@@ -6,8 +6,8 @@
 
 use Ecotone\Messaging\Channel\ChannelInterceptorBuilder;
 use Ecotone\Messaging\Channel\Collector\MessageCollectorChannelInterceptor;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Handler\Logger\LoggingHandlerBuilder;
 use Ecotone\Messaging\PrecedenceChannelInterceptor;

diff --git a/packages/Ecotone/src/Messaging/Channel/ExceptionalQueueChannel.php b/packages/Ecotone/src/Messaging/Channel/ExceptionalQueueChannel.php
@@ -4,9 +4,9 @@
 
 namespace Ecotone\Messaging\Channel;
 
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\DefinedObject;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Conversion\MediaType;
 use Ecotone\Messaging\Endpoint\PollingConsumer\ConnectionException;
 use Ecotone\Messaging\Message;

diff --git a/...Messaging/Channel/PollableChannel/InMemory/InMemoryQueueAcknowledgeInterceptorBuilder.php b/...Messaging/Channel/PollableChannel/InMemory/InMemoryQueueAcknowledgeInterceptorBuilder.php
@@ -5,8 +5,8 @@
 namespace Ecotone\Messaging\Channel\PollableChannel\InMemory;
 
 use Ecotone\Messaging\Channel\ChannelInterceptorBuilder;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\PrecedenceChannelInterceptor;
 
 final class InMemoryQueueAcknowledgeInterceptorBuilder implements ChannelInterceptorBuilder

diff --git a/...ne/src/Messaging/Channel/PollableChannel/SendRetries/RetriesChannelInterceptorBuilder.php b/...ne/src/Messaging/Channel/PollableChannel/SendRetries/RetriesChannelInterceptorBuilder.php
@@ -6,8 +6,8 @@
 
 use Ecotone\Messaging\Channel\ChannelInterceptorBuilder;
 use Ecotone\Messaging\Config\ConfiguredMessagingSystem;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Handler\Recoverability\RetryTemplate;
 use Ecotone\Messaging\PrecedenceChannelInterceptor;

diff --git a/...c/Messaging/Channel/PollableChannel/Serialization/OutboundSerializationChannelBuilder.php b/...c/Messaging/Channel/PollableChannel/Serialization/OutboundSerializationChannelBuilder.php
@@ -5,8 +5,8 @@
 namespace Ecotone\Messaging\Channel\PollableChannel\Serialization;
 
 use Ecotone\Messaging\Channel\ChannelInterceptorBuilder;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Reference;
 use Ecotone\Messaging\Conversion\ConversionService;
 use Ecotone\Messaging\Conversion\MediaType;

diff --git a/packages/Ecotone/src/Messaging/Channel/SimpleMessageChannelBuilder.php b/packages/Ecotone/src/Messaging/Channel/SimpleMessageChannelBuilder.php
@@ -4,8 +4,8 @@
 
 namespace Ecotone\Messaging\Channel;
 
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\DefinedObjectWrapper;
 use Ecotone\Messaging\Conversion\MediaType;
 use Ecotone\Messaging\MessageChannel;

diff --git a/...ages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/BasicMessagingModule.php b/...ages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/BasicMessagingModule.php
@@ -13,7 +13,6 @@
 use Ecotone\Messaging\Config\Container\Definition;
 use Ecotone\Messaging\Config\ModulePackageList;
 use Ecotone\Messaging\Config\ModuleReferenceSearchService;
-use Ecotone\Messaging\Config\RequiredReference;
 use Ecotone\Messaging\Conversion\ObjectToSerialized\SerializingConverterBuilder;
 use Ecotone\Messaging\Conversion\SerializedToObject\DeserializingConverterBuilder;
 use Ecotone\Messaging\Conversion\StringToUuid\StringToUuidConverterBuilder;

diff --git a/packages/Ecotone/src/Messaging/Config/BeforeSend/BeforeSendChannelInterceptorBuilder.php b/packages/Ecotone/src/Messaging/Config/BeforeSend/BeforeSendChannelInterceptorBuilder.php
@@ -7,8 +7,8 @@
 use Ecotone\Messaging\Channel\ChannelInterceptorBuilder;
 use Ecotone\Messaging\Channel\DirectChannel;
 use Ecotone\Messaging\Config\Container\ChannelReference;
-use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Config\Container\Definition;
+use Ecotone\Messaging\Config\Container\MessagingContainerBuilder;
 use Ecotone\Messaging\Handler\Gateway\GatewayProxyBuilder;
 use Ecotone\Messaging\Handler\Processor\MethodInvoker\MethodInterceptor;
 use Ramsey\Uuid\Uuid;

diff --git a/packages/Ecotone/src/Messaging/Config/Container/Compiler/ContainerDefinitionsHolder.php b/packages/Ecotone/src/Messaging/Config/Container/Compiler/ContainerDefinitionsHolder.php
@@ -12,7 +12,8 @@ class ContainerDefinitionsHolder implements ContainerImplementation
     /**
      * @param ConsoleCommandConfiguration[] $registeredCommands
      */
-    public function __construct(private array $registeredCommands) {
+    public function __construct(private array $registeredCommands)
+    {
 
     }
 
@@ -33,4 +34,4 @@ public function getRegisteredCommands(): array
     {
         return $this->registeredCommands;
     }
-}
+}
diff --git a/packages/Ecotone/src/Messaging/Config/Container/ConsoleCommandReference.php b/packages/Ecotone/src/Messaging/Config/Container/ConsoleCommandReference.php
@@ -8,4 +8,4 @@ public function __construct(private string $commandName)
     {
         parent::__construct("console.$commandName");
     }
-}
+}
diff --git a/packages/Ecotone/src/Messaging/Config/Container/ContainerConfig.php b/packages/Ecotone/src/Messaging/Config/Container/ContainerConfig.php
@@ -20,8 +20,7 @@ public static function buildMessagingSystemInMemoryContainer(
         ?ContainerInterface $externalContainer = null,
         ?ConfigurationVariableService $configurationVariableService = null,
         ?ProxyFactory $proxyFactory = null,
-    ): ConfiguredMessagingSystem
-    {
+    ): ConfiguredMessagingSystem {
         $containerBuilder = new ContainerBuilder();
         $containerBuilder->addCompilerPass($configuration);
         $containerBuilder->addCompilerPass(new RegisterInterfaceToCallReferences());
@@ -34,8 +33,7 @@ public static function buildMessagingSystemInMemoryContainer(
 
     public static function buildDefinitionHolder(
         Configuration $configuration,
-    ): ContainerDefinitionsHolder
-    {
+    ): ContainerDefinitionsHolder {
         $definitionHolder = new ContainerDefinitionsHolder($configuration->getRegisteredConsoleCommands());
         $ecotoneBuilder = new ContainerBuilder();
         $ecotoneBuilder->addCompilerPass($configuration);

diff --git a/packages/Ecotone/src/Messaging/Config/Container/Definition.php b/packages/Ecotone/src/Messaging/Config/Container/Definition.php
@@ -53,4 +53,4 @@ public function getMethodCalls(): array
     {
         return $this->methodCalls;
     }
-}
+}
diff --git a/packages/Ecotone/src/Messaging/Config/Container/DefinitionHelper.php b/packages/Ecotone/src/Messaging/Config/Container/DefinitionHelper.php
@@ -3,6 +3,7 @@
 namespace Ecotone\Messaging\Config\Container;
 
 use function get_class;
+use function is_object;
 use function serialize;
 
 /**
@@ -42,7 +43,7 @@ private static function isComplexArgument(mixed $attributeArguments): bool
                     return true;
                 }
             }
-        } else if (\is_object($attributeArguments)) {
+        } elseif (is_object($attributeArguments)) {
             return true;
         }
         return false;

diff --git a/packages/Ecotone/src/Messaging/Config/Container/GatewayProxyMethodReference.php b/packages/Ecotone/src/Messaging/Config/Container/GatewayProxyMethodReference.php
@@ -8,4 +8,4 @@ public function __construct(GatewayProxyReference $gatewayProxyReference, string
     {
         parent::__construct("gateway.{$gatewayProxyReference->getReferenceName()}::{$methodName}");
     }
-}
+}