Merge pull request #113 from ByteInternet/fix_regressions

tdgroot · web-flow · commit f6fe8f3d09e1 · 2024-07-04T14:39:18.000+02:00
Fix regressions
diff --git a/src/DeployRunner.php b/src/DeployRunner.php
@@ -148,24 +148,15 @@ private function initializeConfigurableTask(ConfigurableTaskInterface $task, Con
 
         foreach ($configurations as $taskConfig) {
             if ($task->supports($taskConfig)) {
-                $task = $task->configureWithTaskConfig($taskConfig);
+                $deployerTask = $task->configureWithTaskConfig($taskConfig);
 
-                if ($task && $taskConfig instanceof ServerRoleConfigurableInterface) {
-                    $this->configureTaskOnServerRoles($task, $taskConfig);
-                }
-
-                if ($task && $taskConfig instanceof StageConfigurableInterface) {
-                    $this->configureTaskOnStage($task, $taskConfig);
+                if ($deployerTask && $taskConfig instanceof StageConfigurableInterface) {
+                    $this->configureTaskOnStage($deployerTask, $taskConfig);
                 }
             }
         }
     }
 
-    private function configureTaskOnServerRoles(Task $task, ServerRoleConfigurableInterface $taskConfiguration)
-    {
-        $task->select('role=' . implode(',role=', $taskConfiguration->getServerRoles()));
-    }
-
     private function configureTaskOnStage(Task $task, StageConfigurableInterface $taskConfiguration)
     {
         if (!$taskConfiguration->getStage()) {

Original file line number	Diff line number	Diff line change
`@@ -148,24 +148,15 @@ private function initializeConfigurableTask(ConfigurableTaskInterface $task, Con`
`148`	`148`
`149`	`149`	`foreach ($configurations as $taskConfig) {`
`150`	`150`	`if ($task->supports($taskConfig)) {`
`151`		`- $task = $task->configureWithTaskConfig($taskConfig);`
	`151`	`+ $deployerTask = $task->configureWithTaskConfig($taskConfig);`
`152`	`152`
`153`		`- if ($task && $taskConfig instanceof ServerRoleConfigurableInterface) {`
`154`		`- $this->configureTaskOnServerRoles($task, $taskConfig);`
`155`		`- }`
`156`		`-`
`157`		`- if ($task && $taskConfig instanceof StageConfigurableInterface) {`
`158`		`- $this->configureTaskOnStage($task, $taskConfig);`
	`153`	`+ if ($deployerTask && $taskConfig instanceof StageConfigurableInterface) {`
	`154`	`+ $this->configureTaskOnStage($deployerTask, $taskConfig);`
`159`	`155`	`}`
`160`	`156`	`}`
`161`	`157`	`}`
`162`	`158`	`}`
`163`	`159`
`164`		`- private function configureTaskOnServerRoles(Task $task, ServerRoleConfigurableInterface $taskConfiguration)`
`165`		`- {`
`166`		`- $task->select('role=' . implode(',role=', $taskConfiguration->getServerRoles()));`
`167`		`- }`
`168`		`-`
`169`	`160`	`private function configureTaskOnStage(Task $task, StageConfigurableInterface $taskConfiguration)`
`170`	`161`	`{`
`171`	`162`	`if (!$taskConfiguration->getStage()) {`