From 265318a9ceb5f7afa0af42a98151d20f66d89ddd Mon Sep 17 00:00:00 2001
From: Steven Cooney <steven.cooney@x-labsystems.co.uk>
Date: Fri, 31 May 2019 12:37:30 +0100
Subject: [PATCH] Rename Phabricator Variables Injected to TC builds

To make sure there are no naming conflicts with teamcity environment variable we are renaming the vars injected to the build via the harbormaster trigger.
---
 .../TeamCityXmlBuildBuilder.php                        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Harbormaster-Teamcity-Plugin/TeamCityXmlBuildBuilder.php b/Harbormaster-Teamcity-Plugin/TeamCityXmlBuildBuilder.php
index 3818a4d..cbbdfe2 100644
--- a/Harbormaster-Teamcity-Plugin/TeamCityXmlBuildBuilder.php
+++ b/Harbormaster-Teamcity-Plugin/TeamCityXmlBuildBuilder.php
@@ -24,12 +24,12 @@ final class TeamCityXmlBuildBuilder {
     }
 
     function addPhabBuildId($buildId){
-        $this->addProperty("env.buildId", $buildId);
+        $this->addProperty("env.PHAB_BUILD_ID", $buildId);
         return $this;
     }
 
     function addRevisionId($revisionId){
-        $this->addProperty("env.revisionId", $revisionId);
+        $this->addProperty("env.PHAB_REVISION_ID", $revisionId);
         return $this;
     }
 
@@ -37,18 +37,18 @@ final class TeamCityXmlBuildBuilder {
         // $this->
         //     root->
         //     setAttribute('branchName', $branchName);
-        $this->addProperty("env.branchName", $branchName);
+        $this->addProperty("env.PHAB_BRANCH_NAME", $branchName);
 
         return $this;
     }
 
     function addHarbormasterPHID($phid){
-        $this->addProperty('env.harbormasterTargetPHID', $phid);
+        $this->addProperty('env.PHAB_HARBORMASTER_TARGET_PHID', $phid);
         return $this;
     }
 
     function addDiffId($diffId){
-        $this->addProperty('env.diffId', $diffId);
+        $this->addProperty('env.PHAB_DIFF_ID', $diffId);
         return $this;
     }