refactor CLI DI MaintenanceTickCommand;

Author: PazBorma

bin/cli

@@ -57,7 +57,7 @@ $app->add($dic->get(UserCreateCommand::class));
 // tick
 $app->add($dic->get(ColonyTickCommand::class));
 $app->add($dic->get(SpacecraftTickCommand::class));
-$app->add(new MaintenanceTickCommand($dic));
+$app->add($dic->get(MaintenanceTickCommand::class));
 $app->add($dic->get(ProcessTickCommand::class));
 $app->add(new ManagerTickCommand($dic));
 $app->add($dic->get(PirateTickCommand::class));

src/Component/Cli/MaintenanceTickCommand.php

@@ -5,7 +5,6 @@
 namespace Stu\Component\Cli;
 
 use Ahc\Cli\Input\Command;
-use Psr\Container\ContainerInterface;
 use Stu\Module\Tick\Maintenance\MaintenanceTickRunner;
 
 /**
@@ -14,7 +13,7 @@
 final class MaintenanceTickCommand extends Command
 {
     public function __construct(
-        private ContainerInterface $dic
+        private readonly MaintenanceTickRunner $tickRunner,
     ) {
         parent::__construct(
             'tick:maintenance',
@@ -29,8 +28,7 @@ public function __construct(
 
     public function execute(): void
     {
-        $tickRunner = $this->dic->get(MaintenanceTickRunner::class);
-        $tickRunner->run(1, 1);
+        $this->tickRunner->run(1, 1);
 
         $this->io()->ok(
             'Maintenance tick has been executed',

src/Module/Tick/Maintenance/MaintenanceTickRunner.php

@@ -13,18 +13,18 @@
 /**
  * Executes maintenance tasks like db backup and such
  */
-final class MaintenanceTickRunner implements TickRunnerInterface
+class MaintenanceTickRunner implements TickRunnerInterface
 {
     private const string TICK_DESCRIPTION = "maintenancetick";
 
     /**
      * @param array<MaintenanceHandlerInterface> $handlerList
      */
     public function __construct(
-        private GameConfigRepositoryInterface $gameConfigRepository,
-        private TransactionTickRunnerInterface $transactionTickRunner,
-        private Connection $connection,
-        private array $handlerList
+        private readonly GameConfigRepositoryInterface $gameConfigRepository,
+        private readonly TransactionTickRunnerInterface $transactionTickRunner,
+        private readonly Connection $connection,
+        private readonly array $handlerList
     ) {
     }
 

tests/unit/Component/Cli/MaintenanceTickCommandTest.php

@@ -7,34 +7,29 @@
 use Ahc\Cli\Application;
 use Mockery\MockInterface;
 use Override;
-use Psr\Container\ContainerInterface;
 use Stu\CliInteractorHelper;
 use Stu\Module\Tick\Maintenance\MaintenanceTickRunner;
-use Stu\Module\Tick\TickRunnerInterface;
 use Stu\StuTestCase;
 
 class MaintenanceTickCommandTest extends StuTestCase
 {
-    /** @var MockInterface&ContainerInterface */
-    private MockInterface $dic;
+    /** @var MockInterface&MaintenanceTickRunner */
+    private MockInterface $tickRunner;
 
     private MaintenanceTickCommand $subject;
 
     #[Override]
     protected function setUp(): void
     {
-        $this->dic = $this->mock(ContainerInterface::class);
+        $this->tickRunner = $this->mock(MaintenanceTickRunner::class);
 
-        $this->subject = new MaintenanceTickCommand(
-            $this->dic
-        );
+        $this->subject = new MaintenanceTickCommand($this->tickRunner);
     }
 
     public function testExecuteExecutes(): void
     {
         $app = $this->mock(Application::class);
         $interactor = $this->mock(CliInteractorHelper::class);
-        $tickRunner = $this->mock(TickRunnerInterface::class);
 
         $this->subject->bind($app);
 
@@ -50,12 +45,7 @@ public function testExecuteExecutes(): void
             )
             ->once();
 
-        $this->dic->shouldReceive('get')
-            ->with(MaintenanceTickRunner::class)
-            ->once()
-            ->andReturn($tickRunner);
-
-        $tickRunner->shouldReceive('run')
+        $this->tickRunner->shouldReceive('run')
             ->with(1, 1)
             ->once();