Moved command generation from Manager to LintProcess

Author: JakubOnderka

src/Manager.php

@@ -59,7 +59,6 @@ public function run(Settings $settings = null)
             $output->writeLine("{$settings->parallelJobs} parallel jobs");
         }
 
-        $cmdLine = $this->getCmdLine($settings);
         $files = $this->getFilesFromPaths($settings->paths, $settings->extensions, $settings->excluded);
 
         if (empty($files)) {
@@ -77,7 +76,7 @@ public function run(Settings $settings = null)
         while ($files || $running) {
             for ($i = count($running); $files && $i < $settings->parallelJobs; $i++) {
                 $file = array_shift($files);
-                $running[$file] = new LintProcess($cmdLine . escapeshellarg($file));
+                $running[$file] = new LintProcess($settings->phpExecutable, $file, $settings->aspTags, $settings->shortTag);
             }
 
             usleep(100);
@@ -183,19 +182,6 @@ protected function phpVersionIdToString($phpVersionId)
         return "$majorVersion.$minorVersion.$releaseVersion";
     }
 
-    /**
-     * @param Settings $settings
-     * @return string
-     */
-    protected function getCmdLine(Settings $settings)
-    {
-        $cmdLine = escapeshellarg($settings->phpExecutable);
-        $cmdLine .= ' -d asp_tags=' . ($settings->aspTags ? 'On' : 'Off');
-        $cmdLine .= ' -d short_open_tag=' . ($settings->shortTag ? 'On' : 'Off');
-        $cmdLine .= ' -d error_reporting=E_ALL';
-        return $cmdLine . ' -n -l ';
-    }
-
     /**
      * @param array $paths
      * @param array $extensions

src/Process.php

@@ -159,6 +159,23 @@ protected function terminateAndReadOutput()
 
 class LintProcess extends Process
 {
+    /**
+     * @param string $phpExecutable
+     * @param string $fileToCheck Path to file to check
+     * @param bool $aspTags
+     * @param bool $shortTag
+     */
+    public function __construct($phpExecutable, $fileToCheck, $aspTags = false, $shortTag = false)
+    {
+        $cmdLine = escapeshellarg($phpExecutable);
+        $cmdLine .= ' -d asp_tags=' . ($aspTags ? 'On' : 'Off');
+        $cmdLine .= ' -d short_open_tag=' . ($shortTag ? 'On' : 'Off');
+        $cmdLine .= ' -d error_reporting=E_ALL';
+        $cmdLine .= ' -n -l ' . escapeshellarg($fileToCheck);
+
+        parent::__construct($cmdLine);
+    }
+
     /**
      * @return bool
      */