Merge pull request #358: Remove react/promise v3 from composer.json

temporalio · Oct 4, 2023 · 3320412 · 3320412
2 parents 3bbdb70 + c220b71
commit 3320412
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "nesbot/carbon": "^2.66",
         "psr/log": "^2.0 || ^3.0",
         "ramsey/uuid": "^4.7",
-        "react/promise": "2.9 || ^3.0",
+        "react/promise": "^2.9",
         "roadrunner-php/roadrunner-api-dto": "^1.3",
         "roadrunner-php/version-checker": "^1.0",
         "spiral/attributes": "^2.8 || ^3.0",

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -784,13 +784,28 @@
     </PossiblyInvalidArgument>
   </file>
   <file src="src/Internal/Transport/CompletableResult.php">
-    <InvalidArgument>
-      <code><![CDATA[$this->wrapContext($onFulfilledOrRejected)]]></code>
-      <code><![CDATA[$this->wrapContext($onFulfilledOrRejected)]]></code>
-    </InvalidArgument>
+    <MoreSpecificImplementedParamType>
+      <code>$onFulfilled</code>
+      <code>$onRejected</code>
+    </MoreSpecificImplementedParamType>
     <PossiblyNullArgument>
+      <code><![CDATA[$this->wrapContext($onFulfilledOrRejected)]]></code>
+      <code><![CDATA[$this->wrapContext($onRejected)]]></code>
       <code>$value</code>
     </PossiblyNullArgument>
+    <TooManyTemplateParams>
+      <code><![CDATA[PromiseInterface<T>]]></code>
+    </TooManyTemplateParams>
+    <UndefinedInterfaceMethod>
+      <code>cancel</code>
+      <code>catch</code>
+      <code>finally</code>
+    </UndefinedInterfaceMethod>
+  </file>
+  <file src="src/Internal/Transport/CompletableResultInterface.php">
+    <TooManyTemplateParams>
+      <code>PromiseInterface</code>
+    </TooManyTemplateParams>
   </file>
   <file src="src/Internal/Transport/Request/NewTimer.php">
     <PossiblyNullPropertyFetch>
@@ -973,10 +988,6 @@
     <ArgumentTypeCoercion>
       <code><![CDATA[$this->context]]></code>
     </ArgumentTypeCoercion>
-    <InvalidArgument>
-      <code>$onFulfilled</code>
-      <code>$onRejected</code>
-    </InvalidArgument>
     <LessSpecificReturnStatement>
       <code><![CDATA[$this->context]]></code>
     </LessSpecificReturnStatement>
@@ -993,6 +1004,8 @@
       <code>$coroutine</code>
     </PropertyNotSetInConstructor>
     <UndefinedInterfaceMethod>
+      <code>catch</code>
+      <code>finally</code>
       <code>getClient</code>
       <code>getClient</code>
       <code>getClient</code>
@@ -1095,6 +1108,11 @@
     <TooManyArguments>
       <code>$reduce($c, $value, $i++, $total)</code>
     </TooManyArguments>
+    <TooManyTemplateParams>
+      <code><![CDATA[PromiseInterface<T>]]></code>
+      <code><![CDATA[PromiseInterface<never>]]></code>
+      <code><![CDATA[iterable<PromiseInterface<T>|T>]]></code>
+    </TooManyTemplateParams>
   </file>
   <file src="src/Worker/ActivityInvocationCache/ActivityInvocationCacheInterface.php">
     <MissingParamType>
@@ -1351,6 +1369,23 @@
         )</code>
     </UnsafeInstantiation>
   </file>
+  <file src="src/Workflow.php">
+    <TooManyTemplateParams>
+      <code><![CDATA[PromiseInterface<TReturn>]]></code>
+      <code><![CDATA[PromiseInterface<UuidInterface>]]></code>
+      <code><![CDATA[PromiseInterface<UuidInterface>]]></code>
+      <code><![CDATA[PromiseInterface<UuidInterface>]]></code>
+      <code><![CDATA[PromiseInterface<bool>]]></code>
+      <code><![CDATA[PromiseInterface<int>]]></code>
+      <code><![CDATA[PromiseInterface<mixed>]]></code>
+      <code><![CDATA[PromiseInterface<null>]]></code>
+    </TooManyTemplateParams>
+  </file>
+  <file src="src/Workflow/CancellationScopeInterface.php">
+    <TooManyTemplateParams>
+      <code>PromiseInterface</code>
+    </TooManyTemplateParams>
+  </file>
   <file src="src/Workflow/ChildWorkflowOptions.php">
     <PossiblyNullReference>
       <code>mergeWith</code>
@@ -1366,4 +1401,14 @@
       <code><![CDATA[$e->getCode()]]></code>
     </PossiblyInvalidArgument>
   </file>
+  <file src="src/Workflow/WorkflowContextInterface.php">
+    <TooManyTemplateParams>
+      <code><![CDATA[PromiseInterface<TReturn>]]></code>
+      <code><![CDATA[PromiseInterface<UuidInterface>]]></code>
+      <code><![CDATA[PromiseInterface<UuidInterface>]]></code>
+      <code><![CDATA[PromiseInterface<UuidInterface>]]></code>
+      <code><![CDATA[PromiseInterface<bool>]]></code>
+      <code><![CDATA[PromiseInterface<mixed>]]></code>
+    </TooManyTemplateParams>
+  </file>
 </files>
diff --git a/src/Internal/Transport/CompletableResult.php b/src/Internal/Transport/CompletableResult.php
@@ -77,8 +77,8 @@ public function __construct(
         $this->layer = $layer;
 
         $this->promise = $promise->then(
-            \Closure::fromCallable([$this, 'onFulfilled']),
-            \Closure::fromCallable([$this, 'onRejected']),
+            $this->onFulfilled(...),
+            $this->onRejected(...),
         );
     }
 
@@ -171,11 +171,17 @@ public function cancel(): void
         $this->promise()->cancel();
     }
 
+    /**
+     * @deprecated
+     */
     public function otherwise(callable $onRejected): PromiseInterface
     {
         return $this->catch($this->wrapContext($onRejected));
     }
 
+    /**
+     * @deprecated
+     */
     public function always(callable $onFulfilledOrRejected): PromiseInterface
     {
         return $this->finally($this->wrapContext($onFulfilledOrRejected));