Release 1.229.0

ecotoneframework · Aug 27, 2024 · a7c3e73 · a7c3e73
1 parent 3da6eb1
commit a7c3e73
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 49 deletions.
diff --git a/packages/Amqp/composer.json b/packages/Amqp/composer.json
@@ -42,7 +42,7 @@
     },
     "require": {
         "ext-amqp": "*",
-        "ecotone/enqueue": "~1.228.1",
+        "ecotone/enqueue": "~1.229.0",
         "enqueue/amqp-ext": "^0.10.18",
         "enqueue/dsn": "^0.10.4",
         "enqueue/enqueue": "^0.10.0"
@@ -65,7 +65,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "amqp"

diff --git a/packages/Amqp/src/AmqpAcknowledgeCallbackWraper.php b/packages/Amqp/src/AmqpAcknowledgeCallbackWraper.php
@@ -6,9 +6,9 @@
 
 use Ecotone\Enqueue\CachedConnectionFactory;
 use Ecotone\Enqueue\EnqueueAcknowledgementCallback;
-use Ecotone\Enqueue\ReconnectableConnectionFactory;
 use Ecotone\Messaging\Endpoint\AcknowledgementCallback;
 use Ecotone\Messaging\Handler\Logger\LoggingGateway;
+use Exception;
 
 final class AmqpAcknowledgeCallbackWraper implements AcknowledgementCallback
 {
@@ -31,8 +31,8 @@ public function accept(): void
     {
         try {
             $this->acknowledgementCallback->accept();
-        }catch (\Exception $exception) {
-            $this->loggingGateway->info("Failed to acknowledge message, disconnecting AMQP Connection in order to self-heal. Failure happen due to: " . $exception->getMessage(), exception: $exception);
+        } catch (Exception $exception) {
+            $this->loggingGateway->info('Failed to acknowledge message, disconnecting AMQP Connection in order to self-heal. Failure happen due to: ' . $exception->getMessage(), exception: $exception);
 
             $this->connectionFactory->reconnect();
         }
@@ -42,8 +42,8 @@ public function reject(): void
     {
         try {
             $this->acknowledgementCallback->reject();
-        }catch (\Exception $exception) {
-            $this->loggingGateway->info("Failed to reject message, disconnecting AMQP Connection in order to self-heal. Failure happen due to: " . $exception->getMessage(), exception: $exception);
+        } catch (Exception $exception) {
+            $this->loggingGateway->info('Failed to reject message, disconnecting AMQP Connection in order to self-heal. Failure happen due to: ' . $exception->getMessage(), exception: $exception);
 
             $this->connectionFactory->reconnect();
         }
@@ -53,10 +53,10 @@ public function requeue(): void
     {
         try {
             $this->acknowledgementCallback->requeue();
-        }catch (\Exception $exception) {
-            $this->loggingGateway->info("Failed to requeue message, disconnecting AMQP Connection in order to self-heal. Failure happen due to: " . $exception->getMessage(), exception: $exception);
+        } catch (Exception $exception) {
+            $this->loggingGateway->info('Failed to requeue message, disconnecting AMQP Connection in order to self-heal. Failure happen due to: ' . $exception->getMessage(), exception: $exception);
 
             $this->connectionFactory->reconnect();
         }
     }
-}
+}
diff --git a/packages/Amqp/src/AmqpInboundChannelAdapter.php b/packages/Amqp/src/AmqpInboundChannelAdapter.php
@@ -4,6 +4,7 @@
 
 namespace Ecotone\Amqp;
 
+use AMQPChannelException;
 use AMQPConnectionException;
 use Ecotone\Enqueue\CachedConnectionFactory;
 use Ecotone\Enqueue\EnqueueHeader;
@@ -15,7 +16,6 @@
 use Ecotone\Messaging\Endpoint\PollingConsumer\ConnectionException;
 use Ecotone\Messaging\Handler\Logger\LoggingGateway;
 use Ecotone\Messaging\Message;
-use Ecotone\Messaging\MessageHeaders;
 use Ecotone\Messaging\Support\MessageBuilder;
 use Interop\Amqp\AmqpMessage;
 use Interop\Queue\Consumer;
@@ -103,7 +103,7 @@ public function receiveWithTimeout(int $timeout = 0): ?Message
             $subscriptionConsumer->consume($timeout ?: $this->receiveTimeoutInMilliseconds);
 
             return $this->queueChannel->receive();
-        } catch (AMQPConnectionException|\AMQPChannelException $exception) {
+        } catch (AMQPConnectionException|AMQPChannelException $exception) {
             $this->connectionFactory->reconnect();
             throw new ConnectionException('Failed to connect to AMQP broker', 0, $exception);
         }

diff --git a/packages/Amqp/src/AmqpReconnectableConnectionFactory.php b/packages/Amqp/src/AmqpReconnectableConnectionFactory.php
@@ -8,6 +8,7 @@
 use Enqueue\AmqpExt\AmqpConnectionFactory;
 use Enqueue\AmqpExt\AmqpConsumer;
 use Enqueue\AmqpExt\AmqpContext;
+use Exception;
 use Interop\Queue\ConnectionFactory;
 use Interop\Queue\Context;
 use Interop\Queue\SubscriptionConsumer;
@@ -72,7 +73,8 @@ public function reconnect(): void
         if ($this->subscriptionConsumer) {
             try {
                 $this->subscriptionConsumer->unsubscribeAll();
-            }catch (\Exception) {}
+            } catch (Exception) {
+            }
         }
         /** @var AMQPConnection $connection */
         $connection = $connectionProperty->getValue($this->connectionFactory);

