From d3762ef3012fdc0b5bb1b83b5b964672ffbde4ef Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Mon, 23 Sep 2024 20:38:41 +0400 Subject: [PATCH] Move FeatureFlags class into Worker namespace --- src/Internal/Transport/Router/StartWorkflow.php | 2 +- src/Internal/Workflow/Process/Process.php | 2 +- src/{ => Worker}/FeatureFlags.php | 4 +++- tests/Acceptance/App/RuntimeBuilder.php | 6 +++--- tests/Acceptance/Harness/Update/AsyncAcceptTest.php | 2 +- tests/Functional/bootstrap.php | 2 +- tests/Functional/worker.php | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) rename src/{ => Worker}/FeatureFlags.php (93%) diff --git a/src/Internal/Transport/Router/StartWorkflow.php b/src/Internal/Transport/Router/StartWorkflow.php index 8cc79430..ed4c6af4 100644 --- a/src/Internal/Transport/Router/StartWorkflow.php +++ b/src/Internal/Transport/Router/StartWorkflow.php @@ -13,7 +13,6 @@ use React\Promise\Deferred; use Temporal\DataConverter\EncodedValues; -use Temporal\FeatureFlags; use Temporal\Interceptor\WorkflowInbound\WorkflowInput; use Temporal\Interceptor\WorkflowInboundCallsInterceptor; use Temporal\Internal\Declaration\Instantiator\WorkflowInstantiator; @@ -22,6 +21,7 @@ use Temporal\Internal\Workflow\Input; use Temporal\Internal\Workflow\Process\Process; use Temporal\Internal\Workflow\WorkflowContext; +use Temporal\Worker\FeatureFlags; use Temporal\Worker\Transport\Command\ServerRequestInterface; use Temporal\Workflow; use Temporal\Workflow\WorkflowInfo; diff --git a/src/Internal/Workflow/Process/Process.php b/src/Internal/Workflow/Process/Process.php index 38d51395..7b15a9dc 100644 --- a/src/Internal/Workflow/Process/Process.php +++ b/src/Internal/Workflow/Process/Process.php @@ -17,7 +17,6 @@ use Temporal\DataConverter\ValuesInterface; use Temporal\Exception\DestructMemorizedInstanceException; use Temporal\Exception\Failure\CanceledFailure; -use Temporal\FeatureFlags; use Temporal\Interceptor\WorkflowInbound\QueryInput; use Temporal\Interceptor\WorkflowInbound\SignalInput; use Temporal\Interceptor\WorkflowInbound\UpdateInput; @@ -27,6 +26,7 @@ use Temporal\Internal\ServiceContainer; use Temporal\Internal\Workflow\Input; use Temporal\Internal\Workflow\WorkflowContext; +use Temporal\Worker\FeatureFlags; use Temporal\Worker\LoopInterface; use Temporal\Workflow; use Temporal\Workflow\HandlerUnfinishedPolicy as HandlerPolicy; diff --git a/src/FeatureFlags.php b/src/Worker/FeatureFlags.php similarity index 93% rename from src/FeatureFlags.php rename to src/Worker/FeatureFlags.php index d4b606b4..adb248ff 100644 --- a/src/FeatureFlags.php +++ b/src/Worker/FeatureFlags.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Temporal; +namespace Temporal\Worker; /** * Feature flags help to smoothly introduce behavior changes that may affect existing workflows. @@ -25,6 +25,8 @@ final class FeatureFlags /** * Warn about running Signal and Update handlers on Workflow finish. * It uses `error_log()` function to output a warning message. + * + * @since SDK 2.11.0 */ public static bool $warnOnWorkflowUnfinishedHandlers = true; } diff --git a/tests/Acceptance/App/RuntimeBuilder.php b/tests/Acceptance/App/RuntimeBuilder.php index 699bd587..f0ce6493 100644 --- a/tests/Acceptance/App/RuntimeBuilder.php +++ b/tests/Acceptance/App/RuntimeBuilder.php @@ -5,12 +5,12 @@ namespace Temporal\Tests\Acceptance\App; use PHPUnit\Framework\Attributes\Test; -use Temporal\FeatureFlags; +use Temporal\Activity\ActivityInterface; +use Temporal\DataConverter\PayloadConverterInterface; use Temporal\Tests\Acceptance\App\Input\Command; use Temporal\Tests\Acceptance\App\Input\Feature; use Temporal\Tests\Acceptance\App\Runtime\State; -use Temporal\Activity\ActivityInterface; -use Temporal\DataConverter\PayloadConverterInterface; +use Temporal\Worker\FeatureFlags; use Temporal\Workflow\WorkflowInterface; final class RuntimeBuilder diff --git a/tests/Acceptance/Harness/Update/AsyncAcceptTest.php b/tests/Acceptance/Harness/Update/AsyncAcceptTest.php index 19da2af7..080906b8 100644 --- a/tests/Acceptance/Harness/Update/AsyncAcceptTest.php +++ b/tests/Acceptance/Harness/Update/AsyncAcceptTest.php @@ -41,7 +41,7 @@ public function check( # Unblock last update $stub->signal('unblock'); self::assertSame(123, $handle->getResult()); - // self::same($otherHandle->getResult(), 123); + self::assertSame(123, $otherHandle->getResult()); # issue an async update that should throw $updateId = Uuid::uuid4()->toString(); diff --git a/tests/Functional/bootstrap.php b/tests/Functional/bootstrap.php index e4f4065a..1128b784 100644 --- a/tests/Functional/bootstrap.php +++ b/tests/Functional/bootstrap.php @@ -2,9 +2,9 @@ declare(strict_types=1); -use Temporal\FeatureFlags; use Temporal\Testing\Environment; use Temporal\Tests\SearchAttributeTestInvoker; +use Temporal\Worker\FeatureFlags; chdir(__DIR__ . '/../..'); require_once __DIR__ . '/../../vendor/autoload.php'; diff --git a/tests/Functional/worker.php b/tests/Functional/worker.php index 2ee7e73a..08a3b2fd 100644 --- a/tests/Functional/worker.php +++ b/tests/Functional/worker.php @@ -2,11 +2,11 @@ declare(strict_types=1); -use Temporal\FeatureFlags; use Temporal\Testing\WorkerFactory; use Temporal\Tests\Fixtures\PipelineProvider; use Temporal\Tests\Interceptor\HeaderChanger; use Temporal\Tests\Interceptor\InterceptorCallsCounter; +use Temporal\Worker\FeatureFlags; use Temporal\Worker\WorkerInterface; require __DIR__ . '/../../vendor/autoload.php';