From 11445304d6e77a38ef71ed50bbc2a530d7dc4ec8 Mon Sep 17 00:00:00 2001
From: Dan Cryer <dan@block8.co.uk>
Date: Mon, 5 Oct 2015 14:48:17 +0100
Subject: [PATCH] Making PHPMD happy.

---
 PHPCI/BuildFactory.php         | 64 +++++++++++++++-------------------
 PHPCI/Service/BuildService.php |  2 +-
 2 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php
index fb20309d..fdc8a212 100644
--- a/PHPCI/BuildFactory.php
+++ b/PHPCI/BuildFactory.php
@@ -37,45 +37,39 @@ class BuildFactory
     /**
     * Takes a generic build and returns a type-specific build model.
     * @param Build $build The build from which to get a more specific build type.
-    * @param string $type Set the type manually if you already know it.
     * @return Build
     */
-    public static function getBuild(Build $build, $type = null)
+    public static function getBuild(Build $build)
     {
-        if (is_null($type) && !is_null($build->getProject())) {
-            $type = $build->getProject()->getType();
-        }
+        $project = $build->getProject();
 
-        switch ($type) {
-            case 'remote':
-                $type = 'RemoteGitBuild';
-                break;
-            case 'local':
-                $type = 'LocalBuild';
-                break;
-            case 'github':
-                $type = 'GithubBuild';
-                break;
-            case 'bitbucket':
-                $type = 'BitbucketBuild';
-                break;
-            case 'gitlab':
-                $type = 'GitlabBuild';
-                break;
-            case 'hg':
-                $type = 'MercurialBuild';
-                break;
-            case 'svn':
-                $type = 'SubversionBuild';
-                break;
-            default:
-                $type = null;
-                break;
-        }
-
-        if (!is_null($type)) {
-            $type = '\\PHPCI\\Model\\Build\\' . $type;
-            $build = new $type($build->getDataArray());
+        if (!empty($project)) {
+            switch ($project->getType()) {
+                case 'remote':
+                    $type = 'RemoteGitBuild';
+                    break;
+                case 'local':
+                    $type = 'LocalBuild';
+                    break;
+                case 'github':
+                    $type = 'GithubBuild';
+                    break;
+                case 'bitbucket':
+                    $type = 'BitbucketBuild';
+                    break;
+                case 'gitlab':
+                    $type = 'GitlabBuild';
+                    break;
+                case 'hg':
+                    $type = 'MercurialBuild';
+                    break;
+                case 'svn':
+                    $type = 'SubversionBuild';
+                    break;
+            }
+            
+            $class = '\\PHPCI\\Model\\Build\\' . $type;
+            $build = new $class($build->getDataArray());
         }
 
         return $build;
diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index 3f03f559..117b94e7 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -87,7 +87,7 @@ class BuildService
 
         $build = $this->buildStore->save($build);
 
-        $build = BuildFactory::getBuild($build, $project->getType());
+        $build = BuildFactory::getBuild($build);
         $build->sendStatusPostback();
         $this->addBuildToQueue($build);