diff --git a/packages/Amqp/tests/Fixture/DistributedCommandBus/Receiver/Event/TicketCreated.php b/packages/Amqp/tests/Fixture/DistributedCommandBus/Receiver/Event/TicketCreated.php
@@ -14,4 +14,4 @@ public function getTicket(): string
     {
         return $this->ticket;
     }
-}
+}
diff --git a/packages/Amqp/tests/Fixture/DistributedCommandBus/Receiver/TicketServiceReceiver.php b/packages/Amqp/tests/Fixture/DistributedCommandBus/Receiver/TicketServiceReceiver.php
@@ -2,11 +2,8 @@
 
 namespace Test\Ecotone\Amqp\Fixture\DistributedCommandBus\Receiver;
 
-use Ecotone\Messaging\Attribute\Asynchronous;
-use Ecotone\Messaging\Attribute\Parameter\Header;
 use Ecotone\Modelling\Attribute\CommandHandler;
 use Ecotone\Modelling\Attribute\Distributed;
-use Ecotone\Modelling\Attribute\EventHandler;
 use Ecotone\Modelling\Attribute\QueryHandler;
 use Ecotone\Modelling\EventBus;
 use Test\Ecotone\Amqp\Fixture\DistributedCommandBus\Receiver\Event\TicketCreated;

diff --git a/...mqp/tests/Fixture/DistributedCommandBus/ReceiverEventHandler/TicketNotificationConfig.php b/...mqp/tests/Fixture/DistributedCommandBus/ReceiverEventHandler/TicketNotificationConfig.php
@@ -14,4 +14,4 @@ public function channel()
     {
         return AmqpBackedMessageChannelBuilder::create('async');
     }
-}
+}
diff --git a/...sts/Fixture/DistributedCommandBus/ReceiverEventHandler/TicketNotificationEventHandler.php b/...sts/Fixture/DistributedCommandBus/ReceiverEventHandler/TicketNotificationEventHandler.php
@@ -37,4 +37,4 @@ public function getTicketsNotifications(): int
     {
         return count($this->ticketNotifications);
     }
