Skip to content

Commit

Permalink
Release 1.230.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dgafka authored and github-actions[bot] committed Aug 31, 2024
1 parent bc5780d commit f91e310
Show file tree
Hide file tree
Showing 53 changed files with 127 additions and 174 deletions.
4 changes: 2 additions & 2 deletions packages/Amqp/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"require": {
"ext-amqp": "*",
"ecotone/enqueue": "~1.229.1",
"ecotone/enqueue": "~1.230.0",
"enqueue/amqp-ext": "^0.10.18",
"enqueue/dsn": "^0.10.4",
"enqueue/enqueue": "^0.10.0"
Expand All @@ -65,7 +65,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.229.1-dev"
"dev-main": "1.230.0-dev"
},
"ecotone": {
"repository": "amqp"
Expand Down
1 change: 0 additions & 1 deletion packages/Amqp/src/AmqpInboundChannelAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use AMQPChannelException;
use AMQPConnectionException;
use Ecotone\Enqueue\CachedConnectionFactory;
use Ecotone\Enqueue\EnqueueHeader;
use Ecotone\Enqueue\EnqueueInboundChannelAdapter;
use Ecotone\Enqueue\InboundMessageConverter;
use Ecotone\Messaging\Channel\QueueChannel;
Expand Down
1 change: 0 additions & 1 deletion packages/Amqp/src/Transaction/AmqpTransactionModule.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use function array_map;

use Ecotone\Amqp\Configuration\AmqpConfiguration;

use Ecotone\AnnotationFinder\AnnotationFinder;
use Ecotone\Messaging\Attribute\AsynchronousRunningEndpoint;
use Ecotone\Messaging\Attribute\ConsoleCommand;
Expand Down
4 changes: 2 additions & 2 deletions packages/Amqp/tests/Integration/DistributedCommandBusTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function test_distributing_command_to_another_service(): void
{
$userService = $this->bootstrapEcotone('user_service', ['Test\Ecotone\Amqp\Fixture\DistributedCommandBus\Publisher'], [new UserService()]);
$ticketService = $this->bootstrapEcotone('ticket_service', ['Test\Ecotone\Amqp\Fixture\DistributedCommandBus\Receiver'], [new TicketServiceReceiver(),
// 'logger' => new EchoLogger(),
// 'logger' => new EchoLogger(),
]);

$ticketService->run('ticket_service', ExecutionPollingMetadata::createWithTestingSetup(maxExecutionTimeInMilliseconds: 500));
Expand All @@ -48,7 +48,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);
Expand Down
6 changes: 3 additions & 3 deletions packages/Dbal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}
},
"require": {
"ecotone/enqueue": "~1.229.1",
"ecotone/enqueue": "~1.230.0",
"enqueue/dbal": "^0.10.17",
"doctrine/dbal": "^2.12.0|^3.0"
},
Expand All @@ -45,7 +45,7 @@
"doctrine/cache": "^1.0.0",
"doctrine/annotations": "^1.13",
"wikimedia/composer-merge-plugin": "^2.1",
"ecotone/jms-converter": "~1.229.1",
"ecotone/jms-converter": "~1.230.0",
"symfony/expression-language": "^6.0|^7.0"
},
"scripts": {
Expand All @@ -58,7 +58,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "1.229.1-dev"
"dev-main": "1.230.0-dev"
},
"ecotone": {
"repository": "dbal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function transactional(MethodInvocation $methodInvocation, Message $messa
$retryStrategy->runCallbackWithRetries(function () use ($connection) {
try {
$connection->beginTransaction();
}catch (\Exception $exception) {
} catch (Exception $exception) {
$connection->close();
throw $exception;
}
Expand All @@ -102,7 +102,8 @@ public function transactional(MethodInvocation $methodInvocation, Message $messa

try {
$connection->rollBack();
} catch (Exception) {};
} catch (Exception) {
};

continue;
}
Expand Down
3 changes: 1 addition & 2 deletions packages/Dbal/src/Recoverability/DbalDeadLetterHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

use DateTime;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Exception\ConnectionException;
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
use Doctrine\DBAL\Schema\Table;
use Doctrine\DBAL\Types\Types;
Expand Down Expand Up @@ -202,7 +201,7 @@ public function store(Message $message): void
$retryStrategy->runCallbackWithRetries(function () use ($message) {
try {
$this->insertHandledMessage($message->getPayload(), $message->getHeaders()->headers());
}catch (\Exception $exception) {
} catch (\Exception $exception) {
$this->getConnection()->close();

throw $exception;
Expand Down
3 changes: 1 addition & 2 deletions packages/Dbal/tests/DbalMessagingTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ public static function prepareFailingConnection(
array $connectionFailuresOnCommit = [],
array $connectionFailureOnStoreInDeadLetter = [],
array $connectionFailureOnMessageAcknowledge = [],
): ConnectionFactory
{
): ConnectionFactory {
return ManagerRegistryEmulator::create((
new FailingConnection(
self::prepareConnection()->createContext()->getDbalConnection(),
Expand Down
2 changes: 1 addition & 1 deletion packages/Dbal/tests/Fixture/Betting/BetNotificator.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Test\Ecotone\Dbal\Fixture\Betting;
namespace Test\Ecotone\Dbal\Fixture\Betting;

use Ecotone\Messaging\Attribute\Asynchronous;
use Ecotone\Modelling\Attribute\EventHandler;
Expand Down
2 changes: 1 addition & 1 deletion packages/Dbal/tests/Fixture/Betting/BetPlaced.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Test\Ecotone\Dbal\Fixture\Betting;
namespace Test\Ecotone\Dbal\Fixture\Betting;

/**
* licence Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion packages/Dbal/tests/Fixture/Betting/BetService.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Test\Ecotone\Dbal\Fixture\Betting;
namespace Test\Ecotone\Dbal\Fixture\Betting;

use Ecotone\Messaging\Attribute\Asynchronous;
use Ecotone\Messaging\Attribute\Parameter\Header;
Expand Down
2 changes: 1 addition & 1 deletion packages/Dbal/tests/Fixture/Betting/BetStatistics.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Test\Ecotone\Dbal\Fixture\Betting;
namespace Test\Ecotone\Dbal\Fixture\Betting;

use Ecotone\Messaging\Attribute\Asynchronous;
use Ecotone\Modelling\Attribute\EventHandler;
Expand Down
2 changes: 1 addition & 1 deletion packages/Dbal/tests/Fixture/Betting/BetWon.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Test\Ecotone\Dbal\Fixture\Betting;
namespace Test\Ecotone\Dbal\Fixture\Betting;

/**
* licence Apache-2.0
Expand Down
Loading

0 comments on commit f91e310

Please sign in to comment.