Merge branch 'master' into issue-642

xepozz · web-flow · commit e0d5562cdd56 · 2026-01-26T20:18:37.000+04:00
diff --git a/.github/workflows/run-test-suite.yml b/.github/workflows/run-test-suite.yml
@@ -82,14 +82,20 @@ jobs:
           dependency-versions: ${{ matrix.dependencies }}
 
       - name: Validate lowest dependencies
+        id: validate
         if: matrix.dependencies == 'lowest' && matrix.php == '8.1'
         env:
           COMPOSER_POOL_OPTIMIZER: 0
         run: vendor/bin/validate-prefer-lowest
+        continue-on-error: true
 
       - name: Download binaries
         if: inputs.download-binaries == true
         run: composer get:binaries
 
       - name: Run tests
         run: ${{ inputs.test-command }}
+
+      - name: Check for failures
+        if: steps.validate.outcome == 'failure'
+        run: exit 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51">
+<files psalm-version="6.14.3@d0b040a91f280f071c1abcb1b77ce3822058725a">
   <file src="src/Activity.php">
     <ImplicitToStringCast>
       <code><![CDATA[$type]]></code>
@@ -884,6 +884,11 @@
       <code><![CDATA[?string]]></code>
     </MoreSpecificReturnType>
   </file>
+  <file src="src/Internal/Promise/CancellationQueue.php">
+    <PossiblyNullArrayOffset>
+      <code><![CDATA[$this->queue]]></code>
+    </PossiblyNullArrayOffset>
+  </file>
   <file src="src/Internal/Queue/ArrayQueue.php">
     <InvalidDocblock>
       <code><![CDATA[protected array $commands = [];]]></code>
diff --git a/resources/client.meta-storm.xml b/resources/client.meta-storm.xml
@@ -29,7 +29,24 @@
             argument="0"
         >
             <collection name="temporal/sdk:workflow-class" argument="0" />
+            <collection name="temporal/sdk:workflow-type" argument="0" />
             <stopCompletion />
         </classMethod>
+        <classMethod
+            class="\Temporal\Client\Schedule\Action\StartWorkflowAction"
+            method="new"
+            argument="0"
+        >
+            <collection name="temporal/sdk:workflow-class" />
+            <collection name="temporal/sdk:workflow-type" argument="0" />
+            <stopCompletion />
+        </classMethod>
+        <classMethod
+            class="\Temporal\DataConverter\ValuesInterface"
+            method="getValue"
+            argument="1"
+        >
+            <languageInjection language="InjectablePHP" prefix="/** @var " suffix=" $_ **/" />
+        </classMethod>
     </definitions>
 </meta-storm>
diff --git a/src/Internal/Transport/CompletableResult.php b/src/Internal/Transport/CompletableResult.php
@@ -110,15 +110,15 @@ public function cancel(): void
     }
 
     /**
-     * @deprecated
+     * @deprecated use {@see catch()} instead
      */
     public function otherwise(callable $onRejected): PromiseInterface
     {
         return $this->catch($onRejected);
     }
 
     /**
-     * @deprecated
+     * @deprecated use {@see finally()} instead
      */
     public function always(callable $onFulfilledOrRejected): PromiseInterface
     {
diff --git a/src/Internal/Workflow/Process/Scope.php b/src/Internal/Workflow/Process/Scope.php
@@ -259,11 +259,17 @@ public function finally(callable $onFulfilledOrRejected): PromiseInterface
         return $this->deferred->promise()->finally($onFulfilledOrRejected);
     }
 
+    /**
+     * @deprecated use {@see catch()} instead
+     */
     public function otherwise(callable $onRejected): PromiseInterface
     {
         return $this->catch($onRejected);
     }
 
