Optimized command methods

Author: mmoreram

src/PHPFormatter/Command/UseSortCommand.php

@@ -16,6 +16,7 @@
 namespace Mmoreram\PHPFormatter\Command;
 
 use Exception;
+use IteratorAggregate;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -104,10 +105,66 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $verbose = $output->getVerbosity();
         $path = $input->getArgument('path');
-        $dryRun = $input->getOption('dry-run');
+
+        /**
+         * We load the options to work with
+         */
+        $options = $this->getUsableConfig($input);
+
+        /**
+         * Building the real directory or file to work in
+         */
+        $filesystem = new Filesystem();
+        if (!$filesystem->isAbsolutePath($path)) {
+            $path = getcwd() . DIRECTORY_SEPARATOR . $path;
+        }
+
+        if (!is_file($path) && !is_dir($path)) {
+
+            throw new Exception('Directory or file "' . $path . '" does not exist');
+        }
+
+        /**
+         * Print dry-run message if needed
+         */
+        $this->printDryRunMessage(
+            $input,
+            $output,
+            $path
+        );
+
+        /**
+         * Print all configuration block if verbose level allows it
+         */
+        $this->printConfigUsed(
+            $output,
+            $options
+        );
+
         $fileFinder = new FileFinder;
+        $files = $fileFinder->findPHPFilesByPath($path);
+
+        /**
+         * Parse and fix all found files
+         */
+        $this->parseAndFixFiles(
+            $input,
+            $output,
+            $files,
+            $options
+        );
+    }
+
+    /**
+     * Load config
+     *
+     * @param InputInterface $input Input
+     *
+     * @return array Config array
+     */
+    public function getUsableConfig(InputInterface $input)
+    {
         $configLoader = new ConfigLoader;
         $configFinder = new ConfigFinder;
 
@@ -119,7 +176,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
          */
         $configPath = rtrim($input->getOption('config'), DIRECTORY_SEPARATOR);
 
-        $options = $configLoader->loadConfigValues(
+        return $configLoader->loadConfigValues(
             self::COMMAND_NAME,
             $configFinder->findConfigFile($configPath),
             array(
@@ -135,19 +192,25 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 'sort-direction' => UseSorter::SORT_DIRECTION_ASC
             )
         );
+    }
 
-        /**
-         * Building the real directory or file to work in
-         */
-        $filesystem = new Filesystem();
-        if (!$filesystem->isAbsolutePath($path)) {
-            $path = getcwd() . DIRECTORY_SEPARATOR . $path;
-        }
-
-        if (!is_file($path) && !is_dir($path)) {
-
-            throw new Exception('Directory or file "' . $path . '" does not exist');
-        }
+    /**
+     * Print the Dry-run message if needed
+     *
+     * @param InputInterface  $input  Input
+     * @param OutputInterface $output Output
+     * @param string          $path   Path
+     *
+     * @return UseSortCommand self Object
+     */
+    public function printDryRunMessage(
+        InputInterface $input,
+        OutputInterface $output,
+        $path
+    )
+    {
+        $dryRun = $input->getOption('dry-run');
+        $verbose = $output->getVerbosity();
 
         /**
          * Dry-run message
@@ -162,17 +225,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln('# Executing process in ' . $path);
         }
 
-        /**
-         * Creates the new UseSorter file, given config values
-         */
-        $useSorter = new UseSorter();
-        $useSorter
-            ->setGroups($options['group'])
-            ->setGroupType($options['group-type'])
-            ->setSortType($options['sort-type'])
-            ->setSortDirection($options['sort-direction']);
+        return $this;
+    }
 
-        $files = $fileFinder->findPHPFilesByPath($path);
+    /**
+     * Print the configuration used by the command
+     *
+     * @param OutputInterface $output  Output
+     * @param array           $options Options used by the command
+     *
+     * @return UseSortCommand self Object
+     */
+    public function printConfigUsed(
+        OutputInterface $output,
+        array $options
+    )
+    {
+        $verbose = $output->getVerbosity();
 
         /**
          * If verbose level is higher or equal than -vv, we print the config
@@ -207,6 +276,31 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $output->writeln('#');
 
+        return $this;
+    }
+
+    /**
+     * Parse and fix all files found
+     *
+     * @param InputInterface    $input   Input
+     * @param OutputInterface   $output  Output
+     * @param IteratorAggregate $files   Files
+     * @param array             $options Options
+     *
+     * @return UseSortCommand self Object
+     */
+    public function parseAndFixFiles(
+        InputInterface $input,
+        OutputInterface $output,
+        IteratorAggregate $files,
+        array $options
+
+    )
+    {
+        $dryRun = $input->getOption('dry-run');
+        $verbose = $output->getVerbosity();
+        $useSorter = $this->createUseSorter($options);
+
         /**
          * Each found php file is processed
          */
@@ -230,5 +324,29 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 file_put_contents($file, $result);
             }
         }
+
+        return $this;
+    }
+
+    /**
+     * Create UseSorter Object given a configuration
+     *
+     * @param array $options Options
+     *
+     * @return UseSorter Use sorter instance
+     */
+    public function createUseSorter(array $options)
+    {
+        /**
+         * Creates the new UseSorter file, given config values
+         */
+        $useSorter = new UseSorter();
+        $useSorter
+            ->setGroups($options['group'])
+            ->setGroupType($options['group-type'])
+            ->setSortType($options['sort-type'])
+            ->setSortDirection($options['sort-direction']);
+
+        return $useSorter;
     }
 }