Use dependency injection for LockDeploymentTask

TYPO3 · Feb 7, 2022 · 984947f · 984947f
1 parent e8ac94b
commit 984947f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/Task/LockDeploymentTask.php b/src/Task/LockDeploymentTask.php
@@ -13,7 +13,6 @@
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Node;
 use TYPO3\Surf\Domain\Model\Task;
-use TYPO3\Surf\Domain\Service\ShellCommandService;
 use TYPO3\Surf\Domain\Service\ShellCommandServiceAwareInterface;
 use TYPO3\Surf\Domain\Service\ShellCommandServiceAwareTrait;
 use TYPO3\Surf\Exception\DeploymentLockedException;
@@ -23,10 +22,17 @@
  */
 final class LockDeploymentTask extends Task implements ShellCommandServiceAwareInterface
 {
-    const LOCK_FILE_NAME = 'deploy.lock';
+    public const LOCK_FILE_NAME = 'deploy.lock';
+
+    private UnlockDeploymentTask $unlockDeploymentTask;
 
     use ShellCommandServiceAwareTrait;
 
+    public function __construct(UnlockDeploymentTask $unlockDeploymentTask)
+    {
+        $this->unlockDeploymentTask = $unlockDeploymentTask;
+    }
+
     public function execute(Node $node, Application $application, Deployment $deployment, array $options = []): void
     {
         if (! $deployment->isDryRun()) {
@@ -51,9 +57,7 @@ public function execute(Node $node, Application $application, Deployment $deploy
 
     public function rollback(Node $node, Application $application, Deployment $deployment, array $options = []): void
     {
-        $unLockDeployment = new UnlockDeploymentTask();
-        $unLockDeployment->setShellCommandService(new ShellCommandService());
-        $unLockDeployment->execute($node, $application, $deployment, $options);
+        $this->unlockDeploymentTask->execute($node, $application, $deployment, $options);
     }
 
     /**

diff --git a/tests/Unit/Task/LockDeploymentTaskTest.php b/tests/Unit/Task/LockDeploymentTaskTest.php
@@ -52,11 +52,14 @@ public function deploymentIsLockedThrowsException(): void
         $this->task->execute($this->node, $this->application, $this->deployment);
     }
 
-    /**
-     * @return LockDeploymentTask
-     */
     protected function createTask(): LockDeploymentTask
     {
-        return new LockDeploymentTask();
+        $task =  static::getKernel()->getContainer()->get(LockDeploymentTask::class);
+
+        if (!$task instanceof LockDeploymentTask) {
+            throw new \UnexpectedValueException(sprintf('Task is not of type "%s"', LockDeploymentTask::class));
+        }
+
+        return $task;
     }
 }