[BUGFIX] Allow global options with prefix for defined tasks

TYPO3 · Mar 31, 2016 · 705e965 · 705e965
1 parent 1a88e2a
commit 705e965
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/Tests/Unit/Domain/Service/TaskManagerTest.php b/Tests/Unit/Domain/Service/TaskManagerTest.php
@@ -192,4 +192,46 @@ public function applicationOptionsOverrideDeploymentOptions()
         $localOptions = array();
         $this->taskManager->execute('MyVendor\\MyPackage\\Task\\TaskGroup\\MyTask', $this->node, $this->application, $this->deployment, 'test', $localOptions);
     }
+
+    /**
+     * @test
+     */
+    public function executeDoesNotPassPrefixedTaskOptionsOfBaseTaskToDefinedTask()
+    {
+        $globalOptions = array(
+            'MyVendor\\MyPackage\\Task\\TaskGroup\\MyTask[taskOption]' => 'Foo'
+        );
+        $this->deployment->setOptions($globalOptions);
+
+        $this->task->expects($this->atLeastOnce())->method('execute')->with(
+            $this->anything(),
+            $this->anything(),
+            $this->anything(),
+            $this->logicalNot($this->arrayHasKey('taskOption'))
+        );
+
+        $localOptions = array();
+        $this->taskManager->execute('MyVendor\\MyPackage\\Task\\TaskGroup\\MyTask', $this->node, $this->application, $this->deployment, 'test', $localOptions, 'MyVendor\\MyPackage\\DefinedTask\\TaskGroup\\MyTask');
+    }
+
+    /**
+     * @test
+     */
+    public function executePassePrefixedDefinedTaskOptionsToDefinedTask()
+    {
+        $globalOptions = array(
+            'MyVendor\\MyPackage\\DefinedTask\\TaskGroup\\MyTask[taskOption]' => 'Foo'
+        );
+        $this->deployment->setOptions($globalOptions);
+
+        $this->task->expects($this->atLeastOnce())->method('execute')->with(
+            $this->anything(),
+            $this->anything(),
+            $this->anything(),
+            $this->arrayHasKey('taskOption')
+        );
+
+        $localOptions = array();
+        $this->taskManager->execute('MyVendor\\MyPackage\\Task\\TaskGroup\\MyTask', $this->node, $this->application, $this->deployment, 'test', $localOptions, 'MyVendor\\MyPackage\\DefinedTask\\TaskGroup\\MyTask');
+    }
 }
diff --git a/src/Domain/Service/TaskManager.php b/src/Domain/Service/TaskManager.php
@@ -41,7 +41,7 @@ public function execute($taskName, Node $node, Application $application, Deploym
 
         $task = $this->createTaskInstance($taskName);
 
-        $globalOptions = $this->overrideOptions($taskName, $deployment, $node, $application, $options);
+        $globalOptions = $this->overrideOptions($definedTaskName, $deployment, $node, $application, $options);
 
         if (!$deployment->isDryRun()) {
             $task->execute($node, $application, $deployment, $globalOptions);