Update TaskContainer.php

driesvints · web-flow · commit 65d779cc1742 · 2020-03-03T23:27:02.000+01:00
diff --git a/src/TaskContainer.php b/src/TaskContainer.php
@@ -333,7 +333,7 @@ public function getTask($task, array $macroOptions = [])
             throw new Exception(sprintf('Task "%s" is not defined.', $task));
         }
 
-        $options = array_merge($macroOptions, $this->getTaskOptions($task));
+        $options = array_merge($this->getTaskOptions($task), $macroOptions);
 
         $parallel = Arr::get($options, 'parallel', false);
 

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ public function getTask($task, array $macroOptions = [])`
`333`	`333`	`throw new Exception(sprintf('Task "%s" is not defined.', $task));`
`334`	`334`	`}`
`335`	`335`
`336`		`- $options = array_merge($macroOptions, $this->getTaskOptions($task));`
	`336`	`+ $options = array_merge($this->getTaskOptions($task), $macroOptions);`
`337`	`337`
`338`	`338`	`$parallel = Arr::get($options, 'parallel', false);`
`339`	`339`