+    /**
+     * @deprecated use {@see finally()} instead
+     */
     public function always(callable $onFulfilledOrRejected): PromiseInterface
     {
         return $this->finally($onFulfilledOrRejected);
diff --git a/src/Worker/Environment/Environment.php b/src/Worker/Environment/Environment.php
@@ -20,7 +20,7 @@ class Environment implements EnvironmentInterface
 
     public function __construct()
     {
-        $this->tickTime = new \DateTimeImmutable('now', new \DateTimeZone('UTC'));
+        $this->tickTime = new \DateTimeImmutable('now');
     }
 
     public function now(): \DateTimeInterface
diff --git a/src/Worker/Transport/Codec/JsonCodec.php b/src/Worker/Transport/Codec/JsonCodec.php
@@ -23,13 +23,15 @@ final class JsonCodec implements CodecInterface
     private int $maxDepth;
     private Decoder $parser;
     private Encoder $serializer;
+    private \DateTimeZone $hostTimeZone;
 
     public function __construct(DataConverterInterface $dataConverter, int $maxDepth = 64)
     {
         $this->maxDepth = $maxDepth;
 
         $this->parser = new Decoder($dataConverter);
         $this->serializer = new Encoder($dataConverter);
+        $this->hostTimeZone = new \DateTimeZone(\date_default_timezone_get());
     }
 
     public function encode(iterable $commands): string
@@ -50,15 +52,13 @@ public function encode(iterable $commands): string
 
     public function decode(string $batch, array $headers = []): iterable
     {
-        static $tz = new \DateTimeZone('UTC');
-
         try {
             $commands = \json_decode($batch, true, $this->maxDepth, \JSON_THROW_ON_ERROR);
 
             foreach ($commands as $command) {
                 /** @psalm-suppress ArgumentTypeCoercion */
                 $info = new TickInfo(
-                    time: new \DateTimeImmutable($headers['tickTime'] ?? 'now', $tz),
+                    time: (new \DateTimeImmutable($headers['tickTime'] ?? 'now'))->setTimezone($this->hostTimeZone),
                     historyLength: (int) ($headers['history_length'] ?? 0),
                     historySize: (int) ($headers['history_size'] ?? 0),
                     continueAsNewSuggested: (bool) ($headers['continue_as_new_suggested'] ?? false),
diff --git a/src/Worker/Transport/Codec/ProtoCodec.php b/src/Worker/Transport/Codec/ProtoCodec.php
@@ -26,11 +26,13 @@ final class ProtoCodec implements CodecInterface
 {
     private Decoder $parser;
     private Encoder $encoder;
+    private \DateTimeZone $hostTimeZone;
 
     public function __construct(DataConverterInterface $dataConverter)
     {
         $this->parser = new Decoder($dataConverter);
         $this->encoder = new Encoder($dataConverter);
+        $this->hostTimeZone = new \DateTimeZone(\date_default_timezone_get());
     }
 
     public function encode(iterable $commands): string
@@ -54,16 +56,14 @@ public function encode(iterable $commands): string
 
     public function decode(string $batch, array $headers = []): iterable
     {
-        static $tz = new \DateTimeZone('UTC');
-
         try {
             $frame = new Frame();
             $frame->mergeFromString($batch);
 
             foreach ($frame->getMessages() as $msg) {
                 /** @psalm-suppress ArgumentTypeCoercion */
                 $info = new TickInfo(
-                    time: new \DateTimeImmutable($headers['tickTime'] ?? $msg->getTickTime(), $tz),
+                    time: (new \DateTimeImmutable($headers['tickTime'] ?? $msg->getTickTime()))->setTimezone($this->hostTimeZone),
                     historyLength: (int) ($headers['history_length'] ?? $msg->getHistoryLength()),
                     historySize: (int) ($headers['history_size'] ?? $msg->getHistorySize()),
                     continueAsNewSuggested: (bool) ($headers['continue_as_new_suggested'] ?? $msg->getContinueAsNewSuggested()),
diff --git a/src/Workflow.php b/src/Workflow.php
@@ -901,7 +901,7 @@ public static function newUntypedExternalWorkflowStub(WorkflowExecution $executi
      *          ->then(function ($result) {
      *              // Execution result
      *          })
-     *          ->otherwise(function (\Throwable $error) {
+     *          ->catch(function (\Throwable $error) {
      *              // Execution error
      *          })
      *      ;
diff --git a/tests/.meta-storm.xml b/tests/.meta-storm.xml
@@ -0,0 +1,7 @@
+<meta-storm>
+    <definitions>
+        <classConstructor class="\Temporal\Tests\Acceptance\App\Attribute\Stub" argument="0">
+            <collection name="temporal/sdk:workflow-type" />
+        </classConstructor>
+    </definitions>
+</meta-storm>
diff --git a/tests/Acceptance/App/Attribute/RetryOptions.php b/tests/Acceptance/App/Attribute/RetryOptions.php
@@ -25,10 +25,25 @@ class RetryOptions
      * @param int<0, max> $maximumAttempts
      */
     public function __construct(
+        /**
+         * @see CommonOptions::withInitialInterval()
+         */
         public ?string $initialInterval = CommonOptions::DEFAULT_INITIAL_INTERVAL,
+        /**
+         * @see CommonOptions::withBackoffCoefficient()
+         */
         public float $backoffCoefficient = CommonOptions::DEFAULT_BACKOFF_COEFFICIENT,
+        /**
+         * @see CommonOptions::withMaximumInterval()
+         */
         public ?string $maximumInterval = CommonOptions::DEFAULT_MAXIMUM_INTERVAL,
+        /**
+         * @see CommonOptions::withMaximumAttempts()
+         */
         public int $maximumAttempts = CommonOptions::DEFAULT_MAXIMUM_ATTEMPTS,
+        /**
+         * @see CommonOptions::withNonRetryableExceptions()
+         */
         public array $nonRetryableExceptions = CommonOptions::DEFAULT_NON_RETRYABLE_EXCEPTIONS,
     ) {}
 
diff --git a/tests/Acceptance/App/Attribute/Stub.php b/tests/Acceptance/App/Attribute/Stub.php
@@ -23,11 +23,26 @@ final class Stub
      */
     public function __construct(
         public string $type,
+        /**
+         * @see WorkflowOptions::withEagerStart()
+         */
         public bool $eagerStart = false,
+        /**
+         * @see WorkflowOptions::withWorkflowId()
+         */
         public ?string $workflowId = null,
+        /**
+         * @see WorkflowOptions::withWorkflowExecutionTimeout()
+         */
         public ?string $executionTimeout = null,
         public array $args = [],
+        /**
+         * @see WorkflowOptions::withMemo()
+         */
         public array $memo = [],
+        /**
+         * @see WorkflowOptions::withRetryOptions()
+         */
         ?RetryOptions $retryOptions = null,
     ) {
         $this->retryOptions = $retryOptions?->toRetryOptions();
diff --git a/tests/Acceptance/App/TestCase.php b/tests/Acceptance/App/TestCase.php
@@ -6,8 +6,6 @@
 
 use Google\Protobuf\Timestamp;
 use PHPUnit\Framework\SkippedTest;
-use PHPUnit\Framework\SkippedWithMessageException;
-use PHPUnit\Framework\TestStatus\Skipped;
 use Psr\Log\LoggerInterface;
 use Spiral\Core\Container;
 use Spiral\Core\Scope;
@@ -36,16 +34,16 @@ protected function setUp(): void
 
     protected function runTest(): mixed
     {
-        $c = ContainerFacade::$container;
+        $container = ContainerFacade::$container;
         /** @var State $runtime */
-        $runtime = $c->get(State::class);
+        $runtime = $container->get(State::class);
         $feature = $runtime->getFeatureByTestCase(static::class);
 
         // Configure client logger
         $logger = LoggerFactory::createClientLogger($feature->taskQueue);
         $logger->clear();
 
-        return $c->runScope(
+        return $container->runScope(
             new Scope(name: 'feature', bindings: [
                 Feature::class => $feature,
                 static::class => $this,
@@ -62,7 +60,15 @@ function (Container $container): mixed {
                     return parent::runTest();
                 } catch (\Throwable $e) {
                     if ($e instanceof TemporalException) {
-                        echo "\n=== Workflow history for failed test {$this->name()} ===\n";
+                        echo \sprintf(
+                            "\n=== En error occurred while testing %s: %s (%s) ===\n",
+                            static::class . '::' . $this->name(),
+                            $e->getMessage(),
+                            $e::class,
+                        );
+                        echo "\n=== Stack trace ===\n";
+                        echo $e->getTraceAsString();
+                        echo "\n=== Workflow history ===\n";
                         $this->printWorkflowHistory($container->get(WorkflowClientInterface::class), $args);
 
                         $logRecords = $container->get(ClientLogger::class)->getRecords();
@@ -117,9 +123,7 @@ private function printWorkflowHistory(WorkflowClientInterface $workflowClient, a
                 ? 0
                 : $ts->getSeconds() + \round($ts->getNanos() / 1_000_000_000, 6);
 
-            foreach ($workflowClient->getWorkflowHistory(
-                $arg->getExecution(),
-            ) as $event) {
+            foreach ($workflowClient->getWorkflowHistory($arg->getExecution()) as $event) {
                 $start ??= $fnTime($event->getEventTime());
                 echo "\n" . \str_pad((string) $event->getEventId(), 3, ' ', STR_PAD_LEFT) . ' ';
                 # Calculate delta time
diff --git a/tests/Acceptance/Extra/Workflow/DateTimeZoneWorkflowTest.php b/tests/Acceptance/Extra/Workflow/DateTimeZoneWorkflowTest.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Temporal\Tests\Acceptance\Extra\Workflow\DateTimeZoneWorkflow;
+
+use PHPUnit\Framework\Attributes\Test;
+use Temporal\Client\WorkflowStubInterface;
+use Temporal\Tests\Acceptance\App\Attribute\Stub;
+use Temporal\Tests\Acceptance\App\TestCase;
+use Temporal\Workflow;
+use Temporal\Workflow\WorkflowInterface;
+use Temporal\Workflow\WorkflowMethod;
+
+class DateTimeZoneWorkflowTest extends TestCase
+{
+    #[Test]
+    public static function currentTime(
+        #[Stub('Extra_Workflow_DateTimeZoneWorkflow')]
+        WorkflowStubInterface $stub,
+    ): void {
+        $result = $stub->getResult(type: 'array');
+
+        self::assertEquals($result['system'], $result['current']);
+    }
+}
+
+#[WorkflowInterface]
+class MainWorkflow
+{
+    #[WorkflowMethod('Extra_Workflow_DateTimeZoneWorkflow')]
+    public function run()
+    {
+        yield Workflow::timer('1 seconds');
+
+        /**
+         * @var \DateTimeImmutable $currentDate
+         */
+        $currentDate = yield Workflow::sideEffect(static fn(): \DateTimeImmutable => new \DateTimeImmutable());
+
+        return yield [
+            'current' => [
+                'timestamp' => $currentDate->getTimestamp(),
+                'timezone.offset' => $currentDate->getTimeZone()->getOffset($currentDate),
+            ],
+            'system' => [
+                'timestamp' => Workflow::now()->getTimestamp(),
+                'timezone.offset' => Workflow::now()->getTimezone()->getOffset(Workflow::now()),
+            ],
+        ];
+    }
+}
diff --git a/tests/Fixtures/src/DTO/User.php b/tests/Fixtures/src/DTO/User.php
@@ -20,4 +20,13 @@ class User
 
     #[Marshal(name: "Email")]
     public string $email;
+
+    public static function new(string $name, string $email): User
+    {
+        $new = new self();
+        $new->name = $name;
+        $new->email = $email;
+
+        return $new;
+    }
 }
diff --git a/tests/Functional/SimpleWorkflowTestCase.php b/tests/Functional/SimpleWorkflowTestCase.php

Original file line number	Diff line number	Diff line change
`@@ -110,15 +110,15 @@ public function cancel(): void`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`/**`
`113`		`- * @deprecated`
	`113`	`+ * @deprecated use {@see catch()} instead`
`114`	`114`	`*/`
`115`	`115`	`public function otherwise(callable $onRejected): PromiseInterface`
`116`	`116`	`{`
`117`	`117`	`return $this->catch($onRejected);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`/**`
`121`		`- * @deprecated`
	`121`	`+ * @deprecated use {@see finally()} instead`
`122`	`122`	`*/`
`123`	`123`	`public function always(callable $onFulfilledOrRejected): PromiseInterface`
`124`	`124`	`{`
Original file line number	Diff line number	Diff line change
`@@ -259,11 +259,17 @@ public function finally(callable $onFulfilledOrRejected): PromiseInterface`
`259`	`259`	`return $this->deferred->promise()->finally($onFulfilledOrRejected);`
`260`	`260`	`}`
`261`	`261`
	`262`	`+ /**`
	`263`	`+ * @deprecated use {@see catch()} instead`
	`264`	`+ */`
`262`	`265`	`public function otherwise(callable $onRejected): PromiseInterface`
`263`	`266`	`{`
`264`	`267`	`return $this->catch($onRejected);`
`265`	`268`	`}`
`266`	`269`
	`270`	`+ /**`
	`271`	`+ * @deprecated use {@see finally()} instead`
	`272`	`+ */`
`267`	`273`	`public function always(callable $onFulfilledOrRejected): PromiseInterface`
`268`	`274`	`{`
`269`	`275`	`return $this->finally($onFulfilledOrRejected);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class Environment implements EnvironmentInterface`
`20`	`20`
`21`	`21`	`public function __construct()`
`22`	`22`	`{`
`23`		`- $this->tickTime = new \DateTimeImmutable('now', new \DateTimeZone('UTC'));`
	`23`	`+ $this->tickTime = new \DateTimeImmutable('now');`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function now(): \DateTimeInterface`