From ccb3d91ae13b6aa2e9b8467e6a0285efe23ece96 Mon Sep 17 00:00:00 2001
From: Corpsee <poisoncorpsee@gmail.com>
Date: Thu, 10 Apr 2014 23:41:02 +0700
Subject: [PATCH] Inverted priority of configs: phpci.yml is primary now

---
 PHPCI/Model/Build.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index 27cf4055..20ff6a34 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -88,13 +88,16 @@ class Build extends BuildBase
      */
     protected function handleConfig(Builder $builder, $buildPath)
     {
-        $build_config = $this->getProject()->getBuildConfig();
-        if (!$build_config) {
-            if (!is_file($buildPath . '/phpci.yml')) {
+        if (is_file($buildPath . '/phpci.yml')) {
+            $build_config = file_get_contents($buildPath . '/phpci.yml');
+        }
+
+        if (!is_file($buildPath . '/phpci.yml') || !$build_config) {
+            $build_config = $this->getProject()->getBuildConfig();
+            if (!$build_config) {
                 $builder->logFailure('Project does not contain a phpci.yml file.');
                 return false;
             }
-            $build_config = file_get_contents($buildPath . '/phpci.yml');
         }
 
         $yamlParser = new YamlParser();