Merge pull request #647: Replace react/promise v2 with internal/promise

Author: roxblnfk

composer.json

@@ -27,10 +27,10 @@
         "google/common-protos": "^4.9",
         "google/protobuf": "^4.31.1",
         "grpc/grpc": "^1.57",
+        "internal/promise": "^2.12",
         "nesbot/carbon": "^2.72.6 || ^3.8.4",
         "psr/log": "^2.0 || ^3.0.2",
         "ramsey/uuid": "^4.7.6",
-        "react/promise": "^2.11",
         "roadrunner-php/roadrunner-api-dto": "^1.13.0",
         "roadrunner-php/version-checker": "^1.0.1",
         "spiral/attributes": "^3.1.8",

psalm-baseline.xml

@@ -1019,28 +1019,16 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="src/Internal/Transport/CompletableResult.php">
-    <MoreSpecificImplementedParamType>
-      <code><![CDATA[$onFulfilled]]></code>
-      <code><![CDATA[$onRejected]]></code>
-    </MoreSpecificImplementedParamType>
     <PossiblyNullArgument>
       <code><![CDATA[$this->wrapContext($onFulfilledOrRejected)]]></code>
       <code><![CDATA[$this->wrapContext($onRejected)]]></code>
     </PossiblyNullArgument>
-    <TooManyTemplateParams>
-      <code><![CDATA[PromiseInterface<T>]]></code>
-    </TooManyTemplateParams>
     <UndefinedInterfaceMethod>
       <code><![CDATA[cancel]]></code>
       <code><![CDATA[catch]]></code>
       <code><![CDATA[finally]]></code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="src/Internal/Transport/CompletableResultInterface.php">
-    <TooManyTemplateParams>
-      <code><![CDATA[PromiseInterface]]></code>
-    </TooManyTemplateParams>
-  </file>
   <file src="src/Internal/Transport/Router/DestroyWorkflow.php">
     <UndefinedInterfaceMethod>
       <code><![CDATA[pull]]></code>
@@ -1176,6 +1164,10 @@
     </PropertyNotSetInConstructor>
   </file>
   <file src="src/Internal/Workflow/Process/Scope.php">
+    <InvalidArgument>
+      <code><![CDATA[$onFulfilled]]></code>
+      <code><![CDATA[$onRejected]]></code>
+    </InvalidArgument>
     <PropertyNotSetInConstructor>
       <code><![CDATA[$coroutine]]></code>
     </PropertyNotSetInConstructor>
@@ -1216,6 +1208,9 @@
       <code><![CDATA[$type]]></code>
       <code><![CDATA[$type]]></code>
     </ArgumentTypeCoercion>
+    <DocblockTypeContradiction>
+      <code><![CDATA[\is_iterable($reason)]]></code>
+    </DocblockTypeContradiction>
     <InaccessibleProperty>
       <code><![CDATA[$this->input->info->typedSearchAttributes]]></code>
     </InaccessibleProperty>
@@ -1240,13 +1235,6 @@
       <code><![CDATA[object]]></code>
       <code><![CDATA[object]]></code>
     </InvalidReturnType>
-    <MissingClosureParamType>
-      <code><![CDATA[$reason]]></code>
-      <code><![CDATA[$result]]></code>
-    </MissingClosureParamType>
-    <MissingClosureReturnType>
-      <code><![CDATA[function ($result) use ($conditionGroupId) {]]></code>
-    </MissingClosureReturnType>
     <MissingImmutableAnnotation>
       <code><![CDATA[WorkflowContext]]></code>
     </MissingImmutableAnnotation>
@@ -1268,11 +1256,6 @@
     <TooManyArguments>
       <code><![CDATA[$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/ActivityInvocationResult.php">
     <MissingReturnType>
@@ -1517,22 +1500,6 @@
       <code><![CDATA[ScopedContextInterface]]></code>
       <code><![CDATA[T]]></code>
     </InvalidReturnType>
-    <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<mixed>]]></code>
-      <code><![CDATA[PromiseInterface<null>]]></code>
-    </TooManyTemplateParams>
-  </file>
-  <file src="src/Workflow/CancellationScopeInterface.php">
-    <TooManyTemplateParams>
-      <code><![CDATA[PromiseInterface]]></code>
-    </TooManyTemplateParams>
   </file>
   <file src="src/Workflow/ChildWorkflowOptions.php">
     <PossiblyNullReference>
@@ -1544,11 +1511,6 @@
       <code><![CDATA[$returnType]]></code>
     </MissingParamType>
   </file>
-  <file src="src/Workflow/Mutex.php">
-    <TooManyTemplateParams>
-      <code><![CDATA[PromiseInterface<self>]]></code>
-    </TooManyTemplateParams>
-  </file>
   <file src="src/Workflow/QueryMethod.php">
     <DeprecatedClass>
       <code><![CDATA[NamedArgumentConstructor]]></code>
@@ -1579,16 +1541,6 @@
       <code><![CDATA[NamedArgumentConstructor]]></code>
     </DeprecatedClass>
   </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>
   <file src="src/Workflow/WorkflowInterface.php">
     <DeprecatedClass>
       <code><![CDATA[NamedArgumentConstructor]]></code>

resources/.phpstorm.meta.php/PromiseInterface.php

@@ -753,11 +753,11 @@ protected function awaitRequest(callable|Mutex|PromiseInterface ...$conditions):
         }
 
         return Promise::any($result)->then(
-            function ($result) use ($conditionGroupId) {
+            function (mixed $result) use ($conditionGroupId): mixed {
                 $this->resolveConditionGroup($conditionGroupId);
                 return $result;
             },
-            function ($reason) use ($conditionGroupId): void {
+            function (\Throwable $reason) use ($conditionGroupId): void {
                 $this->rejectConditionGroup($conditionGroupId);
                 // Throw the first reason
                 // It need to avoid memory leak when the related workflow is destroyed