From 69cf72021abe1927bc3a50f5636839811d699bf3 Mon Sep 17 00:00:00 2001 From: Oleksii Bulba Date: Sat, 5 Aug 2023 11:00:47 +0300 Subject: [PATCH] [PluginTemporal] Prepare for 2.x: - Moved all classes to root folder; --- {src/Activity => Activity}/ActivityInterface.php | 0 .../Factory/ActivityStubFactory.php | 0 .../Factory/ActivityStubFactoryInterface.php | 0 .../Client/WorkflowClientConfiguration.php | 2 +- .../Client/WorkflowClientConfigurationInterface.php | 0 .../RoadRunner/RoadRunnerConfiguration.php | 2 +- .../RoadRunner/RoadRunnerConfigurationInterface.php | 0 .../TemporalPluginConfigurationInterface.php | 0 .../Worker/WorkflowWorkerConfiguration.php | 2 +- .../Worker/WorkflowWorkerConfigurationInterface.php | 0 {src/Facade => Facade}/TemporalFacade.php | 0 {src/Facade => Facade}/TemporalFacadeInterface.php | 0 .../Expander/Environment/EnvironmentExpander.php | 0 .../Environment/EnvironmentExpanderFactory.php | 0 .../EnvironmentExpanderFactoryInterface.php | 0 .../Environment/EnvironmentExpanderInterface.php | 0 src/TemporalPlugin.php => TemporalPlugin.php | 8 ++++---- ...figuration.php => TemporalPluginConfiguration.php | 2 +- {src/Worker => Worker}/Expander/WorkerExpander.php | 0 .../Expander/WorkerExpanderFactory.php | 0 .../Expander/WorkerExpanderFactoryInterface.php | 0 .../Expander/WorkerExpanderInterface.php | 0 {src/Worker => Worker}/Factory/WorkerFactory.php | 0 .../Factory/WorkerFactoryInterface.php | 0 .../Client/Factory/ClientFactory.php | 0 .../Client/Factory/ClientFactoryInterface.php | 0 .../Client/Repository/ClientRepository.php | 0 .../Client/Repository/ClientRepositoryFactory.php | 0 .../Repository/ClientRepositoryFactoryInterface.php | 0 .../Client/Repository/ClientRepositoryInterface.php | 0 .../DataConverter/DataConverterFactory.php | 0 .../DataConverter/DataConverterFactoryInterface.php | 0 .../Payload/DtoPayloadDataConverter.php | 0 {src/Workflow => Workflow}/WorkflowInterface.php | 0 composer.json | 12 ++++-------- 35 files changed, 12 insertions(+), 16 deletions(-) rename {src/Activity => Activity}/ActivityInterface.php (100%) rename {src/Activity => Activity}/Factory/ActivityStubFactory.php (100%) rename {src/Activity => Activity}/Factory/ActivityStubFactoryInterface.php (100%) rename {src/Configuration => Configuration}/Client/WorkflowClientConfiguration.php (88%) rename {src/Configuration => Configuration}/Client/WorkflowClientConfigurationInterface.php (100%) rename {src/Configuration => Configuration}/RoadRunner/RoadRunnerConfiguration.php (91%) rename {src/Configuration => Configuration}/RoadRunner/RoadRunnerConfigurationInterface.php (100%) rename {src/Configuration => Configuration}/TemporalPluginConfigurationInterface.php (100%) rename {src/Configuration => Configuration}/Worker/WorkflowWorkerConfiguration.php (93%) rename {src/Configuration => Configuration}/Worker/WorkflowWorkerConfigurationInterface.php (100%) rename {src/Facade => Facade}/TemporalFacade.php (100%) rename {src/Facade => Facade}/TemporalFacadeInterface.php (100%) rename {src/RoadRunner => RoadRunner}/Expander/Environment/EnvironmentExpander.php (100%) rename {src/RoadRunner => RoadRunner}/Expander/Environment/EnvironmentExpanderFactory.php (100%) rename {src/RoadRunner => RoadRunner}/Expander/Environment/EnvironmentExpanderFactoryInterface.php (100%) rename {src/RoadRunner => RoadRunner}/Expander/Environment/EnvironmentExpanderInterface.php (100%) rename src/TemporalPlugin.php => TemporalPlugin.php (95%) rename src/TemporalPluginConfiguration.php => TemporalPluginConfiguration.php (96%) rename {src/Worker => Worker}/Expander/WorkerExpander.php (100%) rename {src/Worker => Worker}/Expander/WorkerExpanderFactory.php (100%) rename {src/Worker => Worker}/Expander/WorkerExpanderFactoryInterface.php (100%) rename {src/Worker => Worker}/Expander/WorkerExpanderInterface.php (100%) rename {src/Worker => Worker}/Factory/WorkerFactory.php (100%) rename {src/Worker => Worker}/Factory/WorkerFactoryInterface.php (100%) rename {src/Workflow => Workflow}/Client/Factory/ClientFactory.php (100%) rename {src/Workflow => Workflow}/Client/Factory/ClientFactoryInterface.php (100%) rename {src/Workflow => Workflow}/Client/Repository/ClientRepository.php (100%) rename {src/Workflow => Workflow}/Client/Repository/ClientRepositoryFactory.php (100%) rename {src/Workflow => Workflow}/Client/Repository/ClientRepositoryFactoryInterface.php (100%) rename {src/Workflow => Workflow}/Client/Repository/ClientRepositoryInterface.php (100%) rename {src/Workflow => Workflow}/DataConverter/DataConverterFactory.php (100%) rename {src/Workflow => Workflow}/DataConverter/DataConverterFactoryInterface.php (100%) rename {src/Workflow => Workflow}/DataConverter/Payload/DtoPayloadDataConverter.php (100%) rename {src/Workflow => Workflow}/WorkflowInterface.php (100%) diff --git a/src/Activity/ActivityInterface.php b/Activity/ActivityInterface.php similarity index 100% rename from src/Activity/ActivityInterface.php rename to Activity/ActivityInterface.php diff --git a/src/Activity/Factory/ActivityStubFactory.php b/Activity/Factory/ActivityStubFactory.php similarity index 100% rename from src/Activity/Factory/ActivityStubFactory.php rename to Activity/Factory/ActivityStubFactory.php diff --git a/src/Activity/Factory/ActivityStubFactoryInterface.php b/Activity/Factory/ActivityStubFactoryInterface.php similarity index 100% rename from src/Activity/Factory/ActivityStubFactoryInterface.php rename to Activity/Factory/ActivityStubFactoryInterface.php diff --git a/src/Configuration/Client/WorkflowClientConfiguration.php b/Configuration/Client/WorkflowClientConfiguration.php similarity index 88% rename from src/Configuration/Client/WorkflowClientConfiguration.php rename to Configuration/Client/WorkflowClientConfiguration.php index 2983714..b9e099e 100644 --- a/src/Configuration/Client/WorkflowClientConfiguration.php +++ b/Configuration/Client/WorkflowClientConfiguration.php @@ -2,7 +2,7 @@ namespace Micro\Plugin\Temporal\Configuration\Client; -use Micro\Framework\Kernel\Configuration\PluginRoutingKeyConfiguration; +use Micro\Framework\BootConfiguration\Configuration\PluginRoutingKeyConfiguration; class WorkflowClientConfiguration extends PluginRoutingKeyConfiguration implements WorkflowClientConfigurationInterface diff --git a/src/Configuration/Client/WorkflowClientConfigurationInterface.php b/Configuration/Client/WorkflowClientConfigurationInterface.php similarity index 100% rename from src/Configuration/Client/WorkflowClientConfigurationInterface.php rename to Configuration/Client/WorkflowClientConfigurationInterface.php diff --git a/src/Configuration/RoadRunner/RoadRunnerConfiguration.php b/Configuration/RoadRunner/RoadRunnerConfiguration.php similarity index 91% rename from src/Configuration/RoadRunner/RoadRunnerConfiguration.php rename to Configuration/RoadRunner/RoadRunnerConfiguration.php index 9af48ab..2fdd403 100644 --- a/src/Configuration/RoadRunner/RoadRunnerConfiguration.php +++ b/Configuration/RoadRunner/RoadRunnerConfiguration.php @@ -3,7 +3,7 @@ namespace Micro\Plugin\Temporal\Configuration\RoadRunner; use JetBrains\PhpStorm\ExpectedValues; -use Micro\Framework\Kernel\Configuration\PluginRoutingKeyConfiguration; +use Micro\Framework\BootConfiguration\Configuration\PluginRoutingKeyConfiguration; use Spiral\RoadRunner\Environment\Mode; class RoadRunnerConfiguration extends PluginRoutingKeyConfiguration implements RoadRunnerConfigurationInterface diff --git a/src/Configuration/RoadRunner/RoadRunnerConfigurationInterface.php b/Configuration/RoadRunner/RoadRunnerConfigurationInterface.php similarity index 100% rename from src/Configuration/RoadRunner/RoadRunnerConfigurationInterface.php rename to Configuration/RoadRunner/RoadRunnerConfigurationInterface.php diff --git a/src/Configuration/TemporalPluginConfigurationInterface.php b/Configuration/TemporalPluginConfigurationInterface.php similarity index 100% rename from src/Configuration/TemporalPluginConfigurationInterface.php rename to Configuration/TemporalPluginConfigurationInterface.php diff --git a/src/Configuration/Worker/WorkflowWorkerConfiguration.php b/Configuration/Worker/WorkflowWorkerConfiguration.php similarity index 93% rename from src/Configuration/Worker/WorkflowWorkerConfiguration.php rename to Configuration/Worker/WorkflowWorkerConfiguration.php index 30337fe..c623780 100644 --- a/src/Configuration/Worker/WorkflowWorkerConfiguration.php +++ b/Configuration/Worker/WorkflowWorkerConfiguration.php @@ -3,7 +3,7 @@ namespace Micro\Plugin\Temporal\Configuration\Worker; use JetBrains\PhpStorm\ExpectedValues; -use Micro\Framework\Kernel\Configuration\PluginRoutingKeyConfiguration; +use Micro\Framework\BootConfiguration\Configuration\PluginRoutingKeyConfiguration; use Spiral\RoadRunner\Environment\Mode; use Temporal\Worker\WorkerFactoryInterface as TemporalWorkerFactoryInterface; diff --git a/src/Configuration/Worker/WorkflowWorkerConfigurationInterface.php b/Configuration/Worker/WorkflowWorkerConfigurationInterface.php similarity index 100% rename from src/Configuration/Worker/WorkflowWorkerConfigurationInterface.php rename to Configuration/Worker/WorkflowWorkerConfigurationInterface.php diff --git a/src/Facade/TemporalFacade.php b/Facade/TemporalFacade.php similarity index 100% rename from src/Facade/TemporalFacade.php rename to Facade/TemporalFacade.php diff --git a/src/Facade/TemporalFacadeInterface.php b/Facade/TemporalFacadeInterface.php similarity index 100% rename from src/Facade/TemporalFacadeInterface.php rename to Facade/TemporalFacadeInterface.php diff --git a/src/RoadRunner/Expander/Environment/EnvironmentExpander.php b/RoadRunner/Expander/Environment/EnvironmentExpander.php similarity index 100% rename from src/RoadRunner/Expander/Environment/EnvironmentExpander.php rename to RoadRunner/Expander/Environment/EnvironmentExpander.php diff --git a/src/RoadRunner/Expander/Environment/EnvironmentExpanderFactory.php b/RoadRunner/Expander/Environment/EnvironmentExpanderFactory.php similarity index 100% rename from src/RoadRunner/Expander/Environment/EnvironmentExpanderFactory.php rename to RoadRunner/Expander/Environment/EnvironmentExpanderFactory.php diff --git a/src/RoadRunner/Expander/Environment/EnvironmentExpanderFactoryInterface.php b/RoadRunner/Expander/Environment/EnvironmentExpanderFactoryInterface.php similarity index 100% rename from src/RoadRunner/Expander/Environment/EnvironmentExpanderFactoryInterface.php rename to RoadRunner/Expander/Environment/EnvironmentExpanderFactoryInterface.php diff --git a/src/RoadRunner/Expander/Environment/EnvironmentExpanderInterface.php b/RoadRunner/Expander/Environment/EnvironmentExpanderInterface.php similarity index 100% rename from src/RoadRunner/Expander/Environment/EnvironmentExpanderInterface.php rename to RoadRunner/Expander/Environment/EnvironmentExpanderInterface.php diff --git a/src/TemporalPlugin.php b/TemporalPlugin.php similarity index 95% rename from src/TemporalPlugin.php rename to TemporalPlugin.php index de01ea4..408c098 100644 --- a/src/TemporalPlugin.php +++ b/TemporalPlugin.php @@ -4,10 +4,10 @@ use Micro\Component\DependencyInjection\Autowire\AutowireHelperFactory; use Micro\Component\DependencyInjection\Autowire\AutowireHelperFactoryInterface; -use Micro\Component\DependencyInjection\Container; -use Micro\Framework\Kernel\Plugin\ConfigurableInterface; -use Micro\Framework\Kernel\Plugin\DependencyProviderInterface; -use Micro\Framework\Kernel\Plugin\PluginConfigurationTrait; +use Micro\Framework\DependencyInjection\Container; +use Micro\Framework\BootConfiguration\Plugin\ConfigurableInterface; +use Micro\Framework\BootDependency\Plugin\DependencyProviderInterface; +use Micro\Framework\BootConfiguration\Plugin\PluginConfigurationTrait; use Micro\Library\DTO\SerializerFacadeInterface; use Micro\Plugin\Locator\Facade\LocatorFacadeInterface; use Micro\Plugin\Temporal\Activity\Factory\ActivityStubFactory; diff --git a/src/TemporalPluginConfiguration.php b/TemporalPluginConfiguration.php similarity index 96% rename from src/TemporalPluginConfiguration.php rename to TemporalPluginConfiguration.php index 78b5eab..1958d9d 100644 --- a/src/TemporalPluginConfiguration.php +++ b/TemporalPluginConfiguration.php @@ -2,7 +2,7 @@ namespace Micro\Plugin\Temporal; -use Micro\Framework\Kernel\Configuration\PluginConfiguration; +use Micro\Framework\BootConfiguration\Configuration\PluginConfiguration; use Micro\Plugin\Temporal\Configuration\Client\WorkflowClientConfiguration; use Micro\Plugin\Temporal\Configuration\Client\WorkflowClientConfigurationInterface; use Micro\Plugin\Temporal\Configuration\RoadRunner\RoadRunnerConfiguration; diff --git a/src/Worker/Expander/WorkerExpander.php b/Worker/Expander/WorkerExpander.php similarity index 100% rename from src/Worker/Expander/WorkerExpander.php rename to Worker/Expander/WorkerExpander.php diff --git a/src/Worker/Expander/WorkerExpanderFactory.php b/Worker/Expander/WorkerExpanderFactory.php similarity index 100% rename from src/Worker/Expander/WorkerExpanderFactory.php rename to Worker/Expander/WorkerExpanderFactory.php diff --git a/src/Worker/Expander/WorkerExpanderFactoryInterface.php b/Worker/Expander/WorkerExpanderFactoryInterface.php similarity index 100% rename from src/Worker/Expander/WorkerExpanderFactoryInterface.php rename to Worker/Expander/WorkerExpanderFactoryInterface.php diff --git a/src/Worker/Expander/WorkerExpanderInterface.php b/Worker/Expander/WorkerExpanderInterface.php similarity index 100% rename from src/Worker/Expander/WorkerExpanderInterface.php rename to Worker/Expander/WorkerExpanderInterface.php diff --git a/src/Worker/Factory/WorkerFactory.php b/Worker/Factory/WorkerFactory.php similarity index 100% rename from src/Worker/Factory/WorkerFactory.php rename to Worker/Factory/WorkerFactory.php diff --git a/src/Worker/Factory/WorkerFactoryInterface.php b/Worker/Factory/WorkerFactoryInterface.php similarity index 100% rename from src/Worker/Factory/WorkerFactoryInterface.php rename to Worker/Factory/WorkerFactoryInterface.php diff --git a/src/Workflow/Client/Factory/ClientFactory.php b/Workflow/Client/Factory/ClientFactory.php similarity index 100% rename from src/Workflow/Client/Factory/ClientFactory.php rename to Workflow/Client/Factory/ClientFactory.php diff --git a/src/Workflow/Client/Factory/ClientFactoryInterface.php b/Workflow/Client/Factory/ClientFactoryInterface.php similarity index 100% rename from src/Workflow/Client/Factory/ClientFactoryInterface.php rename to Workflow/Client/Factory/ClientFactoryInterface.php diff --git a/src/Workflow/Client/Repository/ClientRepository.php b/Workflow/Client/Repository/ClientRepository.php similarity index 100% rename from src/Workflow/Client/Repository/ClientRepository.php rename to Workflow/Client/Repository/ClientRepository.php diff --git a/src/Workflow/Client/Repository/ClientRepositoryFactory.php b/Workflow/Client/Repository/ClientRepositoryFactory.php similarity index 100% rename from src/Workflow/Client/Repository/ClientRepositoryFactory.php rename to Workflow/Client/Repository/ClientRepositoryFactory.php diff --git a/src/Workflow/Client/Repository/ClientRepositoryFactoryInterface.php b/Workflow/Client/Repository/ClientRepositoryFactoryInterface.php similarity index 100% rename from src/Workflow/Client/Repository/ClientRepositoryFactoryInterface.php rename to Workflow/Client/Repository/ClientRepositoryFactoryInterface.php diff --git a/src/Workflow/Client/Repository/ClientRepositoryInterface.php b/Workflow/Client/Repository/ClientRepositoryInterface.php similarity index 100% rename from src/Workflow/Client/Repository/ClientRepositoryInterface.php rename to Workflow/Client/Repository/ClientRepositoryInterface.php diff --git a/src/Workflow/DataConverter/DataConverterFactory.php b/Workflow/DataConverter/DataConverterFactory.php similarity index 100% rename from src/Workflow/DataConverter/DataConverterFactory.php rename to Workflow/DataConverter/DataConverterFactory.php diff --git a/src/Workflow/DataConverter/DataConverterFactoryInterface.php b/Workflow/DataConverter/DataConverterFactoryInterface.php similarity index 100% rename from src/Workflow/DataConverter/DataConverterFactoryInterface.php rename to Workflow/DataConverter/DataConverterFactoryInterface.php diff --git a/src/Workflow/DataConverter/Payload/DtoPayloadDataConverter.php b/Workflow/DataConverter/Payload/DtoPayloadDataConverter.php similarity index 100% rename from src/Workflow/DataConverter/Payload/DtoPayloadDataConverter.php rename to Workflow/DataConverter/Payload/DtoPayloadDataConverter.php diff --git a/src/Workflow/WorkflowInterface.php b/Workflow/WorkflowInterface.php similarity index 100% rename from src/Workflow/WorkflowInterface.php rename to Workflow/WorkflowInterface.php diff --git a/composer.json b/composer.json index 9f3df76..5488569 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,11 @@ { "name": "micro/plugin-temporal", "description": "Micro Framework: TemporalIO plugin", - "type": "library", + "type": "micro-library", "license": "MIT", - "version": "1.0", "autoload": { "psr-4": { - "Micro\\Plugin\\Temporal\\": "src/" + "Micro\\Plugin\\Temporal\\": "/" } }, "authors": [ @@ -16,12 +15,9 @@ } ], "require": { - "micro/kernel": "^1", + "micro/kernel": "^2.0", "temporal/sdk": ">=2.0", "spiral/tokenizer": ">=2.7" }, - "require-dev": { - }, - "scripts": { - } + "minimum-stability": "dev" }