2023.09.22 Merge branch 'dev'

SDPM-lab · Sep 22, 2023 · 7bbdde1 · 7bbdde1
2 parents 8bea6a6 + 2a32ec3
commit 7bbdde1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/Orchestration/Orchestrator.php b/src/Orchestration/Orchestrator.php
@@ -194,11 +194,7 @@ public function getFailActions(): array
     {
         $actions = [];
         foreach ($this->steps as $step) {
-            foreach ($step->getStepActionList() as $alias => $action) {
-                if (!$action->isSuccess()) {
-                    $actions[$alias] = $action;
-                }
-            }
+            $actions = array_merge($actions, $step->getFailStepActionList());
         }
         return $actions;
     }

diff --git a/src/Orchestration/Step.php b/src/Orchestration/Step.php
@@ -222,7 +222,13 @@ public function getStepAction(string $alias): ?ActionInterface
      */
     public function getStepActionList(): array
     {
-        return $this->actionList;
+        $returnList = [];
+        foreach ($this->actionList as $alias => $action) {
+            if ($action instanceof ActionInterface) {
+                $returnList[$alias] = $action;
+            }
+        }
+        return $returnList;
     }
 
     /**
@@ -234,6 +240,9 @@ public function getFailStepActionList(): array
     {
         $failActions = [];
         foreach ($this->actionList as $alias => $action) {
+            if ($action instanceof ActionInterface === false) {
+                continue;
+            }
             if (!$action->isSuccess()) {
                 $failActions[$alias] = $action;
             }

diff --git a/src/Orchestration/StepInterface.php b/src/Orchestration/StepInterface.php
@@ -29,7 +29,7 @@ public function addAction(string $alias, $action): StepInterface;
      * 你可以取得 Orchestrator 已經執行完畢的 Step 中的資料。
      * 透過動態的資料，再自行定義自己的動態 Action。
      *
-     * @param callable(\SDPMlab\Anser\Orchestration\Orchestrator) $callable
+     * @param callable(\SDPMlab\Anser\Orchestration\Orchestrator,\SDPMlab\Anser\Step) $callable
      * @return StepInterface
      */
     public function addDynamicActions(callable $callable): StepInterface;