From 5cd2e21e07c0573e6b59a00198699f673def10f4 Mon Sep 17 00:00:00 2001 From: Armen Markossyan Date: Fri, 2 May 2014 23:47:08 +0600 Subject: [PATCH 1/2] Fix #217 --- PHPCI/Plugin/PhpLoc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/PhpLoc.php b/PHPCI/Plugin/PhpLoc.php index 000b82cc..a00e6668 100644 --- a/PHPCI/Plugin/PhpLoc.php +++ b/PHPCI/Plugin/PhpLoc.php @@ -68,7 +68,7 @@ class PhpLoc implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin 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)) { From 067aa858760a1ad2f6ffef7b4c41604c95e5e136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jari=20Ylim=C3=A4inen?= Date: Fri, 2 May 2014 22:58:22 +0300 Subject: [PATCH 2/2] Interpolate PHPUnit arguments --- PHPCI/Plugin/PhpUnit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php index 16de7aa0..76f321b1 100755 --- a/PHPCI/Plugin/PhpUnit.php +++ b/PHPCI/Plugin/PhpUnit.php @@ -101,7 +101,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } if (isset($options['args'])) { - $this->args = $options['args']; + $this->args = $this->phpci->interpolate($options['args']); } if (isset($options['path'])) {