Merge branch 'master' into psalm

Author: xepozz

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