-}
+}
diff --git a/packages/Amqp/tests/Integration/DistributedCommandBusTest.php b/packages/Amqp/tests/Integration/DistributedCommandBusTest.php
@@ -46,7 +46,7 @@ public function test_distributing_command_misses_heartbeat_and_reconnects(): voi
         $executionPollingMetadata = ExecutionPollingMetadata::createWithDefaults()->withExecutionTimeLimitInMilliseconds(10000)->withStopOnError(false);
         $userService = $this->bootstrapEcotone('user_service', ['Test\Ecotone\Amqp\Fixture\DistributedCommandBus\Publisher'], [new UserService()], amqpConfig: ['heartbeat' => 1]);
         $ticketService = $this->bootstrapEcotone('ticket_service', ['Test\Ecotone\Amqp\Fixture\DistributedCommandBus\Receiver', 'Test\Ecotone\Amqp\Fixture\DistributedCommandBus\ReceiverEventHandler'], [new TicketServiceReceiver([0, 6, 0]), new TicketNotificationEventHandler([0, 6, 0]),
-            "logger" => new EchoLogger()
+            'logger' => new EchoLogger(),
         ], amqpConfig: ['heartbeat' => 1]);
 
         $ticketService->run('ticket_service', $executionPollingMetadata);

diff --git a/packages/Amqp/tests/Integration/DistributedEventBusTest.php b/packages/Amqp/tests/Integration/DistributedEventBusTest.php
@@ -10,7 +10,6 @@
 use Ecotone\Messaging\Channel\PollableChannel\GlobalPollableChannelConfiguration;
 use Ecotone\Messaging\Config\ModulePackageList;
 use Ecotone\Messaging\Config\ServiceConfiguration;
-use Ecotone\Messaging\Endpoint\ExecutionPollingMetadata;
 use Enqueue\AmqpExt\AmqpConnectionFactory;
 use Test\Ecotone\Amqp\AmqpMessagingTest;
 use Test\Ecotone\Amqp\Fixture\DistributedEventBus\AsynchronousEventHandler\TicketNotificationSubscriber;
@@ -67,7 +66,7 @@ public function test_distributing_event_and_publish_async_without_amqp_transacti
     {
         $userService = $this->bootstrapEcotone('user_service', ['Test\Ecotone\Amqp\Fixture\DistributedEventBus\Publisher'], [new UserService()], extensionObjects: [
             GlobalPollableChannelConfiguration::createWithDefaults()
-                ->withCollector(false)
+                ->withCollector(false),
         ]);
         $ticketService = $this->bootstrapEcotone(
             'ticket_service',

diff --git a/packages/Dbal/composer.json b/packages/Dbal/composer.json
@@ -33,7 +33,7 @@
         }
     },
     "require": {
-        "ecotone/enqueue": "~1.228.1",
+        "ecotone/enqueue": "~1.229.0",
         "enqueue/dbal": "^0.10.17",
         "doctrine/dbal": "^2.12.0|^3.0"
     },
@@ -45,7 +45,7 @@
         "doctrine/cache": "^1.0.0",
         "doctrine/annotations": "^1.13",
         "wikimedia/composer-merge-plugin": "^2.1",
-        "ecotone/jms-converter": "~1.228.1",
+        "ecotone/jms-converter": "~1.229.0",
         "symfony/expression-language": "^6.0|^7.0"
     },
     "scripts": {
@@ -58,7 +58,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "dbal"

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

diff --git a/packages/Enqueue/composer.json b/packages/Enqueue/composer.json
@@ -33,7 +33,7 @@
         }
     },
     "require": {
-        "ecotone/ecotone": "~1.228.1",
+        "ecotone/ecotone": "~1.229.0",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/dsn": "^0.10.4"
     },
@@ -56,7 +56,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "enqueue"

diff --git a/packages/Enqueue/src/EnqueueInboundChannelAdapter.php b/packages/Enqueue/src/EnqueueInboundChannelAdapter.php
@@ -70,7 +70,8 @@ public function receiveWithTimeout(int $timeoutInMilliseconds = 0): ?Message
             if ($this->isConnectionException($exception) || ($exception->getPrevious() && $this->isConnectionException($exception->getPrevious()))) {
                 try {
                     $this->connectionFactory->reconnect();
-                }catch (\Exception) {}
+                } catch (Exception) {
+                }
 
                 throw new ConnectionException('There was a problem while polling message channel', 0, $exception);
             }

diff --git a/packages/JmsConverter/composer.json b/packages/JmsConverter/composer.json
@@ -38,7 +38,7 @@
         }
     },
     "require": {
-        "ecotone/ecotone": "~1.228.1",
+        "ecotone/ecotone": "~1.229.0",
         "jms/serializer": "^3.17",
         "symfony/cache": "^5.4|^6.1|^7.0"
     },
