Refactor command classes

Author: Eugene Leonovich

src/Console/Command/Command.php

@@ -17,8 +17,6 @@ class Command extends BaseCommand
     const ENV_USER = 'TNT_JOBQUEUE_USER';
     const ENV_PASSWORD = 'TNT_JOBQUEUE_PASSWORD';
 
-    private $configFactory;
-
     protected function configure(): void
     {
         $this
@@ -30,20 +28,20 @@ protected function configure(): void
         ;
     }
 
-    protected function initialize(InputInterface $input, OutputInterface $output): void
+    protected function createConfigFactory(InputInterface $input, OutputInterface $output): DefaultConfigFactory
     {
         $customConfigPath = $input->getOption('config');
         if (null !== $customConfigPath && !is_readable($customConfigPath)) {
             throw new \RuntimeException("The given configuration file '$customConfigPath' does not exist or it's not readable.");
         }
 
-        $this->configFactory = $customConfigPath ? include $customConfigPath : new DefaultConfigFactory();
+        $configFactory = $customConfigPath ? include $customConfigPath : new DefaultConfigFactory();
 
         $uri = sprintf('tcp://%s:%s', $input->getOption('host'), $input->getOption('port'));
-        $this->configFactory->setConnectionUri($uri);
+        $configFactory->setConnectionUri($uri);
 
         $queueName = $input->getArgument('queue');
-        $this->configFactory->setQueueName($queueName);
+        $configFactory->setQueueName($queueName);
 
         $user = $input->getOption('user') ?: getenv(self::ENV_USER);
         if ($user) {
@@ -55,12 +53,9 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
                 $password = $helper->ask($input, $output, $question);
             }
 
-            $this->configFactory->setCredentials($user, $password);
+            $configFactory->setCredentials($user, $password);
         }
-    }
 
-    protected function getConfigFactory(): DefaultConfigFactory
-    {
-        return $this->configFactory;
+        return $configFactory;
     }
 }

src/Console/Command/KickCommand.php

@@ -21,8 +21,8 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): void
     {
+        $queue = $this->createConfigFactory($input, $output)->createQueue();
         $count = $input->getArgument('count');
-        $queue = $this->getConfigFactory()->createQueue();
 
         $affected = $queue->kick($count);
 

src/Console/Command/PutCommand.php

@@ -28,7 +28,7 @@ protected function execute(InputInterface $input, OutputInterface $output): void
             throw new \InvalidArgumentException('Invalid json data.');
         }
 
-        $queue = $this->getConfigFactory()->createQueue();
+        $queue = $this->createConfigFactory($input, $output)->createQueue();
         $task = $queue->put($data);
 
         $output->writeln(sprintf(

src/Console/Command/RunCommand.php

@@ -25,11 +25,9 @@ protected function configure(): void
         ;
     }
 
-    protected function initialize(InputInterface $input, OutputInterface $output): void
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
-        parent::initialize($input, $output);
-
-        $configFactory = $this->getConfigFactory();
+        $configFactory = $this->createConfigFactory($input, $output);
 
         if ($logFile = $input->getOption('log-file')) {
             $configFactory->setLogFile($logFile);
@@ -40,11 +38,8 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
         if ($executorsConfigFile = $input->getOption('executors-config')) {
             $configFactory->setExecutorsConfigFile(realpath($executorsConfigFile));
         }
-    }
 
-    protected function execute(InputInterface $input, OutputInterface $output): void
-    {
-        $runner = $this->getConfigFactory()->createRunner();
+        $runner = $configFactory->createRunner();
         $runner->run($input->getOption('idle-timeout'));
     }
 }

src/Console/Command/StatsCommand.php

@@ -19,7 +19,7 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): void
     {
-        $queue = $this->getConfigFactory()->createQueue();
+        $queue = $this->createConfigFactory($input, $output)->createQueue();
         $stats = $queue->stats();
 
         $output->writeln(sprintf('Queue: <options=bold>%s</>', $queue->getName()));

src/Console/Command/TruncateCommand.php

@@ -19,7 +19,7 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): void
     {
-        $queue = $this->getConfigFactory()->createQueue();
+        $queue = $this->createConfigFactory($input, $output)->createQueue();
         $queue->truncate();
 
         $output->writeln(sprintf('<info>%s</info> was successfully truncated.', $queue->getName()));