@@ -54,9 +54,10 @@ public function __construct($name, $arguments, $actions)
5454 * Gets the ordered steps including merged waits
5555 *
5656 * @param array $arguments
57+ * @param string $actionReferenceKey
5758 * @return array
5859 */
59- public function getSteps ($ arguments
60+ public function getSteps ($ arguments, $ actionReferenceKey
6061 {
6162 $ mergeUtilnew ActionMergeUtil ();
6263 $ args$ this arguments ;
@@ -65,25 +66,26 @@ public function getSteps($arguments)
6566 $ argsarray_merge ($ args$ arguments
6667 }
6768
68- return $ mergeUtilresolveActionSteps ($ this getResolvedActionsWithArgs ($ argstrue );
69+ return $ mergeUtilresolveActionSteps ($ this getResolvedActionsWithArgs ($ args, $ actionReferenceKey true );
6970 }
7071
7172 /**
7273 * Function which takes a set of arguments to be appended to an action objects fields returns resulting
7374 * action objects with proper argument.field references.
7475 *
7576 * @param array $arguments
77+ * @param string $actionReferenceKey
7678 * @return array
7779 */
78- private function getResolvedActionsWithArgs ($ arguments
80+ private function getResolvedActionsWithArgs ($ arguments, $ actionReferenceKey
7981 {
8082 $ resolvedActions
8183 $ regexPattern'/{{([\w]+)/ ' ;
8284
8385 foreach ($ this parsedActions as $ action
8486 $ varAttributesarray_intersect (self ::VAR_ATTRIBUTES , array_keys ($ actiongetCustomActionAttributes ()));
87+ $ newActionAttributes
8588 if (!empty ($ varAttributes
86- $ newActionAttributes
8789 // 1 check to see if we have pertinent var
8890 foreach ($ varAttributesas $ varAttribute
8991 $ attributeValue$ actiongetCustomActionAttributes ()[$ varAttribute
@@ -98,18 +100,14 @@ private function getResolvedActionsWithArgs($arguments)
98100 $ matches
99101 );
100102 }
101-
102- $ resolvedActions$ actiongetMergeKey ()] = new ActionObject (
103- $ actiongetMergeKey (),
104- $ actiongetType (),
105- array_merge ($ actiongetCustomActionAttributes (), $ newActionAttributes
106- $ actiongetLinkedAction (),
107- $ actiongetOrderOffset ()
108- );
109- } else {
110- // add action here if we do not see any userInput in this particular action
111- $ resolvedActions$ actiongetMergeKey ()] = $ action
112103 }
104+ $ resolvedActions$ actiongetMergeKey () . $ actionReferenceKeynew ActionObject (
105+ $ actiongetMergeKey () . $ actionReferenceKey
106+ $ actiongetType (),
107+ array_merge ($ actiongetCustomActionAttributes (), $ newActionAttributes
108+ $ actiongetLinkedAction (),
109+ $ actiongetOrderOffset ()
110+ );
113111 }
114112
115113 return $ resolvedActions
0 commit comments