Merge branch 'master' of github.com:Block8/PHPCI

dancryer · May 8, 2014 · 33aaaf6 · 33aaaf6
2 parents b1885a0 + e7e8430
commit 33aaaf6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/PHPCI/Plugin/PhpLoc.php b/PHPCI/Plugin/PhpLoc.php
@@ -68,7 +68,7 @@ public function execute()
             return false;
         }
 
-        $success = $this->phpci->executeCommand($phploc . ' %s "%s"', $ignore, $this->phpci->buildPath);
+        $success = $this->phpci->executeCommand($phploc . ' %s "%s"', $ignore, $this->directory);
         $output = $this->phpci->getLastOutput();
 
         if (preg_match_all('/\((LOC|CLOC|NCLOC|LLOC)\)\s+([0-9]+)/', $output, $matches)) {

diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php
@@ -101,7 +101,7 @@ public function __construct(Builder $phpci, Build $build, array $options = array
         }
 
         if (isset($options['args'])) {
-            $this->args = $options['args'];
+            $this->args = $this->phpci->interpolate($options['args']);
         }
 
         if (isset($options['path'])) {