@@ -60,7 +60,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "jms-converter"

diff --git a/packages/Laravel/composer.json b/packages/Laravel/composer.json
@@ -37,7 +37,7 @@
         }
     },
     "require": {
-        "ecotone/ecotone": "~1.228.1",
+        "ecotone/ecotone": "~1.229.0",
         "laravel/framework": "^9.5.2|^10.0|^11.0"
     },
     "require-dev": {
@@ -50,7 +50,7 @@
         "symfony/expression-language": "^6.0|^7.0",
         "nesbot/carbon": "^2.71",
         "moneyphp/money": "^4.1.0",
-        "ecotone/dbal": "~1.228.1"
+        "ecotone/dbal": "~1.229.0"
     },
     "extra": {
         "laravel": {
@@ -59,7 +59,7 @@
             ]
         },
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "laravel"

diff --git a/packages/LiteApplication/composer.json b/packages/LiteApplication/composer.json
@@ -36,8 +36,8 @@
         }
     },
     "require": {
-        "ecotone/ecotone": "~1.228.1",
-        "ecotone/jms-converter": "~1.228.1",
+        "ecotone/ecotone": "~1.229.0",
+        "ecotone/jms-converter": "~1.229.0",
         "php-di/php-di": "^7.0.1"
     },
     "require-dev": {
@@ -50,7 +50,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "lite-application"

diff --git a/packages/OpenTelemetry/composer.json b/packages/OpenTelemetry/composer.json
@@ -34,7 +34,7 @@
         }
     },
     "require": {
-        "ecotone/ecotone": "~1.228.1",
+        "ecotone/ecotone": "~1.229.0",
         "open-telemetry/sdk": "^1.0.0"
     },
     "require-dev": {
@@ -64,7 +64,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "open-telemetry"

diff --git a/packages/PdoEventSourcing/composer.json b/packages/PdoEventSourcing/composer.json
@@ -33,7 +33,7 @@
         }
     },
     "require": {
-        "ecotone/dbal": "~1.228.1",
+        "ecotone/dbal": "~1.229.0",
         "prooph/pdo-event-store": "^1.15.1"
     },
     "require-dev": {
@@ -51,7 +51,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "pdo-event-sourcing"

diff --git a/packages/Redis/composer.json b/packages/Redis/composer.json
@@ -38,7 +38,7 @@
         }
     },
     "require": {
-        "ecotone/enqueue": "~1.228.1",
+        "ecotone/enqueue": "~1.229.0",
         "enqueue/redis": "^0.10.9"
     },
     "require-dev": {
@@ -60,7 +60,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "redis"

diff --git a/packages/Sqs/composer.json b/packages/Sqs/composer.json
@@ -33,7 +33,7 @@
         }
     },
     "require": {
-        "ecotone/enqueue": "~1.228.1",
+        "ecotone/enqueue": "~1.229.0",
         "enqueue/sqs": "^0.10.15",
         "aws/aws-sdk-php": "<=3.269.5"
     },
@@ -58,7 +58,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "sqs"

diff --git a/packages/Symfony/composer.json b/packages/Symfony/composer.json
@@ -27,7 +27,7 @@
     ],
     "description": "Extends Ecotone with Symfony integration",
     "require": {
-        "ecotone/ecotone": "~1.228.1",
+        "ecotone/ecotone": "~1.229.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",
         "symfony/framework-bundle": "^5.4|^6.0|^7.0"
@@ -45,7 +45,7 @@
         "symfony/expression-language": "^6.0|^7.0",
         "symfony/messenger": "^5.4|^6.0|^7.0",
         "wikimedia/composer-merge-plugin": "^2.1",
-        "ecotone/dbal": "~1.228.1"
+        "ecotone/dbal": "~1.229.0"
     },
     "conflict": {
         "symfony/proxy-manager-bridge": "<5.4.0"
@@ -89,7 +89,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.228.1-dev"
+            "dev-main": "1.229.0-dev"
         },
         "ecotone": {
             "repository": "symfony"