Refactoring

Author: jakubzapletal

spec/Command/ScriptCommandSpec.php

@@ -3,14 +3,14 @@
 namespace spec\PhpZone\Shell\Command;
 
 use PhpSpec\ObjectBehavior;
-use PhpZone\Shell\Process\ProcessFactory;
 use Prophecy\Argument;
+use Symfony\Component\Process\Process;
 
 class ScriptCommandSpec extends ObjectBehavior
 {
-    public function let(ProcessFactory $processFactory)
+    public function let(Process $process)
     {
-        $this->beConstructedWith('command:test', array('ls'), 'test description', $processFactory);
+        $this->beConstructedWith('command:test', 'test description', array($process));
     }
 
     public function it_is_initializable()

src/Command/ScriptCommand.php

@@ -2,7 +2,6 @@
 
 namespace PhpZone\Shell\Command;
 
-use PhpZone\Shell\Process\ProcessFactory;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -11,29 +10,20 @@
 class ScriptCommand extends Command
 {
     /** @var Process[] */
-    private $processes = array();
+    private $processes;
 
     /**
      * @param string $name
-     * @param array $script
-     * @param string $description
-     * @param ProcessFactory $processFactory
+     * @param null|string $description
+     * @param array $processes
      */
-    public function __construct($name, array $script, $description, ProcessFactory $processFactory)
+    public function __construct($name, $description, array $processes)
     {
-        $this->generateProcesses($processFactory, $script);
         $this->setDescription($description);
 
-        parent::__construct($name);
-    }
-
-    private function generateProcesses(ProcessFactory $processFactory, array $script)
-    {
-        foreach ($script as $command) {
-            $process = $processFactory->createByCommand($command);
+        $this->processes = $processes;
 
-            $this->processes[] = $process;
-        }
+        parent::__construct($name);
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)

src/Shell.php

@@ -9,6 +9,7 @@
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Process\Process;
 
 class Shell implements Extension
 {
@@ -71,12 +72,32 @@ private function generateCommandDefinition($commandName, array $commandOptions)
     {
         $commandOptions = $this->optionsResolver->resolve($commandOptions);
 
+        $processes = $this->generateProcesses($commandOptions['script']);
+
         $definition = new Definition('PhpZone\Shell\Command\ScriptCommand');
         $definition->setArguments(
-            array($commandName, $commandOptions['script'], $commandOptions['description'], $this->processFactory)
+            array($commandName, $commandOptions['description'], $processes)
         );
         $definition->addTag('command');
 
         return $definition;
     }
+
+    /**
+     * @param array $script
+     *
+     * @return Process[]
+     */
+    private function generateProcesses(array $script)
+    {
+        $processes = array();
+
+        foreach ($script as $command) {
+            $process = $this->processFactory->createByCommand($command);
+
+            $processes[] = $process;
+        }
+
+        return $processes;
+    }
 }