Release 1.210.0

ecotoneframework · Jan 13, 2024 · 571d9ad · 571d9ad
1 parent a64097e
commit 571d9ad
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 58 deletions.
diff --git a/packages/Amqp/composer.json b/packages/Amqp/composer.json
@@ -39,7 +39,7 @@
  },
  "require": {
  "ext-amqp": "*",
- "ecotone/enqueue": "~1.209.1",
+ "ecotone/enqueue": "~1.210.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.209.1-dev"
+ "dev-main": "1.210.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.209.1",
+ "ecotone/enqueue": "~1.210.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.209.1",
+ "ecotone/jms-converter": "~1.210.0",
  "symfony/expression-language": "^6.0|^7.0"
  },
  "scripts": {
@@ -56,7 +56,7 @@
  },
  "extra": {
  "branch-alias": {
- "dev-main": "1.209.1-dev"
+ "dev-main": "1.210.0-dev"
  },
  "ecotone": {
  "repository": "dbal"

diff --git a/packages/Dbal/src/DbaBusinessMethod/DbalBusinessMethodHandler.php b/packages/Dbal/src/DbaBusinessMethod/DbalBusinessMethodHandler.php
@@ -4,6 +4,7 @@
 
 namespace Ecotone\Dbal\DbaBusinessMethod;
 
+use DateTimeInterface;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\ParameterType;
 use Ecotone\Dbal\Attribute\DbalParameter;
@@ -194,10 +195,10 @@ private function getParameterValueWithDefaultConversion(mixed $parameterValue):
  {
  $type = TypeDescriptor::createFromVariable($parameterValue);
  if ($type->isClassOrInterface() && $this->conversionService->canConvert(
-  $type,
-  MediaType::createApplicationXPHP(),
-  UnionTypeDescriptor::createWith([TypeDescriptor::createStringType(), TypeDescriptor::createIntegerType()]),
-  MediaType::createApplicationXPHP()
+ $type,
+ MediaType::createApplicationXPHP(),
+ UnionTypeDescriptor::createWith([TypeDescriptor::createStringType(), TypeDescriptor::createIntegerType()]),
+ MediaType::createApplicationXPHP()
  )) {
  return $this->conversionService->convert(
  $parameterValue,
@@ -208,7 +209,7 @@ private function getParameterValueWithDefaultConversion(mixed $parameterValue):
  );
  }
 
- if ($parameterValue instanceof \DateTimeInterface) {
+ if ($parameterValue instanceof DateTimeInterface) {
  return $parameterValue->format('Y-m-d H:i:s.u');
  }
 

diff --git a/packages/Dbal/tests/Fixture/DbalBusinessInterface/ActivityService.php b/packages/Dbal/tests/Fixture/DbalBusinessInterface/ActivityService.php
@@ -4,14 +4,15 @@
 
 namespace Test\Ecotone\Dbal\Fixture\DbalBusinessInterface;
 
+use DateTimeImmutable;
 use Ecotone\Dbal\Attribute\DbalQuery;
 use Ecotone\Dbal\Attribute\DbalWrite;
 use Ecotone\Dbal\DbaBusinessMethod\FetchMode;
 
 interface ActivityService
 {
  #[DbalWrite('INSERT INTO activities VALUES (:personId, :activity, :time)')]
- public function add(string $personId, string $activity, \DateTimeImmutable $time): void;
+ public function add(string $personId, string $activity, DateTimeImmutable $time): void;
 
  /**
  * @return string[]
@@ -20,7 +21,7 @@ public function add(string $personId, string $activity, \DateTimeImmutable $time
  'SELECT person_id FROM activities WHERE type = :activity AND occurred_at >= :atOrAfter',
  fetchMode: FetchMode::FIRST_COLUMN
  )]
- public function findAfterOrAt(string $activity, \DateTimeImmutable $atOrAfter): array;
+ public function findAfterOrAt(string $activity, DateTimeImmutable $atOrAfter): array;
 
  /**
  * @return string[]
@@ -29,8 +30,8 @@ public function findAfterOrAt(string $activity, \DateTimeImmutable $atOrAfter):
  'SELECT person_id FROM activities WHERE type = :activity AND occurred_at < :atOrAfter',
  fetchMode: FetchMode::FIRST_COLUMN
  )]
- public function findBefore(string $activity, \DateTimeImmutable $atOrAfter): array;
+ public function findBefore(string $activity, DateTimeImmutable $atOrAfter): array;
 
  #[DbalWrite('INSERT INTO activities VALUES (:personId, :activity, :time)')]
- public function store(PersonId $personId, string $activity, \DateTimeImmutable $time): void;
-}
+ public function store(PersonId $personId, string $activity, DateTimeImmutable $time): void;
+}
diff --git a/packages/Dbal/tests/Fixture/DbalBusinessInterface/DateTimeToDayStringConverter.php b/packages/Dbal/tests/Fixture/DbalBusinessInterface/DateTimeToDayStringConverter.php
@@ -4,13 +4,14 @@
 
 namespace Test\Ecotone\Dbal\Fixture\DbalBusinessInterface;
 
+use DateTimeInterface;
 use Ecotone\Messaging\Attribute\Converter;
 
 final class DateTimeToDayStringConverter
 {
  #[Converter]
- public function to(\DateTimeInterface $dateTime): string
+ public function to(DateTimeInterface $dateTime): string
  {
  return $dateTime->format('Y-m-d');
  }
-}
+}
diff --git a/packages/Dbal/tests/Fixture/DbalBusinessInterface/PersonId.php b/packages/Dbal/tests/Fixture/DbalBusinessInterface/PersonId.php
@@ -8,11 +8,11 @@ final class PersonId
 {
  public function __construct(private string $id)
  {
- 
+
  }
 
  public function __toString(): string
  {
  return $this->id;
  }
-}
+}
diff --git a/packages/Dbal/tests/Integration/DbalBusinessMethod/DbalQueryBusinessMethodTest.php b/packages/Dbal/tests/Integration/DbalBusinessMethod/DbalQueryBusinessMethodTest.php
@@ -10,6 +10,9 @@
 use Ecotone\Messaging\Config\ModulePackageList;
 use Ecotone\Messaging\Config\ServiceConfiguration;
 use Enqueue\Dbal\DbalConnectionFactory;
+
+use function json_decode;
+
 use Test\Ecotone\Dbal\DbalMessagingTestCase;
 use Test\Ecotone\Dbal\Fixture\DbalBusinessInterface\DateTimeToDayStringConverter;
 use Test\Ecotone\Dbal\Fixture\DbalBusinessInterface\PersonNameDTO;
@@ -136,8 +139,8 @@ public function test_fetching_to_specific_format()
 
  $personQueryGateway = $ecotoneLite->getGateway(PersonQueryApi::class);
  $this->assertEquals(
- \json_decode('{"person_id":1,"name":"John"}', true),
- \json_decode($personQueryGateway->getNameDTOInJson(1), true)
+ json_decode('{"person_id":1,"name":"John"}', true),
+ json_decode($personQueryGateway->getNameDTOInJson(1), true)
  );
  }
 

diff --git a/packages/Dbal/tests/Integration/DbalBusinessMethod/InbuiltConvertersTest.php b/packages/Dbal/tests/Integration/DbalBusinessMethod/InbuiltConvertersTest.php
@@ -4,7 +4,7 @@
 
 namespace Integration\DbalBusinessMethod;
 
-use Ecotone\Dbal\Configuration\DbalConfiguration;
+use DateTimeImmutable;
 use Ecotone\Dbal\DbalConnection;
 use Ecotone\Lite\EcotoneLite;
 use Ecotone\Lite\Test\FlowTestSupport;
@@ -14,12 +14,7 @@
 use Test\Ecotone\Dbal\DbalMessagingTestCase;
 use Test\Ecotone\Dbal\Fixture\DbalBusinessInterface\ActivityService;
 use Test\Ecotone\Dbal\Fixture\DbalBusinessInterface\DateTimeToDayStringConverter;
-use Test\Ecotone\Dbal\Fixture\DbalBusinessInterface\ParameterDbalTypeConversion;
 use Test\Ecotone\Dbal\Fixture\DbalBusinessInterface\PersonId;
-use Test\Ecotone\Dbal\Fixture\DbalBusinessInterface\PersonNameDTOConverter;
-use Test\Ecotone\Dbal\Fixture\DbalBusinessInterface\PersonRoleConverter;
-use Test\Ecotone\Dbal\Fixture\DbalBusinessInterface\PersonService;
-use Test\Ecotone\Dbal\Fixture\ORM\Person\Person;
 
 /**
  * @internal
@@ -31,39 +26,39 @@ public function test_using_date_time_parameter_default_conversion()
  $ecotoneLite = $this->bootstrapEcotone();
  /** @var ActivityService $activityGateway */
  $activityGateway = $ecotoneLite->getGateway(ActivityService::class);
- $activityGateway->add('1', 'registered_at', new \DateTimeImmutable('2020-01-01 10:00:00'));
+ $activityGateway->add('1', 'registered_at', new DateTimeImmutable('2020-01-01 10:00:00'));
 
  $this->assertEquals(
  [],
- $activityGateway->findAfterOrAt('registered_at', new \DateTimeImmutable('2020-01-01 10:00:01'))
+ $activityGateway->findAfterOrAt('registered_at', new DateTimeImmutable('2020-01-01 10:00:01'))
  );
 
  $this->assertEquals(
  ['1'],
- $activityGateway->findAfterOrAt('registered_at', new \DateTimeImmutable('2020-01-01 10:00:00'))
+ $activityGateway->findAfterOrAt('registered_at', new DateTimeImmutable('2020-01-01 10:00:00'))
  );
  }
 
  public function test_using_defined_converter_over_default_one()
  {
  $ecotoneLite = $this->bootstrapEcotone([
- DateTimeToDayStringConverter::class => new DateTimeToDayStringConverter()
+ DateTimeToDayStringConverter::class => new DateTimeToDayStringConverter(),
  ]);
  /** @var ActivityService $activityGateway */
  $activityGateway = $ecotoneLite->getGateway(ActivityService::class);
  /** This will be converted to 2020-01-02 00:00:00 */
- $activityGateway->add('1', 'registered_at', new \DateTimeImmutable('2020-01-02 01:00:00'));
+ $activityGateway->add('1', 'registered_at', new DateTimeImmutable('2020-01-02 01:00:00'));
 
  $this->assertEquals(
  [],
  /** This will be converted to 2020-01-02 00:00:00 */
- $activityGateway->findBefore('registered_at', new \DateTimeImmutable('2020-01-02 23:59:59'))
+ $activityGateway->findBefore('registered_at', new DateTimeImmutable('2020-01-02 23:59:59'))
  );
 
  $this->assertEquals(
  ['1'],
  /** This will be converted to 2020-01-03 00:00:00 */
- $activityGateway->findBefore('registered_at', new \DateTimeImmutable('2020-01-03 00:00:00'))
+ $activityGateway->findBefore('registered_at', new DateTimeImmutable('2020-01-03 00:00:00'))
  );
  }
 
@@ -72,16 +67,16 @@ public function test_using_to_string_method_for_object_conversion_if_available()
  $ecotoneLite = $this->bootstrapEcotone();
  /** @var ActivityService $activityGateway */
  $activityGateway = $ecotoneLite->getGateway(ActivityService::class);
- $activityGateway->store(new PersonId('1'), 'registered_at', new \DateTimeImmutable('2020-01-01 10:00:00'));
+ $activityGateway->store(new PersonId('1'), 'registered_at', new DateTimeImmutable('2020-01-01 10:00:00'));
 
  $this->assertEquals(
  [],
- $activityGateway->findAfterOrAt('registered_at', new \DateTimeImmutable('2020-01-01 10:00:01'))
+ $activityGateway->findAfterOrAt('registered_at', new DateTimeImmutable('2020-01-01 10:00:01'))
  );
 
  $this->assertEquals(
  ['1'],
- $activityGateway->findAfterOrAt('registered_at', new \DateTimeImmutable('2020-01-01 10:00:00'))
+ $activityGateway->findAfterOrAt('registered_at', new DateTimeImmutable('2020-01-01 10:00:00'))
  );
  }
 

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

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

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

diff --git a/packages/Laravel/composer.json b/packages/Laravel/composer.json
@@ -33,7 +33,7 @@
  }
  },
  "require": {
- "ecotone/ecotone": "~1.209.1",
+ "ecotone/ecotone": "~1.210.0",
  "laravel/framework": "^9.5.2|^10.0"
  },
  "require-dev": {
@@ -54,7 +54,7 @@
  ]
  },
  "branch-alias": {
- "dev-main": "1.209.1-dev"
+ "dev-main": "1.210.0-dev"
  },
  "ecotone": {
  "repository": "laravel"

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

diff --git a/packages/OpenTelemetry/composer.json b/packages/OpenTelemetry/composer.json
@@ -31,7 +31,7 @@
  }
  },
  "require": {
- "ecotone/ecotone": "~1.209.1",
+ "ecotone/ecotone": "~1.210.0",
  "open-telemetry/sdk": "^1.0.0|^1.0.0beta17"
  },
  "require-dev": {
@@ -61,7 +61,7 @@
  },
  "extra": {
  "branch-alias": {
- "dev-main": "1.209.1-dev"
+ "dev-main": "1.210.0-dev"
  },
  "ecotone": {
  "repository": "open-telemetry"

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

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