Merge branch 'master' into expressive-errors

Author: xepozz

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>

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>

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
     {

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);

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
      *          })
      *      ;

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>

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,
     ) {}
 

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();