deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed order of the build config (database, file)

Browse source
This commit is contained in:
Dmitry Khomutov 2017-01-05 20:03:22 +07:00
parent f3e8acc4bd
commit 47a220d267
1 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/PHPCensor/Model/Build.php
View file

@ -96,36 +96,25 @@ class Build extends BuildBase
*/
protected function handleConfig(Builder $builder, $buildPath)
{
$build_config = null;
$build_config = $this->getProject()->getBuildConfig();
// Try getting the project build config from the database:
if (empty($build_config)) {
$build_config = $this->getProject()->getBuildConfig();
if (file_exists($buildPath . '/.php-censor.yml')) {
$build_config = file_get_contents($buildPath . '/.php-censor.yml');
} elseif (file_exists($buildPath . '/.phpci.yml')) {
$build_config = file_get_contents($buildPath . '/.phpci.yml');
} elseif (file_exists($buildPath . '/phpci.yml')) {
$build_config = file_get_contents($buildPath . '/phpci.yml');
} else {
$build_config = $this->getZeroConfigPlugins($builder);
}
}
if (is_file($buildPath . '/.php-censor.yml')) {
$build_config = file_get_contents($buildPath . '/.php-censor.yml');
}
if (is_file($buildPath . '/.phpci.yml')) {
$build_config = file_get_contents($buildPath . '/.phpci.yml');
}
if (empty($build_config) && is_file($buildPath . '/phpci.yml')) {
$build_config = file_get_contents($buildPath . '/phpci.yml');
}
// Fall back to zero config plugins:
if (empty($build_config)) {
$build_config = $this->getZeroConfigPlugins($builder);
}
if (is_string($build_config)) {
$yamlParser = new YamlParser();
$build_config = $yamlParser->parse($build_config);
}
$yamlParser = new YamlParser();
$build_config = $yamlParser->parse($build_config);
$builder->setConfigArray($build_config);
return true;
}