Skip to content

Commit

Permalink
Merge branch 'master' into next-retry-delay
Browse files Browse the repository at this point in the history
  • Loading branch information
roxblnfk authored Sep 25, 2024
2 parents b47c8a4 + 2bfc7dd commit f698a74
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/Internal/Transport/Router/StartWorkflow.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Internal/Workflow/Process/Process.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion src/FeatureFlags.php → src/Worker/FeatureFlags.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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;
}
6 changes: 3 additions & 3 deletions tests/Acceptance/App/RuntimeBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Acceptance/Harness/Update/AsyncAcceptTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion tests/Functional/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion tests/Functional/worker.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down

0 comments on commit f698a74

Please sign in to comment.