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

Merge branch 'master' into upstream

Browse source
This commit is contained in:
Aliaxander 2016-04-27 18:32:52 +04:00
parent f9f5cb5768 21ba39e6ff
commit 7bdc1b9362
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.phpci.yml
View file

@ -13,7 +13,6 @@ build_settings:
setup: setup:
composer: composer:
action: "install" action: "install"
prefer_dist: false
test: test:
php_parallel_lint: php_parallel_lint:

6
PHPCI/Helper/BaseCommandExecutor.php
View file

@ -76,6 +76,7 @@ abstract class BaseCommandExecutor implements CommandExecutor
$this->lastOutput = array(); $this->lastOutput = array();
$command = call_user_func_array('sprintf', $args); $command = call_user_func_array('sprintf', $args);
$this->logger->logDebug($command);
if ($this->quiet) { if ($this->quiet) {
$this->logger->log('Executing: ' . $command); $this->logger->log('Executing: ' . $command);
@ -89,11 +90,6 @@ abstract class BaseCommandExecutor implements CommandExecutor
); );
$pipes = array(); $pipes = array();
if (defined('PHPCI_DEBUG_MODE')) {
$this->logger->logDebug($command);
}
$process = proc_open($command, $descriptorSpec, $pipes, $this->buildPath, null); $process = proc_open($command, $descriptorSpec, $pipes, $this->buildPath, null);
if (is_resource($process)) { if (is_resource($process)) {

4
PHPCI/Logging/BuildLogger.php
View file

@ -104,7 +104,9 @@ class BuildLogger implements LoggerAwareInterface
*/ */
public function logDebug($message) public function logDebug($message)
{ {
$this->log("\033[0;33m" . $message . "\033[0m"); if (defined('PHPCI_DEBUG_MODE') && PHPCI_DEBUG_MODE) {
$this->log("\033[0;33m" . $message . "\033[0m");
}
} }
/** /**

14
PHPCI/Plugin/Composer.php
View file

@ -61,6 +61,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
$this->directory = $path; $this->directory = $path;
$this->action = 'install'; $this->action = 'install';
$this->preferDist = false; $this->preferDist = false;
$this->preferSource = false;
$this->nodev = false; $this->nodev = false;
if (array_key_exists('directory', $options)) { if (array_key_exists('directory', $options)) {
@ -75,6 +76,11 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
$this->preferDist = (bool)$options['prefer_dist']; $this->preferDist = (bool)$options['prefer_dist'];
} }
if (array_key_exists('prefer_source', $options)) {
$this->preferDist = false;
$this->preferSource = (bool)$options['prefer_source'];
}
if (array_key_exists('no_dev', $options)) { if (array_key_exists('no_dev', $options)) {
$this->nodev = (bool)$options['no_dev']; $this->nodev = (bool)$options['no_dev'];
} }
@ -97,10 +103,12 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
if ($this->preferDist) { if ($this->preferDist) {
$this->phpci->log('Using --prefer-dist flag'); $this->phpci->log('Using --prefer-dist flag');
$cmd .= '--prefer-dist'; $cmd .= ' --prefer-dist';
} else { }
if ($this->preferSource) {
$this->phpci->log('Using --prefer-source flag'); $this->phpci->log('Using --prefer-source flag');
$cmd .= '--prefer-source'; $cmd .= ' --prefer-source';
} }
if ($this->nodev) { if ($this->nodev) {

3
PHPCI/Plugin/Util/TestResultParsers/Codeception.php
View file

@ -30,7 +30,6 @@ class Codeception implements ParserInterface
{ {
$this->phpci = $phpci; $this->phpci = $phpci;
$this->resultsXml = $resultsXml; $this->resultsXml = $resultsXml;
$this->totalTests = 0; $this->totalTests = 0;
} }
@ -71,7 +70,7 @@ class Codeception implements ParserInterface
if (isset($testcase->failure) || isset($testcase->error)) { if (isset($testcase->failure) || isset($testcase->error)) {
$testresult['pass'] = false; $testresult['pass'] = false;
$testresult['message'] = isset($testcase->failure) ? (string) $testcase->failure : (string) $testcase->error; $testresult['message'] = (string)$testcase->failure . (string)$testcase->error;
} else { } else {
$testresult['pass'] = true; $testresult['pass'] = true;
} }