diff --git a/.github/workflows/test-monorepo.yml b/.github/workflows/test-monorepo.yml index 2dc05b4cd..806970181 100644 --- a/.github/workflows/test-monorepo.yml +++ b/.github/workflows/test-monorepo.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: operating-system: [ ubuntu-latest ] - php-versions: [ '8.0', '8.3' ] + php-versions: [ '8.1', '8.3' ] stability: [prefer-stable] services: rabbitmq: diff --git a/Monorepo/CrossModuleTests/Tests/MessageChannelConfigurationTest.php b/Monorepo/CrossModuleTests/Tests/MessageChannelConfigurationTest.php index 6d4e8cbf6..e017a6828 100644 --- a/Monorepo/CrossModuleTests/Tests/MessageChannelConfigurationTest.php +++ b/Monorepo/CrossModuleTests/Tests/MessageChannelConfigurationTest.php @@ -23,9 +23,9 @@ use Monorepo\ExampleApp\Symfony\Kernel; use PHPUnit\Framework\TestCase; use Monorepo\CrossModuleTests\Fixture\FailureHandler\ExampleFailureCommandHandler; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Dbal\DbalMessagingTestCase; -use Test\Ecotone\Sqs\AbstractConnectionTest; +use Test\Ecotone\Sqs\ConnectionTestCase; final class MessageChannelConfigurationTest extends TestCase { @@ -146,7 +146,7 @@ function() { yield "amqp" => [ AmqpBackedMessageChannelBuilder::create(self::CHANNEL_NAME) ->withReceiveTimeout(100), - [AmqpConnectionFactory::class => AmqpMessagingTest::getRabbitConnectionFactory()], + [AmqpConnectionFactory::class => AmqpMessagingTestCase::getRabbitConnectionFactory()], ModulePackageList::allPackagesExcept([ModulePackageList::AMQP_PACKAGE, ModulePackageList::ASYNCHRONOUS_PACKAGE]), function() { MessagingTestCase::cleanRabbitMQ(); @@ -155,7 +155,7 @@ function() { yield "redis" => [ RedisBackedMessageChannelBuilder::create(self::CHANNEL_NAME) ->withReceiveTimeout(100), - [RedisConnectionFactory::class => \Test\Ecotone\Redis\AbstractConnectionTest::getConnection()], + [RedisConnectionFactory::class => \Test\Ecotone\Redis\ConnectionTestCase::getConnection()], ModulePackageList::allPackagesExcept([ModulePackageList::REDIS_PACKAGE, ModulePackageList::ASYNCHRONOUS_PACKAGE]), function() { MessagingTestCase::cleanUpRedis(); @@ -164,7 +164,7 @@ function() { yield "sqs" => [ SqsBackedMessageChannelBuilder::create(self::CHANNEL_NAME) ->withReceiveTimeout(100), - [SqsConnectionFactory::class => AbstractConnectionTest::getConnection()], + [SqsConnectionFactory::class => ConnectionTestCase::getConnection()], ModulePackageList::allPackagesExcept([ModulePackageList::SQS_PACKAGE, ModulePackageList::ASYNCHRONOUS_PACKAGE]), function() { MessagingTestCase::cleanUpSqs(); diff --git a/Monorepo/CrossModuleTests/Tests/MessagingTestCase.php b/Monorepo/CrossModuleTests/Tests/MessagingTestCase.php index 249629f30..fb3a56fa5 100644 --- a/Monorepo/CrossModuleTests/Tests/MessagingTestCase.php +++ b/Monorepo/CrossModuleTests/Tests/MessagingTestCase.php @@ -8,7 +8,7 @@ use Ecotone\Dbal\Deduplication\DeduplicationInterceptor; use Ecotone\Dbal\DocumentStore\DbalDocumentStore; use Ecotone\Dbal\Recoverability\DbalDeadLetterHandler; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Dbal\DbalMessagingTestCase; final class MessagingTestCase @@ -26,7 +26,7 @@ public static function cleanUpDbal(): void public static function cleanRabbitMQ(): void { self::cleanUpDbal(); - $context = AmqpMessagingTest::getRabbitConnectionFactory()->createContext(); + $context = AmqpMessagingTestCase::getRabbitConnectionFactory()->createContext(); foreach (['async'] as $queue) { try { @@ -38,7 +38,7 @@ public static function cleanRabbitMQ(): void public static function cleanUpSqs(): void { self::cleanUpDbal(); - $context = \Test\Ecotone\Sqs\AbstractConnectionTest::getConnection()->createContext(); + $context = \Test\Ecotone\Sqs\ConnectionTestCase::getConnection()->createContext(); foreach (['async'] as $queue) { try { @@ -50,7 +50,7 @@ public static function cleanUpSqs(): void public static function cleanUpRedis(): void { self::cleanUpDbal(); - $context = \Test\Ecotone\Redis\AbstractConnectionTest::getConnection()->createContext(); + $context = \Test\Ecotone\Redis\ConnectionTestCase::getConnection()->createContext(); foreach (['async'] as $queue) { try { diff --git a/Monorepo/CrossModuleTests/Tests/ProxyCacheGenerationTest.php b/Monorepo/CrossModuleTests/Tests/ProxyCacheGenerationTest.php index 6f1641027..c23c3a9af 100644 --- a/Monorepo/CrossModuleTests/Tests/ProxyCacheGenerationTest.php +++ b/Monorepo/CrossModuleTests/Tests/ProxyCacheGenerationTest.php @@ -15,7 +15,7 @@ class ProxyCacheGenerationTest extends FullAppBenchmarkCase * @runInSeparateProcess * @preserveGlobalState disabled */ - public function TODO_test_symfony_prod() + public function test_symfony_prod() { $this->markTestSkipped('grpc warning to be solved: https://github.com/google-ai-edge/mediapipe/issues/5371#issuecomment-2219871932'); @@ -27,7 +27,7 @@ public function TODO_test_symfony_prod() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function TODO_test_laravel_prod(): void + public function test_laravel_prod(): void { $this->markTestSkipped('grpc warning to be solved: https://github.com/google-ai-edge/mediapipe/issues/5371#issuecomment-2219871932'); @@ -39,7 +39,7 @@ public function TODO_test_laravel_prod(): void * @runInSeparateProcess * @preserveGlobalState disabled */ - public function TODO_test_lite_application_prod() + public function test_lite_application_prod() { $this->markTestSkipped('grpc warning to be solved: https://github.com/google-ai-edge/mediapipe/issues/5371#issuecomment-2219871932'); @@ -51,7 +51,7 @@ public function TODO_test_lite_application_prod() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function TODO_test_lite_prod() + public function test_lite_prod() { $this->markTestSkipped('grpc warning to be solved: https://github.com/google-ai-edge/mediapipe/issues/5371#issuecomment-2219871932'); diff --git a/Monorepo/CrossModuleTests/Tests/Tracing/TracingStackTest.php b/Monorepo/CrossModuleTests/Tests/Tracing/TracingStackTest.php index 679fd2231..723ae4183 100644 --- a/Monorepo/CrossModuleTests/Tests/Tracing/TracingStackTest.php +++ b/Monorepo/CrossModuleTests/Tests/Tracing/TracingStackTest.php @@ -19,7 +19,7 @@ use Monorepo\ExampleApp\ExampleAppCaseTrait; use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter; use Psr\Container\ContainerInterface; -use Test\Ecotone\OpenTelemetry\Integration\TracingTest; +use Test\Ecotone\OpenTelemetry\Integration\TracingTestCase; final class TracingStackTest extends FullAppTestCase { @@ -117,7 +117,7 @@ private function placeOrder(mixed $commandBus, Configuration $configuration): vo private function assertTracing(InMemoryExporter $exporter): void { - TracingTest::compareTreesByDetails( + TracingTestCase::compareTreesByDetails( [ [ 'details' => ['name' => 'Command Bus'], @@ -160,7 +160,7 @@ private function assertTracing(InMemoryExporter $exporter): void ] ] ], - TracingTest::buildTree($exporter) + TracingTestCase::buildTree($exporter) ); } } \ No newline at end of file diff --git a/Monorepo/ExampleApp/Laravel/app/Providers/AppServiceProvider.php b/Monorepo/ExampleApp/Laravel/app/Providers/AppServiceProvider.php index 68384d1d2..c7263532d 100644 --- a/Monorepo/ExampleApp/Laravel/app/Providers/AppServiceProvider.php +++ b/Monorepo/ExampleApp/Laravel/app/Providers/AppServiceProvider.php @@ -25,7 +25,7 @@ use OpenTelemetry\API\Trace\TracerProviderInterface; use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter; use Psr\Log\LoggerInterface; -use Test\Ecotone\OpenTelemetry\Integration\TracingTest; +use Test\Ecotone\OpenTelemetry\Integration\TracingTestCase; class AppServiceProvider extends ServiceProvider { @@ -68,7 +68,7 @@ public function register(): void $this->app->singleton(InMemoryExporter::class, fn() => new InMemoryExporter()); $this->app->singleton(TracerProviderInterface::class, function (Application $app) { $exporter = $app->make(InMemoryExporter::class); - return TracingTest::prepareTracer($exporter); + return TracingTestCase::prepareTracer($exporter); }); } diff --git a/Monorepo/ExampleApp/Lite/app.php b/Monorepo/ExampleApp/Lite/app.php index a2545f4d4..88d105985 100644 --- a/Monorepo/ExampleApp/Lite/app.php +++ b/Monorepo/ExampleApp/Lite/app.php @@ -21,10 +21,9 @@ use Monorepo\ExampleApp\Common\Infrastructure\StubNotificationSender; use Monorepo\ExampleApp\Common\Infrastructure\StubShippingService; use Monorepo\ExampleApp\Common\Infrastructure\SystemClock; -use OpenTelemetry\API\Trace\TracerInterface; use OpenTelemetry\API\Trace\TracerProviderInterface; use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter; -use Test\Ecotone\OpenTelemetry\Integration\TracingTest; +use Test\Ecotone\OpenTelemetry\Integration\TracingTestCase; return function (bool $useCachedVersion = true): ConfiguredMessagingSystem { $output = new Output(); @@ -51,7 +50,7 @@ InMemoryProductRepository::class => $configuration->productRepository(), InMemoryUserRepository::class => $configuration->userRepository(), InMemoryExporter::class => $exporter, - TracerProviderInterface::class => TracingTest::prepareTracer($exporter) + TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter) ]; return EcotoneLite::bootstrap( containerOrAvailableServices: $services, diff --git a/Monorepo/ExampleApp/LiteApplication/app.php b/Monorepo/ExampleApp/LiteApplication/app.php index edeed1e65..22032f6d9 100644 --- a/Monorepo/ExampleApp/LiteApplication/app.php +++ b/Monorepo/ExampleApp/LiteApplication/app.php @@ -21,7 +21,7 @@ use Monorepo\ExampleApp\Common\Infrastructure\SystemClock; use OpenTelemetry\API\Trace\TracerProviderInterface; use OpenTelemetry\SDK\Trace\SpanExporter\InMemoryExporter; -use Test\Ecotone\OpenTelemetry\Integration\TracingTest; +use Test\Ecotone\OpenTelemetry\Integration\TracingTestCase; return function (bool $useCachedVersion = true): ConfiguredMessagingSystem { $output = new Output(); @@ -44,7 +44,7 @@ Output::class => $output, ErrorChannelService::class => new ErrorChannelService(), InMemoryExporter::class => $exporter, - TracerProviderInterface::class => TracingTest::prepareTracer($exporter) + TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter) ]; return EcotoneLiteApplication::bootstrap( diff --git a/Monorepo/ExampleApp/Symfony/config/services.php b/Monorepo/ExampleApp/Symfony/config/services.php index 25c51cee2..27c02103b 100644 --- a/Monorepo/ExampleApp/Symfony/config/services.php +++ b/Monorepo/ExampleApp/Symfony/config/services.php @@ -1,6 +1,5 @@ set(InMemoryExporter::class, InMemoryExporter::class) ->public(); $services->set(TracerProviderInterface::class) - ->factory([TracingTest::class, 'prepareTracer']) + ->factory([TracingTestCase::class, 'prepareTracer']) ->args([service(InMemoryExporter::class)]) ->public(); }; \ No newline at end of file diff --git a/composer.json b/composer.json index 2bfc42a43..3db4722a7 100644 --- a/composer.json +++ b/composer.json @@ -111,9 +111,9 @@ } }, "require": { - "php": "^8.0", + "php": "^8.1", "doctrine/dbal": "^2.12.0|^3.0", - "doctrine/persistence": "^2.5", + "doctrine/persistence": "^2.5|^3.4", "enqueue/amqp-ext": "^0.10.18", "enqueue/dbal": "^0.10.17", "enqueue/redis": "^0.10.9", @@ -139,13 +139,13 @@ }, "require-dev": { "behat/behat": "^3.10", - "doctrine/annotations": "^1.13", - "doctrine/cache": "^1.0.0", + "doctrine/annotations": "^1.13|^2.0", + "doctrine/cache": "^1.0.0|^2.0", "doctrine/orm": "^2.11|^3.0", "friends-of-behat/symfony-extension": "<=2.4.2|^2.5", "friendsofphp/php-cs-fixer": "^3.9", "guzzlehttp/psr7": "^2.0", - "orchestra/testbench": "^7.6|^8.0", + "orchestra/testbench": "^7.6|^8.0|^9.0", "php-coveralls/php-coveralls": "^2.5", "phpstan/phpstan": "^1.8", "phpunit/phpunit": "^9.6", @@ -157,7 +157,7 @@ "symfony/amqp-messenger": "^5.4.31|^6.0|^7.0", "symfony/doctrine-messenger": "^5.4|^6.0|^7.0", "doctrine/doctrine-bundle": "^2.7.2", - "phpbench/phpbench": "^1.2", + "phpbench/phpbench": "^1.2|^1.3", "enqueue/null": "^0.10.18", "open-telemetry/transport-grpc": "^1.0.0", "open-telemetry/exporter-otlp": "^1.0.0", diff --git a/docker-compose.yml b/docker-compose.yml index 26d378627..931bf0989 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: app: - image: simplycodedsoftware/php:8.3.10 + image: simplycodedsoftware/php:8.3.13 volumes: - "$PWD:/data/app" working_dir: "/data/app" @@ -57,34 +57,6 @@ services: APP_MERGE_PLUGIN: "yes" env_file: - ".env" - app8_0: - image: simplycodedsoftware/nginx-php:8.0.30 - volumes: - - "$PWD:/data/app" - working_dir: "/data/app" - command: sleep 99999 - container_name: "ecotone_development_8_0" - user: "${USER_PID:-1000}:${USER_PID:-1000}" - extra_hosts: - - "host.docker.internal:host-gateway" - # 172.17.0.1 - environment: - COMPOSER_HOME: /data/app - COMPOSE_HTTP_TIMEOUT: 9999 - COMPOSER_ROOT_VERSION: 'dev-main' - RABBIT_HOST: "amqp://rabbitmq:5672" - DATABASE_DSN: pgsql://ecotone:secret@database:5432/ecotone - SECONDARY_DATABASE_DSN: mysql://ecotone:secret@database-mysql:3306/ecotone - APP_DB_HOST: database - APP_DB_PORT: 5432 - APP_DB_DRIVER: pdo_pgsql - DATABASE_MYSQL: mysql://ecotone:secret@database-mysql:3306/ecotone - SQS_DSN: sqs:?key=key&secret=secret®ion=us-east-1&endpoint=http://localstack:4566&version=latest - REDIS_DSN: redis://redis:6379 - KAFKA_DSN: kafka:9092 - APP_MERGE_PLUGIN: "yes" - env_file: - - ".env" database: image: simplycodedsoftware/postgres:16.1 environment: diff --git a/packages/Amqp/composer.json b/packages/Amqp/composer.json index df81f187a..fdd62e33f 100644 --- a/packages/Amqp/composer.json +++ b/packages/Amqp/composer.json @@ -50,7 +50,7 @@ "require-dev": { "phpunit/phpunit": "^9.6", "phpstan/phpstan": "^1.8", - "doctrine/annotations": "^1.13", + "doctrine/annotations": "^1.13|^2.0", "wikimedia/composer-merge-plugin": "^2.1" }, "scripts": { diff --git a/packages/Amqp/tests/AmqpMessagingTest.php b/packages/Amqp/tests/AmqpMessagingTestCase.php similarity index 98% rename from packages/Amqp/tests/AmqpMessagingTest.php rename to packages/Amqp/tests/AmqpMessagingTestCase.php index 9e1350e97..8f2c37d7d 100644 --- a/packages/Amqp/tests/AmqpMessagingTest.php +++ b/packages/Amqp/tests/AmqpMessagingTestCase.php @@ -16,7 +16,7 @@ /** * licence Apache-2.0 */ -abstract class AmqpMessagingTest extends TestCase +abstract class AmqpMessagingTestCase extends TestCase { public const RABBITMQ_HOST = 'localhost'; diff --git a/packages/Amqp/tests/Configuration/AmqpModuleTest.php b/packages/Amqp/tests/Configuration/AmqpModuleTestCase.php similarity index 97% rename from packages/Amqp/tests/Configuration/AmqpModuleTest.php rename to packages/Amqp/tests/Configuration/AmqpModuleTestCase.php index 90a276cf6..08351f6a7 100644 --- a/packages/Amqp/tests/Configuration/AmqpModuleTest.php +++ b/packages/Amqp/tests/Configuration/AmqpModuleTestCase.php @@ -21,7 +21,7 @@ use Ecotone\Messaging\PollableChannel; use Ecotone\Messaging\Support\MessageBuilder; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; /** * Class AmqpModuleTest @@ -34,7 +34,7 @@ * licence Apache-2.0 * @internal */ -class AmqpModuleTest extends AmqpMessagingTest +class AmqpModuleTestCase extends AmqpMessagingTestCase { public function test_registering_amqp_backed_message_channel() { diff --git a/packages/Amqp/tests/Integration/AmqpChannelAdapterTest.php b/packages/Amqp/tests/Integration/AmqpChannelAdapterTestCase.php similarity index 99% rename from packages/Amqp/tests/Integration/AmqpChannelAdapterTest.php rename to packages/Amqp/tests/Integration/AmqpChannelAdapterTestCase.php index 029c661f1..3eb7d9c52 100644 --- a/packages/Amqp/tests/Integration/AmqpChannelAdapterTest.php +++ b/packages/Amqp/tests/Integration/AmqpChannelAdapterTestCase.php @@ -41,7 +41,7 @@ use Ramsey\Uuid\Uuid; use RuntimeException; use stdClass; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\AmqpConsumer\AmqpConsumerExample; use Test\Ecotone\Amqp\Fixture\Handler\ExceptionalMessageHandler; @@ -56,7 +56,7 @@ * licence Apache-2.0 * @internal */ -class AmqpChannelAdapterTest extends AmqpMessagingTest +class AmqpChannelAdapterTestCase extends AmqpMessagingTestCase { public function setUp(): void { diff --git a/packages/Amqp/tests/Integration/AmqpMessageChannelTest.php b/packages/Amqp/tests/Integration/AmqpMessageChannelTestCase.php similarity index 98% rename from packages/Amqp/tests/Integration/AmqpMessageChannelTest.php rename to packages/Amqp/tests/Integration/AmqpMessageChannelTestCase.php index cbd6bd7e6..0c67bf41a 100644 --- a/packages/Amqp/tests/Integration/AmqpMessageChannelTest.php +++ b/packages/Amqp/tests/Integration/AmqpMessageChannelTestCase.php @@ -19,7 +19,7 @@ use Enqueue\AmqpExt\AmqpConnectionFactory; use Interop\Amqp\Impl\AmqpQueue; use Ramsey\Uuid\Uuid; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\DeadLetter\ErrorConfigurationContext; use Test\Ecotone\Amqp\Fixture\Order\OrderService; @@ -30,7 +30,7 @@ * licence Apache-2.0 * @internal */ -final class AmqpMessageChannelTest extends AmqpMessagingTest +final class AmqpMessageChannelTestCase extends AmqpMessagingTestCase { public function test_sending_and_receiving_message_from_amqp_message_channel() { diff --git a/packages/Amqp/tests/Integration/CallAggregateAsynchronousEndpointTest.php b/packages/Amqp/tests/Integration/CallAggregateAsynchronousEndpointTestCase.php similarity index 92% rename from packages/Amqp/tests/Integration/CallAggregateAsynchronousEndpointTest.php rename to packages/Amqp/tests/Integration/CallAggregateAsynchronousEndpointTestCase.php index c273e20de..0ce3fb480 100644 --- a/packages/Amqp/tests/Integration/CallAggregateAsynchronousEndpointTest.php +++ b/packages/Amqp/tests/Integration/CallAggregateAsynchronousEndpointTestCase.php @@ -10,7 +10,7 @@ use Ecotone\Messaging\Config\ServiceConfiguration; use Ecotone\Modelling\AggregateMessage; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\Calendar\Calendar; use Test\Ecotone\Amqp\Fixture\Calendar\ScheduleMeeting; @@ -21,7 +21,7 @@ * licence Apache-2.0 * @internal */ -final class CallAggregateAsynchronousEndpointTest extends AmqpMessagingTest +final class CallAggregateAsynchronousEndpointTestCase extends AmqpMessagingTestCase { public function test_sending_command_to_aggregate(): void { diff --git a/packages/Amqp/tests/Integration/ConsumerAndPublisherTest.php b/packages/Amqp/tests/Integration/ConsumerAndPublisherTestCase.php similarity index 95% rename from packages/Amqp/tests/Integration/ConsumerAndPublisherTest.php rename to packages/Amqp/tests/Integration/ConsumerAndPublisherTestCase.php index a10a78782..0398d190f 100644 --- a/packages/Amqp/tests/Integration/ConsumerAndPublisherTest.php +++ b/packages/Amqp/tests/Integration/ConsumerAndPublisherTestCase.php @@ -13,7 +13,7 @@ use Ecotone\Messaging\Endpoint\ExecutionPollingMetadata; use Enqueue\AmqpExt\AmqpConnectionFactory; use Ramsey\Uuid\Uuid; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\AmqpConsumer\AmqpConsumerExample; /** @@ -23,7 +23,7 @@ * licence Apache-2.0 * @internal */ -final class ConsumerAndPublisherTest extends AmqpMessagingTest +final class ConsumerAndPublisherTestCase extends AmqpMessagingTestCase { public function testing_sending_message_using_publisher_and_receiving_using_consumer() { diff --git a/packages/Amqp/tests/Integration/DeadLetterTest.php b/packages/Amqp/tests/Integration/DeadLetterTestCase.php similarity index 94% rename from packages/Amqp/tests/Integration/DeadLetterTest.php rename to packages/Amqp/tests/Integration/DeadLetterTestCase.php index fb658c233..8b3eb1adb 100644 --- a/packages/Amqp/tests/Integration/DeadLetterTest.php +++ b/packages/Amqp/tests/Integration/DeadLetterTestCase.php @@ -8,7 +8,7 @@ use Ecotone\Messaging\Config\ModulePackageList; use Ecotone\Messaging\Config\ServiceConfiguration; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\DeadLetter\OrderService; /** @@ -18,7 +18,7 @@ * licence Apache-2.0 * @internal */ -final class DeadLetterTest extends AmqpMessagingTest +final class DeadLetterTestCase extends AmqpMessagingTestCase { public function test_exception_handling_with_retries_and_dead_letter(): void { diff --git a/packages/Amqp/tests/Integration/DistributedCommandBusTest.php b/packages/Amqp/tests/Integration/DistributedCommandBusTestCase.php similarity index 97% rename from packages/Amqp/tests/Integration/DistributedCommandBusTest.php rename to packages/Amqp/tests/Integration/DistributedCommandBusTestCase.php index 97fdc8ab9..04576f8a6 100644 --- a/packages/Amqp/tests/Integration/DistributedCommandBusTest.php +++ b/packages/Amqp/tests/Integration/DistributedCommandBusTestCase.php @@ -12,7 +12,7 @@ use Ecotone\Messaging\Handler\Logger\EchoLogger; use Ecotone\Modelling\DistributedBus; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\DistributedCommandBus\Publisher\UserService; use Test\Ecotone\Amqp\Fixture\DistributedCommandBus\Receiver\TicketServiceMessagingConfiguration; use Test\Ecotone\Amqp\Fixture\DistributedCommandBus\Receiver\TicketServiceReceiver; @@ -25,7 +25,7 @@ * licence Apache-2.0 * @internal */ -final class DistributedCommandBusTest extends AmqpMessagingTest +final class DistributedCommandBusTestCase extends AmqpMessagingTestCase { public function test_distributing_command_to_another_service(): void { diff --git a/packages/Amqp/tests/Integration/DistributedDeadLetterTest.php b/packages/Amqp/tests/Integration/DistributedDeadLetterTestCase.php similarity index 95% rename from packages/Amqp/tests/Integration/DistributedDeadLetterTest.php rename to packages/Amqp/tests/Integration/DistributedDeadLetterTestCase.php index ff23229a0..7991b3e64 100644 --- a/packages/Amqp/tests/Integration/DistributedDeadLetterTest.php +++ b/packages/Amqp/tests/Integration/DistributedDeadLetterTestCase.php @@ -9,7 +9,7 @@ use Ecotone\Messaging\Config\ModulePackageList; use Ecotone\Messaging\Config\ServiceConfiguration; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\DistributedDeadLetter\Publisher\UserService; use Test\Ecotone\Amqp\Fixture\DistributedDeadLetter\Receiver\TicketServiceReceiver; @@ -20,7 +20,7 @@ * licence Apache-2.0 * @internal */ -final class DistributedDeadLetterTest extends AmqpMessagingTest +final class DistributedDeadLetterTestCase extends AmqpMessagingTestCase { public function test_exception_handling_with_retry_dead_letter_when_using_distribution(): void { diff --git a/packages/Amqp/tests/Integration/DistributedEventBusTest.php b/packages/Amqp/tests/Integration/DistributedEventBusTestCase.php similarity index 98% rename from packages/Amqp/tests/Integration/DistributedEventBusTest.php rename to packages/Amqp/tests/Integration/DistributedEventBusTestCase.php index e0bec4afa..b40cae233 100644 --- a/packages/Amqp/tests/Integration/DistributedEventBusTest.php +++ b/packages/Amqp/tests/Integration/DistributedEventBusTestCase.php @@ -11,7 +11,7 @@ use Ecotone\Messaging\Config\ModulePackageList; use Ecotone\Messaging\Config\ServiceConfiguration; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\DistributedEventBus\AsynchronousEventHandler\TicketNotificationSubscriber; use Test\Ecotone\Amqp\Fixture\DistributedEventBus\Publisher\UserService; use Test\Ecotone\Amqp\Fixture\DistributedEventBus\Receiver\TicketServiceReceiver; @@ -23,7 +23,7 @@ * licence Apache-2.0 * @internal */ -final class DistributedEventBusTest extends AmqpMessagingTest +final class DistributedEventBusTestCase extends AmqpMessagingTestCase { public function test_distributing_event_to_another_service(): void { diff --git a/packages/Amqp/tests/Integration/DistributedMessageTest.php b/packages/Amqp/tests/Integration/DistributedMessageTestCase.php similarity index 94% rename from packages/Amqp/tests/Integration/DistributedMessageTest.php rename to packages/Amqp/tests/Integration/DistributedMessageTestCase.php index 75aed66e8..7df1c272a 100644 --- a/packages/Amqp/tests/Integration/DistributedMessageTest.php +++ b/packages/Amqp/tests/Integration/DistributedMessageTestCase.php @@ -9,7 +9,7 @@ use Ecotone\Messaging\Config\ModulePackageList; use Ecotone\Messaging\Config\ServiceConfiguration; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\DistributedMessage\Publisher\UserService; use Test\Ecotone\Amqp\Fixture\DistributedMessage\Receiver\TicketServiceReceiver; @@ -20,7 +20,7 @@ * licence Apache-2.0 * @internal */ -final class DistributedMessageTest extends AmqpMessagingTest +final class DistributedMessageTestCase extends AmqpMessagingTestCase { public function test_distributing_message_to_another_service(): void { diff --git a/packages/Amqp/tests/Integration/ErrorChannelTest.php b/packages/Amqp/tests/Integration/ErrorChannelTestCase.php similarity index 93% rename from packages/Amqp/tests/Integration/ErrorChannelTest.php rename to packages/Amqp/tests/Integration/ErrorChannelTestCase.php index 9c8c93dcc..ed10a6635 100644 --- a/packages/Amqp/tests/Integration/ErrorChannelTest.php +++ b/packages/Amqp/tests/Integration/ErrorChannelTestCase.php @@ -8,7 +8,7 @@ use Ecotone\Messaging\Config\ModulePackageList; use Ecotone\Messaging\Config\ServiceConfiguration; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\ErrorChannel\OrderService; /** @@ -18,7 +18,7 @@ * licence Apache-2.0 * @internal */ -final class ErrorChannelTest extends AmqpMessagingTest +final class ErrorChannelTestCase extends AmqpMessagingTestCase { public function test_exception_handling_with_retries(): void { diff --git a/packages/Amqp/tests/Integration/FailureTransactionTest.php b/packages/Amqp/tests/Integration/FailureTransactionTestCase.php similarity index 95% rename from packages/Amqp/tests/Integration/FailureTransactionTest.php rename to packages/Amqp/tests/Integration/FailureTransactionTestCase.php index 7090ccc09..368ac073d 100644 --- a/packages/Amqp/tests/Integration/FailureTransactionTest.php +++ b/packages/Amqp/tests/Integration/FailureTransactionTestCase.php @@ -9,7 +9,7 @@ use Ecotone\Messaging\Config\ModulePackageList; use Ecotone\Messaging\Config\ServiceConfiguration; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Throwable; /** @@ -19,7 +19,7 @@ * licence Apache-2.0 * @internal */ -final class FailureTransactionTest extends AmqpMessagingTest +final class FailureTransactionTestCase extends AmqpMessagingTestCase { public function test_order_is_never_placed_when_transaction_is_failed(): void { diff --git a/packages/Amqp/tests/Integration/GeneralAmqpTest.php b/packages/Amqp/tests/Integration/GeneralAmqpTestCase.php similarity index 95% rename from packages/Amqp/tests/Integration/GeneralAmqpTest.php rename to packages/Amqp/tests/Integration/GeneralAmqpTestCase.php index 3c2c08ead..dd1f42cbe 100644 --- a/packages/Amqp/tests/Integration/GeneralAmqpTest.php +++ b/packages/Amqp/tests/Integration/GeneralAmqpTestCase.php @@ -9,7 +9,7 @@ use Ecotone\Messaging\Config\ModulePackageList; use Ecotone\Messaging\Config\ServiceConfiguration; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\Order\OrderErrorHandler; use Test\Ecotone\Amqp\Fixture\Order\OrderService; use Test\Ecotone\Amqp\Fixture\Shop\ShoppingCart; @@ -21,7 +21,7 @@ * licence Apache-2.0 * @internal */ -final class GeneralAmqpTest extends AmqpMessagingTest +final class GeneralAmqpTestCase extends AmqpMessagingTestCase { public function test_products_are_on_list_after_being_ordered(): void { diff --git a/packages/Amqp/tests/Integration/SuccessTransactionTest.php b/packages/Amqp/tests/Integration/SuccessTransactionTestCase.php similarity index 92% rename from packages/Amqp/tests/Integration/SuccessTransactionTest.php rename to packages/Amqp/tests/Integration/SuccessTransactionTestCase.php index d751ba053..ac4cf824f 100644 --- a/packages/Amqp/tests/Integration/SuccessTransactionTest.php +++ b/packages/Amqp/tests/Integration/SuccessTransactionTestCase.php @@ -8,7 +8,7 @@ use Ecotone\Messaging\Config\ModulePackageList; use Ecotone\Messaging\Config\ServiceConfiguration; use Enqueue\AmqpExt\AmqpConnectionFactory; -use Test\Ecotone\Amqp\AmqpMessagingTest; +use Test\Ecotone\Amqp\AmqpMessagingTestCase; use Test\Ecotone\Amqp\Fixture\SuccessTransaction\OrderService; /** @@ -18,7 +18,7 @@ * licence Apache-2.0 * @internal */ -final class SuccessTransactionTest extends AmqpMessagingTest +final class SuccessTransactionTestCase extends AmqpMessagingTestCase { public function test_order_is_placed_when_transaction_is_successful(): void { diff --git a/packages/Dbal/composer.json b/packages/Dbal/composer.json index dd84bda97..06446167c 100644 --- a/packages/Dbal/composer.json +++ b/packages/Dbal/composer.json @@ -39,11 +39,11 @@ }, "require-dev": { "phpunit/phpunit": "^9.6", - "doctrine/persistence": "^2.5", + "doctrine/persistence": "^2.5|^3.4", "phpstan/phpstan": "^1.8", "doctrine/orm": "^2.11|^3.0", - "doctrine/cache": "^1.0.0", - "doctrine/annotations": "^1.13", + "doctrine/cache": "^1.0.0|^2.0", + "doctrine/annotations": "^1.13|^2.0", "wikimedia/composer-merge-plugin": "^2.1", "ecotone/jms-converter": "~1.236.0", "symfony/expression-language": "^6.0|^7.0" diff --git a/packages/Dbal/src/ManagerRegistryEmulator.php b/packages/Dbal/src/ManagerRegistryEmulator.php index 70d6dd36c..441b03dff 100644 --- a/packages/Dbal/src/ManagerRegistryEmulator.php +++ b/packages/Dbal/src/ManagerRegistryEmulator.php @@ -179,13 +179,15 @@ private function setupEntityManager(): void /** To fake phpstan as in version 2.0, constructor is protected */ $entityManager = $this->getEntityManagerName(); $this->entityManager = new $entityManager($this->getConnection(), $config, null); - } else { + } elseif (class_exists(Setup::class)) { $config = Setup::createAttributeMetadataConfiguration( $this->pathsToMapping, true ); - $this->entityManager = EntityManager::create($this->getConnection(), $config); + /** To fake phpstan */ + $entityManager = $this->getEntityManagerName(); + $this->entityManager = $entityManager::create($this->getConnection(), $config); } } diff --git a/packages/Ecotone/composer.json b/packages/Ecotone/composer.json index d1c6bec18..44a535d42 100644 --- a/packages/Ecotone/composer.json +++ b/packages/Ecotone/composer.json @@ -38,7 +38,7 @@ } }, "require": { - "php": "^8.0", + "php": "^8.1", "psr/container": "^1.1.1|^2.0.1", "psr/log": "^2.0|^3.0", "ramsey/uuid": "^4.0", diff --git a/packages/Ecotone/tests/Messaging/BaseEcotoneTest.php b/packages/Ecotone/tests/Messaging/BaseEcotoneTestCase.php similarity index 87% rename from packages/Ecotone/tests/Messaging/BaseEcotoneTest.php rename to packages/Ecotone/tests/Messaging/BaseEcotoneTestCase.php index 0dc9d3536..bdb9a0717 100644 --- a/packages/Ecotone/tests/Messaging/BaseEcotoneTest.php +++ b/packages/Ecotone/tests/Messaging/BaseEcotoneTestCase.php @@ -9,7 +9,7 @@ /** * @internal */ -abstract class BaseEcotoneTest extends TestCase +abstract class BaseEcotoneTestCase extends TestCase { /** * @dataProvider enterpriseMode diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/AnnotationModuleRetrievingServiceTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/AnnotationModuleRetrievingServiceTest.php index 5f8344b3c..481dbaa3b 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/AnnotationModuleRetrievingServiceTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/AnnotationModuleRetrievingServiceTest.php @@ -14,7 +14,7 @@ use Test\Ecotone\Messaging\Fixture\Annotation\ModuleConfiguration\ExampleModuleConfiguration; use Test\Ecotone\Messaging\Fixture\Annotation\ModuleConfiguration\ExampleModuleExtensionObject; use Test\Ecotone\Messaging\Fixture\Annotation\ModuleConfiguration\ExampleModuleExtensionWithVariableConfiguration; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class AnnotationModuleConfigurationRetrievingServiceTest @@ -27,7 +27,7 @@ * licence Apache-2.0 * @internal */ -class AnnotationModuleRetrievingServiceTest extends MessagingTest +class AnnotationModuleRetrievingServiceTest extends MessagingTestCase { public function test_creating_module() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AnnotationConfigurationTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AnnotationConfigurationTestCase.php similarity index 92% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AnnotationConfigurationTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AnnotationConfigurationTestCase.php index 6290ae924..d3ad17bf6 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AnnotationConfigurationTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AnnotationConfigurationTestCase.php @@ -6,17 +6,17 @@ use Ecotone\AnnotationFinder\InMemory\InMemoryAnnotationFinder; use Ecotone\Messaging\Config\InMemoryModuleMessaging; use Ecotone\Messaging\Config\MessagingSystemConfiguration; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** - * Class AnnotationConfigurationTest + * Class AnnotationConfigurationTestCase * @package Test\Ecotone\Messaging\Unit\Config\Annotation\Annotation * @author Dariusz Gafka */ /** * licence Apache-2.0 */ -abstract class AnnotationConfigurationTest extends MessagingTest +abstract class AnnotationConfigurationTestCase extends MessagingTestCase { protected function createAnnotationRegistrationService(string $className, string $methodName, $classAnnotationObject, $methodAnnotationObject): AnnotationFinder { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AsynchronousModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AsynchronousModuleTestCase.php similarity index 99% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AsynchronousModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AsynchronousModuleTestCase.php index e1d7e6ca1..cc4635453 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AsynchronousModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/AsynchronousModuleTestCase.php @@ -42,7 +42,7 @@ * licence Apache-2.0 * @internal */ -class AsynchronousModuleTest extends AnnotationConfigurationTest +class AsynchronousModuleTestCase extends AnnotationConfigurationTestCase { /** * @throws AnnotationException diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConsoleCommandModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConsoleCommandModuleTestCase.php similarity index 99% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConsoleCommandModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConsoleCommandModuleTestCase.php index f41d0c701..43d087fd4 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConsoleCommandModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConsoleCommandModuleTestCase.php @@ -38,7 +38,7 @@ * licence Apache-2.0 * @internal */ -class ConsoleCommandModuleTest extends AnnotationConfigurationTest +class ConsoleCommandModuleTestCase extends AnnotationConfigurationTestCase { public function test_registering_reference_based_command() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConverterModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConverterModuleTestCase.php similarity index 97% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConverterModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConverterModuleTestCase.php index 311367ead..b4e00ca43 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConverterModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ConverterModuleTestCase.php @@ -25,7 +25,7 @@ * licence Apache-2.0 * @internal */ -class ConverterModuleTest extends AnnotationConfigurationTest +class ConverterModuleTestCase extends AnnotationConfigurationTestCase { public function test_registering_converters() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ErrorHandlerModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ErrorHandlerModuleTestCase.php similarity index 95% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ErrorHandlerModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ErrorHandlerModuleTestCase.php index e344f678f..cf87ef49f 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ErrorHandlerModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ErrorHandlerModuleTestCase.php @@ -15,7 +15,7 @@ * licence Apache-2.0 * @internal */ -class ErrorHandlerModuleTest extends AnnotationConfigurationTest +class ErrorHandlerModuleTestCase extends AnnotationConfigurationTestCase { public function test_registering_module_with_default_error_handling() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/GatewayModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/GatewayModuleTestCase.php similarity index 98% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/GatewayModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/GatewayModuleTestCase.php index 552ce9a3e..becbcf975 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/GatewayModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/GatewayModuleTestCase.php @@ -27,7 +27,7 @@ * licence Apache-2.0 * @internal */ -class GatewayModuleTest extends AnnotationConfigurationTest +class GatewayModuleTestCase extends AnnotationConfigurationTestCase { /** * @throws \Doctrine\Common\Annotations\AnnotationException diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/MethodInterceptorModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/MethodInterceptorModuleTestCase.php similarity index 98% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/MethodInterceptorModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/MethodInterceptorModuleTestCase.php index e94e7a04d..f3edcb5ae 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/MethodInterceptorModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/MethodInterceptorModuleTestCase.php @@ -30,7 +30,7 @@ * licence Apache-2.0 * @internal */ -class MethodInterceptorModuleTest extends AnnotationConfigurationTest +class MethodInterceptorModuleTestCase extends AnnotationConfigurationTestCase { public function test_registering_around_method_level_interceptor_with_parameter_converters() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/PollerModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/PollerModuleTestCase.php similarity index 96% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/PollerModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/PollerModuleTestCase.php index 219c420d8..2f2c18ff2 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/PollerModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/PollerModuleTestCase.php @@ -18,7 +18,7 @@ * licence Apache-2.0 * @internal */ -class PollerModuleTest extends AnnotationConfigurationTest +class PollerModuleTestCase extends AnnotationConfigurationTestCase { public function test_creating_inbound_channel_adapter_builder_from_annotation() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RequiredConsumersModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RequiredConsumersModuleTestCase.php similarity index 97% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RequiredConsumersModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RequiredConsumersModuleTestCase.php index 5325acea3..ac3b594a6 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RequiredConsumersModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RequiredConsumersModuleTestCase.php @@ -27,7 +27,7 @@ * licence Apache-2.0 * @internal */ -class RequiredConsumersModuleTest extends AnnotationConfigurationTest +class RequiredConsumersModuleTestCase extends AnnotationConfigurationTestCase { public function test_throwing_exception_if_consumer_was_not_registered() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RouterModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RouterModuleTestCase.php similarity index 97% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RouterModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RouterModuleTestCase.php index 60d7f043f..4e8f979d2 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RouterModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/RouterModuleTestCase.php @@ -24,7 +24,7 @@ * licence Apache-2.0 * @internal */ -class RouterModuleTest extends AnnotationConfigurationTest +class RouterModuleTestCase extends AnnotationConfigurationTestCase { /** * @throws \Doctrine\Common\Annotations\AnnotationException diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ScheduledModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ScheduledModuleTestCase.php similarity index 95% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ScheduledModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ScheduledModuleTestCase.php index 8a706813d..bfac496a9 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ScheduledModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ScheduledModuleTestCase.php @@ -19,7 +19,7 @@ * licence Apache-2.0 * @internal */ -class ScheduledModuleTest extends AnnotationConfigurationTest +class ScheduledModuleTestCase extends AnnotationConfigurationTestCase { public function test_creating_inbound_channel_adapter_builder_from_annotation() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SerializerModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SerializerModuleTestCase.php similarity index 98% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SerializerModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SerializerModuleTestCase.php index 213edb27f..8963c89b2 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SerializerModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SerializerModuleTestCase.php @@ -33,7 +33,7 @@ * licence Apache-2.0 * @internal */ -class SerializerModuleTest extends AnnotationConfigurationTest +class SerializerModuleTestCase extends AnnotationConfigurationTestCase { /** * @throws AnnotationException diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTestCase.php similarity index 97% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTestCase.php index fde4846f3..a2d7850c1 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/ServiceActivatorModuleTestCase.php @@ -28,7 +28,7 @@ * licence Apache-2.0 * @internal */ -class ServiceActivatorModuleTest extends AnnotationConfigurationTest +class ServiceActivatorModuleTestCase extends AnnotationConfigurationTestCase { public function test_creating_service_activator_builder_from_annotation() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SplitterModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SplitterModuleTestCase.php similarity index 97% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SplitterModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SplitterModuleTestCase.php index 1c7ded9d9..8d95a71db 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SplitterModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/SplitterModuleTestCase.php @@ -24,7 +24,7 @@ * licence Apache-2.0 * @internal */ -class SplitterModuleTest extends AnnotationConfigurationTest +class SplitterModuleTestCase extends AnnotationConfigurationTestCase { /** * @throws \Doctrine\Common\Annotations\AnnotationException diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/TransformerModuleTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/TransformerModuleTestCase.php similarity index 96% rename from packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/TransformerModuleTest.php rename to packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/TransformerModuleTestCase.php index 786f70fb6..39efca28a 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/TransformerModuleTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ModuleConfiguration/TransformerModuleTestCase.php @@ -25,7 +25,7 @@ * licence Apache-2.0 * @internal */ -class TransformerModuleTest extends AnnotationConfigurationTest +class TransformerModuleTestCase extends AnnotationConfigurationTestCase { /** * @throws Exception diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ParameterConverterAnnotationFactoryTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ParameterConverterAnnotationFactoryTest.php index 3efa6bd69..542b416df 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ParameterConverterAnnotationFactoryTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/Annotation/ParameterConverterAnnotationFactoryTest.php @@ -15,7 +15,7 @@ use stdClass; use Test\Ecotone\Messaging\Fixture\Annotation\MessageEndpoint\ServiceActivator\AllConfigurationDefined\ServiceActivatorWithAllConfigurationDefined; use Test\Ecotone\Messaging\Fixture\Annotation\MessageEndpoint\ServiceActivator\ServiceWithSingleArgumentDefinedByConverter; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class ParameterConverterAnnotationFactoryTest @@ -28,7 +28,7 @@ * licence Apache-2.0 * @internal */ -class ParameterConverterAnnotationFactoryTest extends MessagingTest +class ParameterConverterAnnotationFactoryTest extends MessagingTestCase { public function test_creating_with_class_name_as_reference_name_if_no_reference_passed() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Config/MessagingSystemConfigurationTest.php b/packages/Ecotone/tests/Messaging/Unit/Config/MessagingSystemConfigurationTest.php index 978f6c5da..2f9293ad0 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Config/MessagingSystemConfigurationTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Config/MessagingSystemConfigurationTest.php @@ -66,7 +66,7 @@ use Test\Ecotone\Messaging\Fixture\Service\ServiceInterface\ServiceInterfaceCalculatingService; use Test\Ecotone\Messaging\Fixture\Service\ServiceWithoutReturnValue; use Test\Ecotone\Messaging\Fixture\Service\ServiceWithReturnValue; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; ; @@ -81,7 +81,7 @@ * licence Apache-2.0 * @internal */ -class MessagingSystemConfigurationTest extends MessagingTest +class MessagingSystemConfigurationTest extends MessagingTestCase { /** * @throws ConfigurationException diff --git a/packages/Ecotone/tests/Messaging/Unit/Endpoint/InboundChannelAdapterBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Endpoint/InboundChannelAdapterBuilderTest.php index 8d99c8e9e..5acd13e12 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Endpoint/InboundChannelAdapterBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Endpoint/InboundChannelAdapterBuilderTest.php @@ -26,7 +26,7 @@ use Test\Ecotone\Messaging\Fixture\Endpoint\ConsumerStoppingService; use Test\Ecotone\Messaging\Fixture\Service\ServiceExpectingNoArguments; use Test\Ecotone\Messaging\Fixture\Service\ServiceExpectingOneArgument; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class InboundChannelAdapterBuilderTest @@ -39,7 +39,7 @@ * licence Apache-2.0 * @internal */ -class InboundChannelAdapterBuilderTest extends MessagingTest +class InboundChannelAdapterBuilderTest extends MessagingTestCase { /** * @throws \Ecotone\Messaging\MessagingException diff --git a/packages/Ecotone/tests/Messaging/Unit/Endpoint/Poller/PollingConsumerBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Endpoint/Poller/PollingConsumerBuilderTest.php index 25b994829..bccecc016 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Endpoint/Poller/PollingConsumerBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Endpoint/Poller/PollingConsumerBuilderTest.php @@ -27,7 +27,7 @@ use Test\Ecotone\Messaging\Fixture\Endpoint\ConsumerThrowingExceptionService; use Test\Ecotone\Messaging\Fixture\Handler\DataReturningService; use Test\Ecotone\Messaging\Fixture\Handler\SuccessServiceActivator; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class PollingConsumerBuilderTest @@ -40,7 +40,7 @@ * licence Apache-2.0 * @internal */ -class PollingConsumerBuilderTest extends MessagingTest +class PollingConsumerBuilderTest extends MessagingTestCase { /** * @throws MessagingException diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/Filter/MessageFilterBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/Filter/MessageFilterBuilderTest.php index dea7cd9a9..9edf0ff12 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/Filter/MessageFilterBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/Filter/MessageFilterBuilderTest.php @@ -12,7 +12,7 @@ use Ecotone\Test\ComponentTestBuilder; use Exception; use Test\Ecotone\Messaging\Fixture\Handler\Selector\MessageSelectorExample; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class MessageFilterBuilderTest @@ -25,7 +25,7 @@ * licence Apache-2.0 * @internal */ -class MessageFilterBuilderTest extends MessagingTest +class MessageFilterBuilderTest extends MessagingTestCase { /** * @throws InvalidArgumentException diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayHeaderArrayBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayHeaderArrayBuilderTest.php index 6fb0c97da..df0c60963 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayHeaderArrayBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayHeaderArrayBuilderTest.php @@ -10,7 +10,7 @@ use Test\Ecotone\Messaging\Fixture\Service\CalculatingService; use Test\Ecotone\Messaging\Fixture\Service\ServiceExpectingOneArgument; use Test\Ecotone\Messaging\Fixture\Service\ServiceInterface\ServiceWithMixed; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class GatewayHeaderArrayBuilderTest @@ -23,7 +23,7 @@ * licence Apache-2.0 * @internal */ -class GatewayHeaderArrayBuilderTest extends MessagingTest +class GatewayHeaderArrayBuilderTest extends MessagingTestCase { /** * @throws \Ecotone\Messaging\MessagingException diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayPayloadExpressionBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayPayloadExpressionBuilderTest.php index bff0fa4db..f9f052e09 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayPayloadExpressionBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayPayloadExpressionBuilderTest.php @@ -11,7 +11,7 @@ use Test\Ecotone\Messaging\Fixture\Service\CalculatingService; use Test\Ecotone\Messaging\Fixture\Service\ServiceExpectingOneArgument; use Test\Ecotone\Messaging\Fixture\Service\ServiceInterface\ServiceWithMixed; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class GatewayHeaderExpressionBuilderTest @@ -24,7 +24,7 @@ * licence Apache-2.0 * @internal */ -class GatewayPayloadExpressionBuilderTest extends MessagingTest +class GatewayPayloadExpressionBuilderTest extends MessagingTestCase { /** * @throws \Ecotone\Messaging\MessagingException diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayProxyBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayProxyBuilderTest.php index 73d377155..7d02e9200 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayProxyBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/Gateway/GatewayProxyBuilderTest.php @@ -60,7 +60,7 @@ use Test\Ecotone\Messaging\Fixture\Service\ServiceInterface\ServiceInterfaceSendOnlyWithTwoArgumentsAndArray; use Test\Ecotone\Messaging\Fixture\Service\ServiceInterface\ServiceInterfaceWithFutureReceive; use Test\Ecotone\Messaging\Fixture\Service\ServiceInterface\ServiceWithMixed; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; use TypeError; /** @@ -74,7 +74,7 @@ * licence Apache-2.0 * @internal */ -class GatewayProxyBuilderTest extends MessagingTest +class GatewayProxyBuilderTest extends MessagingTestCase { public function test_running_gateway(): void { diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/Processor/MethodInvokerTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/Processor/MethodInvokerTest.php index 69ad464a5..3a3101f4b 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/Processor/MethodInvokerTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/Processor/MethodInvokerTest.php @@ -28,7 +28,7 @@ use Test\Ecotone\Messaging\Fixture\Service\ServiceExpectingOneArgument; use Test\Ecotone\Messaging\Fixture\Service\ServiceExpectingThreeArguments; use Test\Ecotone\Messaging\Fixture\Service\ServiceExpectingTwoArguments; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class MethodInvocationTest @@ -41,7 +41,7 @@ * licence Apache-2.0 * @internal */ -class MethodInvokerTest extends MessagingTest +class MethodInvokerTest extends MessagingTestCase { public function test_invoking_service() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/Processor/PayloadBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/Processor/PayloadBuilderTest.php index f0678ec0f..11e0f2050 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/Processor/PayloadBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/Processor/PayloadBuilderTest.php @@ -9,7 +9,7 @@ use Ecotone\Test\ComponentTestBuilder; use ReflectionException; use Test\Ecotone\Messaging\Fixture\Service\ServiceExpectingOneArgument; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class PayloadBuilder @@ -22,7 +22,7 @@ * licence Apache-2.0 * @internal */ -class PayloadBuilderTest extends MessagingTest +class PayloadBuilderTest extends MessagingTestCase { /** * @throws ReflectionException diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/RequestReplyProducerTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/RequestReplyProducerTest.php index 9bdb46f4d..94b3b9605 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/RequestReplyProducerTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/RequestReplyProducerTest.php @@ -18,7 +18,7 @@ use Ecotone\Messaging\Support\MessageBuilder; use Test\Ecotone\Messaging\Fixture\Handler\FakeReplyMessageProducer; use Test\Ecotone\Messaging\Fixture\Handler\NoReplyMessageProducer; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class RequestReplyProducerTest @@ -31,7 +31,7 @@ * licence Apache-2.0 * @internal */ -class RequestReplyProducerTest extends MessagingTest +class RequestReplyProducerTest extends MessagingTestCase { public function test_processing_message_without_reply() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/Router/RouterBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/Router/RouterBuilderTest.php index 87b32229b..4499e7183 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/Router/RouterBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/Router/RouterBuilderTest.php @@ -17,7 +17,7 @@ use Test\Ecotone\Messaging\Fixture\Router\MultipleChannelRouter; use Test\Ecotone\Messaging\Fixture\Router\Order; use Test\Ecotone\Messaging\Fixture\Router\SingleChannelRouter; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class RouterBuilderTest @@ -30,7 +30,7 @@ * licence Apache-2.0 * @internal */ -class RouterBuilderTest extends MessagingTest +class RouterBuilderTest extends MessagingTestCase { /** * @throws Exception diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/ServiceActivator/ServiceActivatorBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/ServiceActivator/ServiceActivatorBuilderTest.php index 2bccebdc9..540116c8f 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/ServiceActivator/ServiceActivatorBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/ServiceActivator/ServiceActivatorBuilderTest.php @@ -16,7 +16,7 @@ use Test\Ecotone\Messaging\Fixture\Service\ServiceExpectingOneArgument; use Test\Ecotone\Messaging\Fixture\Service\ServiceReturningMessage; use Test\Ecotone\Messaging\Fixture\Service\StaticallyCalledService; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class ServiceActivatorBuilderTest @@ -29,7 +29,7 @@ * licence Apache-2.0 * @internal */ -class ServiceActivatorBuilderTest extends MessagingTest +class ServiceActivatorBuilderTest extends MessagingTestCase { /** * @throws Exception diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/Splitter/SplitterBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/Splitter/SplitterBuilderTest.php index e2252078a..c5c049b1b 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/Splitter/SplitterBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/Splitter/SplitterBuilderTest.php @@ -13,7 +13,7 @@ use Exception; use Test\Ecotone\Messaging\Fixture\Handler\Splitter\ServiceSplittingArrayPayload; use Test\Ecotone\Messaging\Fixture\Handler\Splitter\WrongSplittingService; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class SplitterBuilderTest @@ -26,7 +26,7 @@ * licence Apache-2.0 * @internal */ -class SplitterBuilderTest extends MessagingTest +class SplitterBuilderTest extends MessagingTestCase { public function test_splitting_incoming_message_where_service_returns_payloads() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/Transformer/EnricherBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/Transformer/EnricherBuilderTest.php index f9822c004..71774929d 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/Transformer/EnricherBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/Transformer/EnricherBuilderTest.php @@ -31,7 +31,7 @@ use Test\Ecotone\Messaging\Fixture\Conversion\FakeConverterService; use Test\Ecotone\Messaging\Fixture\Dto\OrderExample; use Test\Ecotone\Messaging\Fixture\Handler\ReplyViaHeadersMessageHandler; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class PayloadEnricherBuilderTest @@ -44,7 +44,7 @@ * licence Apache-2.0 * @internal */ -class EnricherBuilderTest extends MessagingTest +class EnricherBuilderTest extends MessagingTestCase { /** * @throws ConfigurationException diff --git a/packages/Ecotone/tests/Messaging/Unit/Handler/Transformer/TransformerBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Handler/Transformer/TransformerBuilderTest.php index 4d2b98a8a..a95f12700 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Handler/Transformer/TransformerBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Handler/Transformer/TransformerBuilderTest.php @@ -20,7 +20,7 @@ use Test\Ecotone\Messaging\Fixture\Service\ServiceExpectingTwoArguments; use Test\Ecotone\Messaging\Fixture\Service\ServiceWithoutReturnValue; use Test\Ecotone\Messaging\Fixture\Service\ServiceWithReturnValue; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class TransformerBuilder @@ -33,7 +33,7 @@ * licence Apache-2.0 * @internal */ -class TransformerBuilderTest extends MessagingTest +class TransformerBuilderTest extends MessagingTestCase { public function test_modifying_payload() { diff --git a/packages/Ecotone/tests/Messaging/Unit/MessagingTest.php b/packages/Ecotone/tests/Messaging/Unit/MessagingTestCase.php similarity index 93% rename from packages/Ecotone/tests/Messaging/Unit/MessagingTest.php rename to packages/Ecotone/tests/Messaging/Unit/MessagingTestCase.php index c2e0b472b..7272c8fb2 100644 --- a/packages/Ecotone/tests/Messaging/Unit/MessagingTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/MessagingTestCase.php @@ -8,14 +8,14 @@ use PHPUnit\Framework\TestCase; /** - * Class MessagingTest + * Class MessagingTestCase * @package Ecotone\Messaging * @author Dariusz Gafka */ /** * licence Apache-2.0 */ -abstract class MessagingTest extends TestCase +abstract class MessagingTestCase extends TestCase { public const FIXTURE_DIR = __DIR__ . '/../Fixture'; diff --git a/packages/Ecotone/tests/Messaging/Unit/Support/GenericMessageTest.php b/packages/Ecotone/tests/Messaging/Unit/Support/GenericMessageTest.php index 2b7dbb6e6..977530aaa 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Support/GenericMessageTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Support/GenericMessageTest.php @@ -4,7 +4,7 @@ use Ecotone\Messaging\Support\GenericMessage; use Ecotone\Messaging\Support\InvalidArgumentException; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class GenericMessageTest @@ -17,7 +17,7 @@ * licence Apache-2.0 * @internal */ -class GenericMessageTest extends MessagingTest +class GenericMessageTest extends MessagingTestCase { public function test_creating_generic_message_with_headers_as_key_value() { diff --git a/packages/Ecotone/tests/Messaging/Unit/Support/MessageBuilderTest.php b/packages/Ecotone/tests/Messaging/Unit/Support/MessageBuilderTest.php index 6dd233a18..997393ad3 100644 --- a/packages/Ecotone/tests/Messaging/Unit/Support/MessageBuilderTest.php +++ b/packages/Ecotone/tests/Messaging/Unit/Support/MessageBuilderTest.php @@ -11,7 +11,7 @@ use function json_decode; use stdClass; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; /** * Class MessageBuilderTest @@ -24,7 +24,7 @@ * licence Apache-2.0 * @internal */ -class MessageBuilderTest extends MessagingTest +class MessageBuilderTest extends MessagingTestCase { public function test_creating_from_payload() { diff --git a/packages/Ecotone/tests/Modelling/Unit/Config/BusRoutingModuleTest.php b/packages/Ecotone/tests/Modelling/Unit/Config/BusRoutingModuleTest.php index 2d0e706ed..db40960b4 100644 --- a/packages/Ecotone/tests/Modelling/Unit/Config/BusRoutingModuleTest.php +++ b/packages/Ecotone/tests/Modelling/Unit/Config/BusRoutingModuleTest.php @@ -29,7 +29,7 @@ use Ecotone\Modelling\MessageHandling\MetadataPropagator\MessageHeadersPropagatorInterceptor; use Ecotone\Modelling\QueryBus; use stdClass; -use Test\Ecotone\Messaging\Unit\MessagingTest; +use Test\Ecotone\Messaging\Unit\MessagingTestCase; use Test\Ecotone\Modelling\Fixture\Annotation\CommandHandler\Aggregate\AggregateCommandHandlerExample; use Test\Ecotone\Modelling\Fixture\Annotation\CommandHandler\Aggregate\AggregateCommandHandlerWithDoubledActionMethod; use Test\Ecotone\Modelling\Fixture\Annotation\CommandHandler\Aggregate\AggregateCommandHandlerWithDoubledFactoryMethod; @@ -73,7 +73,7 @@ * licence Apache-2.0 * @internal */ -class BusRoutingModuleTest extends MessagingTest +class BusRoutingModuleTest extends MessagingTestCase { public function test_registering_service_command_handler_with_endpoint_id() { diff --git a/packages/Ecotone/tests/Modelling/Unit/CustomRepositoriesTest.php b/packages/Ecotone/tests/Modelling/Unit/CustomRepositoriesTestCase.php similarity index 97% rename from packages/Ecotone/tests/Modelling/Unit/CustomRepositoriesTest.php rename to packages/Ecotone/tests/Modelling/Unit/CustomRepositoriesTestCase.php index 105620cac..763b19bea 100644 --- a/packages/Ecotone/tests/Modelling/Unit/CustomRepositoriesTest.php +++ b/packages/Ecotone/tests/Modelling/Unit/CustomRepositoriesTestCase.php @@ -8,7 +8,7 @@ use Ecotone\Lite\Test\FlowTestSupport; use Ecotone\Messaging\Support\InvalidArgumentException; use Ecotone\Test\LicenceTesting; -use Test\Ecotone\Messaging\BaseEcotoneTest; +use Test\Ecotone\Messaging\BaseEcotoneTestCase; use Test\Ecotone\Modelling\Fixture\CommandHandler\Aggregate\InMemoryStandardRepository; use Test\Ecotone\Modelling\Fixture\CustomRepositories\EventSourcing\Comment; use Test\Ecotone\Modelling\Fixture\CustomRepositories\Standard\Article; @@ -25,7 +25,7 @@ * licence Apache-2.0 * @internal */ -final class CustomRepositoriesTest extends BaseEcotoneTest +final class CustomRepositoriesTestCase extends BaseEcotoneTestCase { public function test_using_custom_repository_for_standard_aggregates() { diff --git a/packages/Ecotone/tests/Modelling/Unit/LoadAggregateServiceBuilderTest.php b/packages/Ecotone/tests/Modelling/Unit/LoadAggregateServiceBuilderTestCase.php similarity index 99% rename from packages/Ecotone/tests/Modelling/Unit/LoadAggregateServiceBuilderTest.php rename to packages/Ecotone/tests/Modelling/Unit/LoadAggregateServiceBuilderTestCase.php index ef84584bc..c4619a2fd 100644 --- a/packages/Ecotone/tests/Modelling/Unit/LoadAggregateServiceBuilderTest.php +++ b/packages/Ecotone/tests/Modelling/Unit/LoadAggregateServiceBuilderTestCase.php @@ -15,7 +15,7 @@ use Ecotone\Modelling\InMemoryEventSourcedRepository; use Ecotone\Modelling\SnapshotEvent; use Ecotone\Test\ComponentTestBuilder; -use Test\Ecotone\Messaging\BaseEcotoneTest; +use Test\Ecotone\Messaging\BaseEcotoneTestCase; use Test\Ecotone\Modelling\Fixture\Annotation\CommandHandler\Aggregate\AggregateWithoutMessageClassesExample; use Test\Ecotone\Modelling\Fixture\IncorrectEventSourcedAggregate\EventSourcingHandlerMethodWithReturnType; use Test\Ecotone\Modelling\Fixture\IncorrectEventSourcedAggregate\EventSourcingHandlerMethodWithWrongParameterCountExample; @@ -39,7 +39,7 @@ * licence Apache-2.0 * @internal */ -class LoadAggregateServiceBuilderTest extends BaseEcotoneTest +class LoadAggregateServiceBuilderTestCase extends BaseEcotoneTestCase { public function test_enriching_command_with_aggregate_if_found() { diff --git a/packages/Laravel/composer.json b/packages/Laravel/composer.json index 4ba7dac32..eda1b64e3 100644 --- a/packages/Laravel/composer.json +++ b/packages/Laravel/composer.json @@ -46,7 +46,7 @@ "behat/behat": "^3.10", "guzzlehttp/psr7": "^2.0", "phpstan/phpstan": "^1.8", - "orchestra/testbench": "^7.6|^8.0", + "orchestra/testbench": "^7.6|^8.0|^9.0", "wikimedia/composer-merge-plugin": "^2.1", "symfony/expression-language": "^6.0|^7.0", "nesbot/carbon": "^2.71", diff --git a/packages/Laravel/phpstan.neon b/packages/Laravel/phpstan.neon index 672e0fa1f..434395365 100644 --- a/packages/Laravel/phpstan.neon +++ b/packages/Laravel/phpstan.neon @@ -1,4 +1,7 @@ parameters: level: 1 paths: - - src \ No newline at end of file + - src + excludePaths: + - src/Config/PDO/Connection.php + - src/Config/PDO/SqlServerConnection.php \ No newline at end of file diff --git a/packages/Laravel/phpunit.xml.dist b/packages/Laravel/phpunit.xml.dist index 7ac973499..4634b2468 100644 --- a/packages/Laravel/phpunit.xml.dist +++ b/packages/Laravel/phpunit.xml.dist @@ -27,6 +27,9 @@ ./src + + ./src/Config/PDO + diff --git a/packages/Laravel/src/Config/LaravelConnectionResolver.php b/packages/Laravel/src/Config/LaravelConnectionResolver.php index ea2f7ccf2..a53734635 100644 --- a/packages/Laravel/src/Config/LaravelConnectionResolver.php +++ b/packages/Laravel/src/Config/LaravelConnectionResolver.php @@ -4,6 +4,8 @@ namespace Ecotone\Laravel\Config; +use Doctrine\DBAL\Connection; +use Doctrine\DBAL\Driver; use Ecotone\Dbal\DbalConnection; use Ecotone\Messaging\Support\InvalidArgumentException; use Illuminate\Support\Facades\DB; @@ -20,6 +22,33 @@ public static function resolveLaravelConnection(LaravelConnectionReference $conn throw new InvalidArgumentException('Dbal Module is not installed. Please install it first to make use of Database capabilities.'); } - return DbalConnection::create(DB::connection($connectionReference->getLaravelConnectionName())->getDoctrineConnection()); + $connection = DB::connection($connectionReference->getLaravelConnectionName()); + if (method_exists($connection, 'getDoctrineConnection')) { + $doctrineConnection = $connection->getDoctrineConnection(); + } else { + $driver = self::createDriver($connection->getDriverName()); + + $doctrineConnection = new Connection(array_filter([ + 'pdo' => $connection->getPdo(), + 'dbname' => $connection->getDatabaseName(), + 'driver' => $driver->getName(), + 'serverVersion' => $connection->getConfig('server_version'), + ]), $driver); + } + + return DbalConnection::create($doctrineConnection); + } + + private static function createDriver($driverName): Driver + { + $className = match ($driverName) { + 'pgsql' => 'PostgresDriver', + 'mysql' => 'MySqlDriver', + 'sqlite' => 'SqliteDriver', + 'sqlsrv' => 'SqlServerDriver', + }; + $className = '\Ecotone\Laravel\Config\PDO\\' . $className; + + return new $className; } } diff --git a/packages/Laravel/src/Config/PDO/Concerns/ConnectsToDatabase.php b/packages/Laravel/src/Config/PDO/Concerns/ConnectsToDatabase.php new file mode 100644 index 000000000..c9a322dcc --- /dev/null +++ b/packages/Laravel/src/Config/PDO/Concerns/ConnectsToDatabase.php @@ -0,0 +1,41 @@ +connection = $connection; + } + + /** + * Execute an SQL statement. + * + * @param string $statement + * @return int + */ + public function exec(string $statement): int + { + try { + $result = $this->connection->exec($statement); + + \assert($result !== false); + + return $result; + } catch (PDOException $exception) { + throw Exception::new($exception); + } + } + + /** + * Prepare a new SQL statement. + * + * @param string $sql + * @return \Doctrine\DBAL\Driver\Statement + * + * @throws \Doctrine\DBAL\Driver\PDO\Exception + */ + public function prepare(string $sql): StatementInterface + { + try { + return $this->createStatement( + $this->connection->prepare($sql) + ); + } catch (PDOException $exception) { + throw Exception::new($exception); + } + } + + /** + * Execute a new query against the connection. + * + * @param string $sql + * @return \Doctrine\DBAL\Driver\Result + */ + public function query(string $sql): ResultInterface + { + try { + $stmt = $this->connection->query($sql); + + \assert($stmt instanceof PDOStatement); + + return new Result($stmt); + } catch (PDOException $exception) { + throw Exception::new($exception); + } + } + + /** + * Get the last insert ID. + * + * @param string|null $name + * @return mixed + * + * @throws \Doctrine\DBAL\Driver\PDO\Exception + */ + public function lastInsertId($name = null) + { + try { + if ($name === null) { + return $this->connection->lastInsertId(); + } + + return $this->connection->lastInsertId($name); + } catch (PDOException $exception) { + throw Exception::new($exception); + } + } + + /** + * Create a new statement instance. + * + * @param \PDOStatement $stmt + * @return \Doctrine\DBAL\Driver\PDO\Statement + */ + protected function createStatement(PDOStatement $stmt): Statement + { + return new Statement($stmt); + } + + /** + * Begin a new database transaction. + * + * @return bool + */ + public function beginTransaction() + { + return $this->connection->beginTransaction(); + } + + /** + * Commit a database transaction. + * + * @return bool + */ + public function commit() + { + return $this->connection->commit(); + } + + /** + * Rollback a database transaction. + * + * @return bool + */ + public function rollBack() + { + return $this->connection->rollBack(); + } + + /** + * Wrap quotes around the given input. + * + * @param string $input + * @param string $type + * @return string + */ + public function quote($input, $type = ParameterType::STRING) + { + return $this->connection->quote($input, $type); + } + + /** + * Get the server version for the connection. + * + * @return string + */ + public function getServerVersion() + { + return $this->connection->getAttribute(PDO::ATTR_SERVER_VERSION); + } + + /** + * Get the wrapped PDO connection. + * + * @return \PDO + */ + public function getWrappedConnection(): PDO + { + return $this->connection; + } +} diff --git a/packages/Laravel/src/Config/PDO/MySqlDriver.php b/packages/Laravel/src/Config/PDO/MySqlDriver.php new file mode 100644 index 000000000..97574b4c1 --- /dev/null +++ b/packages/Laravel/src/Config/PDO/MySqlDriver.php @@ -0,0 +1,30 @@ +connection = $connection; + } + + /** + * Prepare a new SQL statement. + * + * @param string $sql + * @return \Doctrine\DBAL\Driver\Statement + */ + public function prepare(string $sql): StatementInterface + { + return new Statement( + $this->connection->prepare($sql) + ); + } + + /** + * Execute a new query against the connection. + * + * @param string $sql + * @return \Doctrine\DBAL\Driver\Result + */ + public function query(string $sql): Result + { + return $this->connection->query($sql); + } + + /** + * Execute an SQL statement. + * + * @param string $statement + * @return int + */ + public function exec(string $statement): int + { + return $this->connection->exec($statement); + } + + /** + * Get the last insert ID. + * + * @param string|null $name + * @return mixed + */ + public function lastInsertId($name = null) + { + if ($name === null) { + return $this->connection->lastInsertId($name); + } + + return $this->prepare('SELECT CONVERT(VARCHAR(MAX), current_value) FROM sys.sequences WHERE name = ?') + ->execute([$name]) + ->fetchOne(); + } + + /** + * Begin a new database transaction. + * + * @return bool + */ + public function beginTransaction() + { + return $this->connection->beginTransaction(); + } + + /** + * Commit a database transaction. + * + * @return bool + */ + public function commit() + { + return $this->connection->commit(); + } + + /** + * Rollback a database transaction. + * + * @return bool + */ + public function rollBack() + { + return $this->connection->rollBack(); + } + + /** + * Wrap quotes around the given input. + * + * @param string $value + * @param int $type + * @return string + */ + public function quote($value, $type = ParameterType::STRING) + { + $val = $this->connection->quote($value, $type); + + // Fix for a driver version terminating all values with null byte... + if (\is_string($val) && str_contains($val, "\0")) { + $val = \substr($val, 0, -1); + } + + return $val; + } + + /** + * Get the server version for the connection. + * + * @return string + */ + public function getServerVersion() + { + return $this->connection->getServerVersion(); + } + + /** + * Get the wrapped PDO connection. + * + * @return \PDO + */ + public function getWrappedConnection(): PDO + { + return $this->connection->getWrappedConnection(); + } +} diff --git a/packages/Laravel/src/Config/PDO/SqlServerDriver.php b/packages/Laravel/src/Config/PDO/SqlServerDriver.php new file mode 100644 index 000000000..28316514e --- /dev/null +++ b/packages/Laravel/src/Config/PDO/SqlServerDriver.php @@ -0,0 +1,43 @@ +getDoctrineConnection()->close(); - DB::connection('tenant_b_connection')->getDoctrineConnection()->close(); + DB::connection('tenant_a_connection')->disconnect(); + DB::connection('tenant_b_connection')->disconnect(); } public function test_run_message_handlers_for_multi_tenant_connection(): void diff --git a/packages/Laravel/tests/MultiTenant/boostrap.php b/packages/Laravel/tests/MultiTenant/boostrap.php index c516132c5..53232bce2 100644 --- a/packages/Laravel/tests/MultiTenant/boostrap.php +++ b/packages/Laravel/tests/MultiTenant/boostrap.php @@ -1,14 +1,13 @@ getDoctrineConnection()); - migrate($tenantBConnection->getDoctrineConnection()); + migrate($tenantAConnection->getPdo()); + migrate($tenantBConnection->getPdo()); foreach (['tenant_a_connection', 'tenant_b_connection'] as $connectionName) { if (Schema::connection($connectionName)->hasTable('jobs')) { @@ -27,16 +26,18 @@ function runMigrationForTenants(LaravelConnection $tenantAConnection, LaravelCon } } -function migrate(Connection $connection): void +function migrate(PDO $pdo): void { - $connection->executeStatement(<<executeStatement(<<exec(<<<'SQL' + DROP TABLE IF EXISTS persons + SQL + ); + $pdo->exec(<<<'SQL' + CREATE TABLE persons ( + customer_id INTEGER PRIMARY KEY, + name VARCHAR(255), + is_active bool DEFAULT true + ) + SQL + ); } diff --git a/packages/LiteApplication/composer.json b/packages/LiteApplication/composer.json index b82ce0457..0fdc9a5aa 100644 --- a/packages/LiteApplication/composer.json +++ b/packages/LiteApplication/composer.json @@ -45,7 +45,7 @@ "behat/behat": "^3.10", "guzzlehttp/psr7": "^2.0", "phpstan/phpstan": "^1.8", - "orchestra/testbench": "^7.6|^8.0", + "orchestra/testbench": "^7.6|^8.0|^9.0", "wikimedia/composer-merge-plugin": "^2.1" }, "extra": { diff --git a/packages/OpenTelemetry/tests/Integration/CorrelatedHeadersPropagationTest.php b/packages/OpenTelemetry/tests/Integration/CorrelatedHeadersPropagationTestCase.php similarity index 95% rename from packages/OpenTelemetry/tests/Integration/CorrelatedHeadersPropagationTest.php rename to packages/OpenTelemetry/tests/Integration/CorrelatedHeadersPropagationTestCase.php index ba7db2fba..67aedf39d 100644 --- a/packages/OpenTelemetry/tests/Integration/CorrelatedHeadersPropagationTest.php +++ b/packages/OpenTelemetry/tests/Integration/CorrelatedHeadersPropagationTestCase.php @@ -31,7 +31,7 @@ * licence Apache-2.0 * @internal */ -final class CorrelatedHeadersPropagationTest extends TracingTest +final class CorrelatedHeadersPropagationTestCase extends TracingTestCase { public function test_tracing_with_single_levels_of_nesting() { @@ -43,7 +43,7 @@ public function test_tracing_with_single_levels_of_nesting() EcotoneLite::bootstrapFlowTesting( [User::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter)], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter)], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -72,7 +72,7 @@ public function test_tracing_with_two_levels_of_nesting() EcotoneLite::bootstrapFlowTesting( [User::class, MerchantSubscriberOne::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter), new MerchantSubscriberOne()], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter), new MerchantSubscriberOne()], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -104,7 +104,7 @@ public function test_tracing_with_three_levels_of_nesting() EcotoneLite::bootstrapFlowTesting( [Merchant::class, User::class, MerchantSubscriberOne::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter), new MerchantSubscriberOne()], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter), new MerchantSubscriberOne()], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -139,7 +139,7 @@ public function test_tracing_same_message_for_asynchronous_scenario() EcotoneLite::bootstrapFlowTesting( [\Test\Ecotone\OpenTelemetry\Fixture\AsynchronousFlow\User::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter)], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter)], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE, ModulePackageList::ASYNCHRONOUS_PACKAGE])) ->withExtensionObjects([ @@ -195,7 +195,7 @@ public function test_tracing_with_exception() try { EcotoneLite::bootstrapFlowTesting( [\Test\Ecotone\OpenTelemetry\Fixture\ExceptionFlow\User::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter)], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter)], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) diff --git a/packages/OpenTelemetry/tests/Integration/TracingTest.php b/packages/OpenTelemetry/tests/Integration/TracingTestCase.php similarity index 99% rename from packages/OpenTelemetry/tests/Integration/TracingTest.php rename to packages/OpenTelemetry/tests/Integration/TracingTestCase.php index 5c1bcff27..3863a85dd 100644 --- a/packages/OpenTelemetry/tests/Integration/TracingTest.php +++ b/packages/OpenTelemetry/tests/Integration/TracingTestCase.php @@ -17,7 +17,7 @@ /** * licence Apache-2.0 */ -abstract class TracingTest extends TestCase +abstract class TracingTestCase extends TestCase { public static function prepareTracer(SpanExporterInterface $exporter): TracerProviderInterface { diff --git a/packages/OpenTelemetry/tests/Integration/TracingTreeTest.php b/packages/OpenTelemetry/tests/Integration/TracingTreeTestCase.php similarity index 95% rename from packages/OpenTelemetry/tests/Integration/TracingTreeTest.php rename to packages/OpenTelemetry/tests/Integration/TracingTreeTestCase.php index 3ebf1c711..ce4e711e1 100644 --- a/packages/OpenTelemetry/tests/Integration/TracingTreeTest.php +++ b/packages/OpenTelemetry/tests/Integration/TracingTreeTestCase.php @@ -42,7 +42,7 @@ * licence Apache-2.0 * @internal */ -final class TracingTreeTest extends TracingTest +final class TracingTreeTestCase extends TracingTestCase { public function test_tracing_tree_with_single_levels_of_nesting() { @@ -50,7 +50,7 @@ public function test_tracing_tree_with_single_levels_of_nesting() EcotoneLite::bootstrapFlowTesting( [User::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter)], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter)], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -78,7 +78,7 @@ public function test_tracing_tree_with_two_levels_of_nesting_and_message_handler EcotoneLite::bootstrapFlowTesting( [ExampleMessageHandler::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter), ExampleMessageHandler::class => new ExampleMessageHandler()], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter), ExampleMessageHandler::class => new ExampleMessageHandler()], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -110,7 +110,7 @@ public function test_tracing_scheduled_handler() EcotoneLite::bootstrapFlowTesting( [ScheduledHandler::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter), ScheduledHandler::class => new ScheduledHandler()], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter), ScheduledHandler::class => new ScheduledHandler()], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -137,7 +137,7 @@ public function test_tracing_workflow_scheduled_handler() EcotoneLite::bootstrapFlowTesting( [WorkflowScheduledHandler::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter), WorkflowScheduledHandler::class => new WorkflowScheduledHandler()], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter), WorkflowScheduledHandler::class => new WorkflowScheduledHandler()], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -174,7 +174,7 @@ public function test_no_tracing_when_there_is_nothing_to_trace() EcotoneLite::bootstrapFlowTesting( [WorkflowScheduledHandler::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter), WorkflowScheduledHandler::class => new WorkflowScheduledHandler()], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter), WorkflowScheduledHandler::class => new WorkflowScheduledHandler()], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -314,7 +314,7 @@ public function test_separate_traces() EcotoneLite::bootstrapFlowTesting( [User::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter)], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter)], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -352,7 +352,7 @@ public function test_tracing_with_two_levels_of_nesting() EcotoneLite::bootstrapFlowTesting( [User::class, MerchantSubscriberOne::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter), new MerchantSubscriberOne()], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter), new MerchantSubscriberOne()], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -390,7 +390,7 @@ public function test_tracing_with_two_levels_of_nesting_and_two_branches_on_same EcotoneLite::bootstrapFlowTesting( [User::class, MerchantSubscriberOne::class, MerchantSubscriberTwo::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter), new MerchantSubscriberOne(), new MerchantSubscriberTwo()], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter), new MerchantSubscriberOne(), new MerchantSubscriberTwo()], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -442,7 +442,7 @@ public function test_tracing_with_three_levels_of_nesting() EcotoneLite::bootstrapFlowTesting( [Merchant::class, User::class, MerchantSubscriberOne::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter), new MerchantSubscriberOne()], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter), new MerchantSubscriberOne()], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE])) ) @@ -490,7 +490,7 @@ public function test_tracing_with_asynchronous_handler() $ecotoneLite = EcotoneLite::bootstrapFlowTesting( [\Test\Ecotone\OpenTelemetry\Fixture\AsynchronousFlow\User::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter)], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter)], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE, ModulePackageList::ASYNCHRONOUS_PACKAGE])) ->withExtensionObjects([ @@ -584,7 +584,7 @@ public function test_two_traces_with_asynchronous_handlers() $ecotoneLite = EcotoneLite::bootstrapFlowTesting( [\Test\Ecotone\OpenTelemetry\Fixture\AsynchronousFlow\User::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter)], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter)], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE, ModulePackageList::ASYNCHRONOUS_PACKAGE])) ->withExtensionObjects([ @@ -648,7 +648,7 @@ public function test_passing_user_specific_headers() $ecotoneLite = EcotoneLite::bootstrapFlowTesting( [\Test\Ecotone\OpenTelemetry\Fixture\AsynchronousFlow\User::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter)], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter)], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE, ModulePackageList::ASYNCHRONOUS_PACKAGE])) ->withExtensionObjects([ @@ -708,7 +708,7 @@ public function test_user_land_metadata_should_be_skipped_in_case_is_not_scalar( EcotoneLite::bootstrapFlowTesting( [\Test\Ecotone\OpenTelemetry\Fixture\AsynchronousFlow\User::class], - [TracerProviderInterface::class => TracingTest::prepareTracer($exporter)], + [TracerProviderInterface::class => TracingTestCase::prepareTracer($exporter)], ServiceConfiguration::createWithDefaults() ->withSkippedModulePackageNames(ModulePackageList::allPackagesExcept([ModulePackageList::TRACING_PACKAGE, ModulePackageList::ASYNCHRONOUS_PACKAGE])) ->withExtensionObjects([ diff --git a/packages/Redis/tests/AbstractConnectionTest.php b/packages/Redis/tests/ConnectionTestCase.php similarity index 92% rename from packages/Redis/tests/AbstractConnectionTest.php rename to packages/Redis/tests/ConnectionTestCase.php index a73bb08f9..c3917360e 100644 --- a/packages/Redis/tests/AbstractConnectionTest.php +++ b/packages/Redis/tests/ConnectionTestCase.php @@ -11,7 +11,7 @@ /** * licence Apache-2.0 */ -abstract class AbstractConnectionTest extends TestCase +abstract class ConnectionTestCase extends TestCase { private ?RedisConnectionFactory $connectionFactory = null; diff --git a/packages/Redis/tests/Integration/ConsumerAndPublisherTest.php b/packages/Redis/tests/Integration/ConsumerAndPublisherTestCase.php similarity index 94% rename from packages/Redis/tests/Integration/ConsumerAndPublisherTest.php rename to packages/Redis/tests/Integration/ConsumerAndPublisherTestCase.php index 4b816fb59..ef72630ae 100644 --- a/packages/Redis/tests/Integration/ConsumerAndPublisherTest.php +++ b/packages/Redis/tests/Integration/ConsumerAndPublisherTestCase.php @@ -12,7 +12,7 @@ use Ecotone\Redis\Configuration\RedisMessagePublisherConfiguration; use Enqueue\Redis\RedisConnectionFactory; use Ramsey\Uuid\Uuid; -use Test\Ecotone\Redis\AbstractConnectionTest; +use Test\Ecotone\Redis\ConnectionTestCase; use Test\Ecotone\Redis\Fixture\RedisConsumer\RedisConsumerExample; /** @@ -22,7 +22,7 @@ * licence Apache-2.0 * @internal */ -final class ConsumerAndPublisherTest extends AbstractConnectionTest +final class ConsumerAndPublisherTestCase extends ConnectionTestCase { public function testing_sending_message_using_publisher_and_receiving_using_consumer(): void { diff --git a/packages/Redis/tests/Integration/RedisBackedMessageChannelTest.php b/packages/Redis/tests/Integration/RedisBackedMessageChannelTestCase.php similarity index 97% rename from packages/Redis/tests/Integration/RedisBackedMessageChannelTest.php rename to packages/Redis/tests/Integration/RedisBackedMessageChannelTestCase.php index 7bc1901a8..06827e3f7 100644 --- a/packages/Redis/tests/Integration/RedisBackedMessageChannelTest.php +++ b/packages/Redis/tests/Integration/RedisBackedMessageChannelTestCase.php @@ -17,7 +17,7 @@ use Enqueue\Redis\RedisConnectionFactory; use Enqueue\Redis\RedisDestination; use Ramsey\Uuid\Uuid; -use Test\Ecotone\Redis\AbstractConnectionTest; +use Test\Ecotone\Redis\ConnectionTestCase; use Test\Ecotone\Redis\Fixture\AsynchronousHandler\OrderService; use Test\Ecotone\Redis\Fixture\RedisConsumer\RedisAsyncConsumerExample; @@ -28,7 +28,7 @@ * licence Apache-2.0 * @internal */ -final class RedisBackedMessageChannelTest extends AbstractConnectionTest +final class RedisBackedMessageChannelTestCase extends ConnectionTestCase { public function test_sending_and_receiving_message(): void { diff --git a/packages/Sqs/tests/AbstractConnectionTest.php b/packages/Sqs/tests/ConnectionTestCase.php similarity index 89% rename from packages/Sqs/tests/AbstractConnectionTest.php rename to packages/Sqs/tests/ConnectionTestCase.php index 2c4e866c3..bc0dfc763 100644 --- a/packages/Sqs/tests/AbstractConnectionTest.php +++ b/packages/Sqs/tests/ConnectionTestCase.php @@ -10,7 +10,7 @@ /** * licence Apache-2.0 */ -abstract class AbstractConnectionTest extends TestCase +abstract class ConnectionTestCase extends TestCase { private ?SqsConnectionFactory $connectionFactory = null; @@ -38,7 +38,7 @@ public static function getConnection(): SqsConnectionFactory public static function cleanUpSqs(): void { - $context = AbstractConnectionTest::getConnection()->createContext(); + $context = ConnectionTestCase::getConnection()->createContext(); foreach (['async', 'sqs'] as $queue) { try { diff --git a/packages/Sqs/tests/Integration/ConsumerAndPublisherTest.php b/packages/Sqs/tests/Integration/ConsumerAndPublisherTestCase.php similarity index 94% rename from packages/Sqs/tests/Integration/ConsumerAndPublisherTest.php rename to packages/Sqs/tests/Integration/ConsumerAndPublisherTestCase.php index f6e5e786f..da3ce4dcd 100644 --- a/packages/Sqs/tests/Integration/ConsumerAndPublisherTest.php +++ b/packages/Sqs/tests/Integration/ConsumerAndPublisherTestCase.php @@ -12,7 +12,7 @@ use Ecotone\Sqs\Configuration\SqsMessagePublisherConfiguration; use Enqueue\Sqs\SqsConnectionFactory; use Ramsey\Uuid\Uuid; -use Test\Ecotone\Sqs\AbstractConnectionTest; +use Test\Ecotone\Sqs\ConnectionTestCase; use Test\Ecotone\Sqs\Fixture\SqsConsumer\SqsConsumerExample; /** @@ -22,7 +22,7 @@ * licence Apache-2.0 * @internal */ -final class ConsumerAndPublisherTest extends AbstractConnectionTest +final class ConsumerAndPublisherTestCase extends ConnectionTestCase { public function testing_sending_message_using_publisher_and_receiving_using_consumer() { diff --git a/packages/Sqs/tests/Integration/SqsBackedMessageChannelTest.php b/packages/Sqs/tests/Integration/SqsBackedMessageChannelTestCase.php similarity index 97% rename from packages/Sqs/tests/Integration/SqsBackedMessageChannelTest.php rename to packages/Sqs/tests/Integration/SqsBackedMessageChannelTestCase.php index 2cb5cb823..50e9f8087 100644 --- a/packages/Sqs/tests/Integration/SqsBackedMessageChannelTest.php +++ b/packages/Sqs/tests/Integration/SqsBackedMessageChannelTestCase.php @@ -17,7 +17,7 @@ use Ecotone\Test\LoggerExample; use Enqueue\Sqs\SqsConnectionFactory; use Ramsey\Uuid\Uuid; -use Test\Ecotone\Sqs\AbstractConnectionTest; +use Test\Ecotone\Sqs\ConnectionTestCase; use Test\Ecotone\Sqs\Fixture\AsynchronousHandler\OrderService; use Test\Ecotone\Sqs\Fixture\SqsConsumer\SqsAsyncConsumerExample; @@ -28,7 +28,7 @@ * licence Apache-2.0 * @internal */ -final class SqsBackedMessageChannelTest extends AbstractConnectionTest +final class SqsBackedMessageChannelTestCase extends ConnectionTestCase { public function test_sending_and_receiving_message() { diff --git a/phpstan.neon b/phpstan.neon index 01121e8de..bcca7ab50 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -12,3 +12,6 @@ parameters: - packages/Symfony/DependencyInjection - packages/OpenTelemetry/src - packages/Kafka/src + excludePaths: + - packages/Laravel/src/Config/PDO/Connection.php + - packages/Laravel/src/Config/PDO/SqlServerConnection.php diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 9dbc8d377..f66d2c039 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -26,6 +26,7 @@ + diff --git a/quickstart-examples/ConsoleCommand/Symfony/composer.json b/quickstart-examples/ConsoleCommand/Symfony/composer.json index d88075a6a..924babe93 100644 --- a/quickstart-examples/ConsoleCommand/Symfony/composer.json +++ b/quickstart-examples/ConsoleCommand/Symfony/composer.json @@ -15,7 +15,7 @@ "require": { "ecotone/symfony-starter": "^1.1.0", "symfony/orm-pack": "^2.4", - "symfony/yaml": "^7.0" + "symfony/yaml": "^6.0|^7.0" }, "require-dev": { "doctrine/orm": "^2.11|^3.0", diff --git a/quickstart-examples/ConsoleCommand/Symfony/config/services.php b/quickstart-examples/ConsoleCommand/Symfony/config/services.php index 17ca72853..1527417a4 100644 --- a/quickstart-examples/ConsoleCommand/Symfony/config/services.php +++ b/quickstart-examples/ConsoleCommand/Symfony/config/services.php @@ -1,17 +1,6 @@ services(); diff --git a/quickstart-examples/MultiTenant/Laravel/boostrap.php b/quickstart-examples/MultiTenant/Laravel/boostrap.php index b0423eb7f..e05f0efeb 100644 --- a/quickstart-examples/MultiTenant/Laravel/boostrap.php +++ b/quickstart-examples/MultiTenant/Laravel/boostrap.php @@ -1,6 +1,5 @@ getDoctrineConnection()); - migrate($tenantBConnection->getDoctrineConnection()); + migrate($tenantAConnection->getPdo()); + migrate($tenantBConnection->getPdo()); } -function migrate(Connection $connection): void +function migrate(PDO $pdo): void { - $connection->executeStatement(<<exec(<<<'SQL' DROP TABLE IF EXISTS persons -SQL); - $connection->executeStatement(<<exec(<<<'SQL' + CREATE TABLE persons ( + customer_id INTEGER PRIMARY KEY, + name VARCHAR(255), + is_active bool DEFAULT true + ) + SQL + ); +} diff --git a/quickstart-examples/MultiTenant/Symfony/Aggregate/composer.json b/quickstart-examples/MultiTenant/Symfony/Aggregate/composer.json index 7b859e3e9..53f2ea02a 100644 --- a/quickstart-examples/MultiTenant/Symfony/Aggregate/composer.json +++ b/quickstart-examples/MultiTenant/Symfony/Aggregate/composer.json @@ -17,7 +17,7 @@ "symfony/expression-language": "^6.0|^7.0", "symfony/framework-bundle": "^5.4|^6.0|^7.0", "symfony/orm-pack": "^2.4", - "symfony/yaml": "^7.0" + "symfony/yaml": "^6.0|^7.0" }, "require-dev": { "doctrine/orm": "^2.11|^3.0", diff --git a/quickstart-examples/MultiTenant/Symfony/Aggregate/config/services.php b/quickstart-examples/MultiTenant/Symfony/Aggregate/config/services.php index 17ca72853..1527417a4 100644 --- a/quickstart-examples/MultiTenant/Symfony/Aggregate/config/services.php +++ b/quickstart-examples/MultiTenant/Symfony/Aggregate/config/services.php @@ -1,17 +1,6 @@ services(); diff --git a/quickstart-examples/MultiTenant/Symfony/AsynchronousEvents/composer.json b/quickstart-examples/MultiTenant/Symfony/AsynchronousEvents/composer.json index 1ddc94c4e..d645539da 100644 --- a/quickstart-examples/MultiTenant/Symfony/AsynchronousEvents/composer.json +++ b/quickstart-examples/MultiTenant/Symfony/AsynchronousEvents/composer.json @@ -17,8 +17,8 @@ "symfony/expression-language": "^6.0|^7.0", "symfony/framework-bundle": "^5.4|^6.0|^7.0", "symfony/orm-pack": "^2.4", - "symfony/process": "^7.0", - "symfony/yaml": "^7.0" + "symfony/process": "^6.0|^7.0", + "symfony/yaml": "^6.0|^7.0" }, "require-dev": { "doctrine/orm": "^2.11|^3.0", diff --git a/quickstart-examples/MultiTenant/Symfony/AsynchronousEvents/config/services.php b/quickstart-examples/MultiTenant/Symfony/AsynchronousEvents/config/services.php index 17ca72853..1527417a4 100644 --- a/quickstart-examples/MultiTenant/Symfony/AsynchronousEvents/config/services.php +++ b/quickstart-examples/MultiTenant/Symfony/AsynchronousEvents/config/services.php @@ -1,17 +1,6 @@ services(); diff --git a/quickstart-examples/MultiTenant/Symfony/EventSourcing/composer.json b/quickstart-examples/MultiTenant/Symfony/EventSourcing/composer.json index bd3df1553..1150ef349 100644 --- a/quickstart-examples/MultiTenant/Symfony/EventSourcing/composer.json +++ b/quickstart-examples/MultiTenant/Symfony/EventSourcing/composer.json @@ -18,7 +18,7 @@ "symfony/expression-language": "^6.0|^7.0", "symfony/framework-bundle": "^5.4|^6.0|^7.0", "symfony/orm-pack": "^2.4", - "symfony/yaml": "^7.0" + "symfony/yaml": "^6.0|^7.0" }, "require-dev": { "doctrine/orm": "^2.11|^3.0", diff --git a/quickstart-examples/MultiTenant/Symfony/EventSourcing/config/services.php b/quickstart-examples/MultiTenant/Symfony/EventSourcing/config/services.php index 17ca72853..1527417a4 100644 --- a/quickstart-examples/MultiTenant/Symfony/EventSourcing/config/services.php +++ b/quickstart-examples/MultiTenant/Symfony/EventSourcing/config/services.php @@ -1,17 +1,6 @@ services(); diff --git a/quickstart-examples/MultiTenant/Symfony/Events/composer.json b/quickstart-examples/MultiTenant/Symfony/Events/composer.json index 7b859e3e9..53f2ea02a 100644 --- a/quickstart-examples/MultiTenant/Symfony/Events/composer.json +++ b/quickstart-examples/MultiTenant/Symfony/Events/composer.json @@ -17,7 +17,7 @@ "symfony/expression-language": "^6.0|^7.0", "symfony/framework-bundle": "^5.4|^6.0|^7.0", "symfony/orm-pack": "^2.4", - "symfony/yaml": "^7.0" + "symfony/yaml": "^6.0|^7.0" }, "require-dev": { "doctrine/orm": "^2.11|^3.0", diff --git a/quickstart-examples/MultiTenant/Symfony/Events/config/services.php b/quickstart-examples/MultiTenant/Symfony/Events/config/services.php index 17ca72853..1527417a4 100644 --- a/quickstart-examples/MultiTenant/Symfony/Events/config/services.php +++ b/quickstart-examples/MultiTenant/Symfony/Events/config/services.php @@ -1,17 +1,6 @@ services(); diff --git a/quickstart-examples/MultiTenant/Symfony/MessageBus/composer.json b/quickstart-examples/MultiTenant/Symfony/MessageBus/composer.json index 7b859e3e9..53f2ea02a 100644 --- a/quickstart-examples/MultiTenant/Symfony/MessageBus/composer.json +++ b/quickstart-examples/MultiTenant/Symfony/MessageBus/composer.json @@ -17,7 +17,7 @@ "symfony/expression-language": "^6.0|^7.0", "symfony/framework-bundle": "^5.4|^6.0|^7.0", "symfony/orm-pack": "^2.4", - "symfony/yaml": "^7.0" + "symfony/yaml": "^6.0|^7.0" }, "require-dev": { "doctrine/orm": "^2.11|^3.0", diff --git a/quickstart-examples/MultiTenant/Symfony/MessageBus/config/services.php b/quickstart-examples/MultiTenant/Symfony/MessageBus/config/services.php index 17ca72853..1527417a4 100644 --- a/quickstart-examples/MultiTenant/Symfony/MessageBus/config/services.php +++ b/quickstart-examples/MultiTenant/Symfony/MessageBus/config/services.php @@ -1,17 +1,6 @@ services();