Move binary helper back to trait - closes #5

EdgedesignCZ · Sep 14, 2015 · eafc9ac · eafc9ac
1 parent 68e27ba
commit eafc9ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/CodeAnalysisTasks.php b/src/CodeAnalysisTasks.php
@@ -22,7 +22,7 @@ trait CodeAnalysisTasks
     public function tools()
     {
         foreach (array_keys($this->tools) as $tool) {
-            $this->_exec($this->options->binary("{$tool} --version"));
+            $this->_exec($this->binary("{$tool} --version"));
         }
     }
 
@@ -74,7 +74,7 @@ private function parallelRun()
 
     private function toolToProcess($tool, $optionSeparator)
     {
-        $binary = $this->options->binary($tool);
+        $binary = $this->binary($tool);
         $process = $this->taskExec($binary);
         foreach ($this->$tool() as $arg => $value) {
             if (is_int($arg)) {
@@ -173,4 +173,9 @@ private function phpmetrics()
         }
         return $args;
     }
+
+    private function binary($tool)
+    {
+        return COMPOSER_BINARY_DIR . $tool;
+    }
 }
diff --git a/src/Options.php b/src/Options.php
@@ -43,9 +43,4 @@ public function appFile($file)
     {
         return __DIR__ . "/../app/{$file}";
     }
-
-    public function binary($tool)
-    {
-        return COMPOSER_BINARY_DIR . $tool;
-    }
 }
diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
@@ -27,11 +27,9 @@ private function overrideOptions(array $options = array())
 
     public function testShouldEscapePaths()
     {
-        define('COMPOSER_BINARY_DIR', __DIR__);
         assertThat($this->fileOutput->analyzedDir, is('"./"'));
         assertThat($this->fileOutput->toFile('file'), is('"build//file"'));
         assertThat($this->fileOutput->appFile('file'), is(nonEmptyString()));
-        assertThat($this->fileOutput->binary('file'), is(nonEmptyString()));
     }
 
     public function testShouldIgnorePdependInCliOutput()