Merge 9948be0 into 69c4307

TYPO3 · Jun 1, 2020 · 7a9b4b9 · 7a9b4b9
2 parents 69c4307 + 9948be0
commit 7a9b4b9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 34 deletions.
diff --git a/src/Domain/Service/TaskFactory.php b/src/Domain/Service/TaskFactory.php
@@ -29,6 +29,10 @@ class TaskFactory implements ContainerAwareInterface
      */
     public function createTaskInstance(string $taskName)
     {
+        if (!$this->container->has($taskName)) {
+            $this->container->set($taskName, new $taskName());
+        }
+
         $task = $this->container->get($taskName);
 
         if (!$task instanceof Task) {

diff --git a/tests/Unit/Domain/Service/TaskFactoryTest.php b/tests/Unit/Domain/Service/TaskFactoryTest.php
@@ -10,68 +10,45 @@
  */
 
 use PHPUnit\Framework\TestCase;
-use Prophecy\Prophecy\ObjectProphecy;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use TYPO3\Surf\Domain\Model\Application;
 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\TaskFactory;
 use TYPO3\Surf\Exception as SurfException;
+use TYPO3\Surf\Task\CreateArchiveTask;
+use TYPO3\Surf\Tests\Unit\KernelAwareTrait;
 
 class TaskFactoryTest extends TestCase
 {
+    use KernelAwareTrait;
+
     /**
      * @var TaskFactory
      */
     protected $subject;
 
-    /**
-     * @var ContainerInterface|ObjectProphecy
-     */
-    private $container;
-
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->container = $this->prophesize(ContainerInterface::class);
+        $container = self::getKernel()->getContainer();
         $this->subject = new TaskFactory();
-        $this->subject->setContainer($this->container->reveal());
+        $this->subject->setContainer($container);
     }
 
     /**
      * @test
      */
     public function createTaskInstance(): void
     {
-        $task = new class extends Task {
-            public function execute(Node $node, Application $application, Deployment $deployment, array $options = []): void
-            {
-            }
-        };
-        $this->container->get(get_class($task))->willReturn($task);
-
-        $this->assertEquals($task, $this->subject->createTaskInstance(get_class($task)));
+        $this->assertInstanceOf(CreateArchiveTask::class, $this->subject->createTaskInstance(CreateArchiveTask::class));
     }
 
     /**
      * @test
      */
-    public function createTaskInstanceImplementingShellCommandServiceAwareInterface(): void
+    public function createSyntheticServiceIfNotExists(): void
     {
-        $task = new class extends Task implements ShellCommandServiceAwareInterface {
-            public function execute(Node $node, Application $application, Deployment $deployment, array $options = []): void
-            {
-            }
-
-            public function setShellCommandService(ShellCommandService $shellCommandService): void
-            {
-            }
-        };
-        $this->container->get(get_class($task))->willReturn($task);
-
-        $this->assertEquals($task, $this->subject->createTaskInstance(get_class($task)));
+        $this->assertInstanceOf(CustomTask::class, $this->subject->createTaskInstance(CustomTask::class));
     }
 
     /**
@@ -81,8 +58,14 @@ public function createTaskInstanceThrowsExceptionClassIsNotOfCorrectSubclass():
     {
         $task = new class {
         };
-        $this->container->get(get_class($task))->willReturn($task);
         $this->expectException(SurfException::class);
         $this->subject->createTaskInstance(get_class($task));
     }
 }
+
+class CustomTask extends Task
+{
+    public function execute(Node $node, Application $application, Deployment $deployment, array $options = [])
+    {
+    }
+}