deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge 3227a816f9 into 64b0f60368

Browse source
This commit is contained in:
Dmitry 2016-08-17 17:00:07 +00:00 committed by GitHub
parent 64b0f60368 3227a816f9
commit b60c22adfe
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
PHPCI/Plugin/Composer.php
View file

@ -25,6 +25,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
protected $directory; protected $directory;
protected $action; protected $action;
protected $preferDist; protected $preferDist;
protected $preferSource;
protected $phpci; protected $phpci;
protected $build; protected $build;
protected $nodev; protected $nodev;
@ -55,14 +56,14 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
*/ */
public function __construct(Builder $phpci, Build $build, array $options = array()) public function __construct(Builder $phpci, Build $build, array $options = array())
{ {
$path = $phpci->buildPath; $path = $phpci->buildPath;
$this->phpci = $phpci; $this->phpci = $phpci;
$this->build = $build; $this->build = $build;
$this->directory = $path; $this->directory = $path;
$this->action = 'install'; $this->action = 'install';
$this->preferDist = false; $this->preferDist = false;
$this->preferSource = false; $this->preferSource = false;
$this->nodev = false; $this->nodev = false;
if (array_key_exists('directory', $options)) { if (array_key_exists('directory', $options)) {
$this->directory = $path . DIRECTORY_SEPARATOR . $options['directory']; $this->directory = $path . DIRECTORY_SEPARATOR . $options['directory'];
@ -77,7 +78,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
} }
if (array_key_exists('prefer_source', $options)) { if (array_key_exists('prefer_source', $options)) {
$this->preferDist = false; $this->preferDist = false;
$this->preferSource = (bool)$options['prefer_source']; $this->preferSource = (bool)$options['prefer_source'];
} }