Merging latest master

This commit is contained in:
Dan Cryer 2014-12-08 14:18:57 +00:00
commit 28d09275fd
83 changed files with 1283 additions and 69 deletions

View file

@ -32,6 +32,12 @@ class Phing implements \PHPCI\Plugin
protected $phpci;
protected $build;
/**
* Set up the plugin, configure options, etc.
* @param Builder $phpci
* @param Build $build
* @param array $options
*/
public function __construct(Builder $phpci, Build $build, array $options = array())
{
$this->setPhpci($phpci);
@ -139,6 +145,10 @@ class Phing implements \PHPCI\Plugin
return $this->targets;
}
/**
* Converts an array of targets into a string.
* @return string
*/
private function targetsToString()
{
return implode(' ', $this->targets);
@ -181,6 +191,10 @@ class Phing implements \PHPCI\Plugin
$this->buildFile = $buildFile;
}
/**
* Get phing build file path.
* @return string
*/
public function getBuildFilePath()
{
return $this->getDirectory() . $this->buildFile;