From fbc3da59dd6a09e99b7247a1d323fba7b62f9e71 Mon Sep 17 00:00:00 2001
From: Dan Cryer <dan@block8.co.uk>
Date: Fri, 9 Oct 2015 10:37:50 +0100
Subject: [PATCH] Fix

---
 PHPCI/Model/Build.php                    | 21 ---------------------
 PHPCI/Service/BuildService.php           | 20 ++++++++++++++------
 Tests/PHPCI/Service/BuildServiceTest.php |  6 +-----
 3 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index 2f2b64cc..be7f4a8a 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -249,25 +249,4 @@ class Build extends BuildBase
 
         exec(sprintf(IS_WIN ? 'rmdir /S /Q "%s"' : 'rm -Rf "%s"', $buildPath));
     }
-
-    /**
-     * @param Project $value
-     */
-    public function setProjectObject(\PHPCI\Model\Project $value)
-    {
-        $this->data['project'] = $value;
-        return parent::setProjectObject($value);
-    }
-
-    /**
-     * Get the Project model for this Build by Id.
-     */
-    public function getProject()
-    {
-        if (empty($this->data['project'])) {
-            $this->data['project'] = parent::getProject();
-        }
-
-        return $this->data['project'];
-    }
 }
diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index 7db8d474..dca0fc0d 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -87,9 +87,13 @@ class BuildService
 
         $build = $this->buildStore->save($build);
 
-        $build = BuildFactory::getBuild($build);
-        $build->sendStatusPostback();
-        $this->addBuildToQueue($build);
+        $buildId = $build->getId();
+
+        if (!empty($buildId)) {
+            $build = BuildFactory::getBuild($build);
+            $build->sendStatusPostback();
+            $this->addBuildToQueue($build);
+        }
 
         return $build;
     }
@@ -116,9 +120,13 @@ class BuildService
 
         $build = $this->buildStore->save($build);
 
-        $build = BuildFactory::getBuild($build);
-        $build->sendStatusPostback();
-        $this->addBuildToQueue($build);
+        $buildId = $build->getId();
+
+        if (!empty($buildId)) {
+            $build = BuildFactory::getBuild($build);
+            $build->sendStatusPostback();
+            $this->addBuildToQueue($build);
+        }
 
         return $build;
     }
diff --git a/Tests/PHPCI/Service/BuildServiceTest.php b/Tests/PHPCI/Service/BuildServiceTest.php
index 4a396334..3c96b131 100644
--- a/Tests/PHPCI/Service/BuildServiceTest.php
+++ b/Tests/PHPCI/Service/BuildServiceTest.php
@@ -101,13 +101,9 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
      */
     public function testExecute_CreateDuplicateBuild()
     {
-        $project = new Project();
-        $project->setType('hg');
-        $project->setId(101);
-
         $build = new Build();
         $build->setId(1);
-        $build->setProject($project);
+        $build->setProject(101);
         $build->setCommitId('abcde');
         $build->setStatus(Build::STATUS_FAILED);
         $build->setLog('Test');