recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Move build statuses to a constants class

Summary: No functional changes here, just lifting this out to make room for activities, heeding lint warnings along the way.

Test Plan:
before:
```lang=bash
$ grep -Rn "HarbormasterBuild::" *
src/applications/harbormaster/storage/HarbormasterBuildable.php:169: $build = HarbormasterBuild::initializeNewBuild($viewer)
src/applications/harbormaster/storage/HarbormasterBuildable.php:173: ->setBuildStatus(HarbormasterBuild::STATUS_PENDING);
src/applications/harbormaster/controller/HarbormasterStepEditController.php:242: $variables = HarbormasterBuild::getAvailableBuildVariables();
src/applications/harbormaster/controller/HarbormasterBuildableViewController.php:200: 'fa-dot-circle-o '.HarbormasterBuild::getBuildStatusColor($status),
src/applications/harbormaster/controller/HarbormasterBuildableViewController.php:201: HarbormasterBuild::getBuildStatusName($status));
src/applications/harbormaster/controller/HarbormasterBuildableViewController.php:203: $item->addAttribute(HarbormasterBuild::getBuildStatusName($status));
src/applications/harbormaster/controller/HarbormasterBuildViewController.php:584: HarbormasterBuild::getBuildStatusName($status);
src/applications/harbormaster/controller/HarbormasterBuildViewController.php:585: $icon = HarbormasterBuild::getBuildStatusIcon($status);
src/applications/harbormaster/controller/HarbormasterBuildViewController.php:586: $color = HarbormasterBuild::getBuildStatusColor($status);
src/applications/harbormaster/event/HarbormasterUIEventListener.php:135: $status_name = HarbormasterBuild::getBuildStatusName($status);
src/applications/harbormaster/event/HarbormasterUIEventListener.php:136: $icon = HarbormasterBuild::getBuildStatusIcon($status);
src/applications/harbormaster/event/HarbormasterUIEventListener.php:137: $color = HarbormasterBuild::getBuildStatusColor($status);
src/applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php:78: 'buildStatusName' => HarbormasterBuild::getBuildStatusName($status),
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:66: $build->setBuildStatus(HarbormasterBuild::STATUS_ERROR);
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:109: $build->setBuildStatus(HarbormasterBuild::STATUS_ABORTED);
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:113: if (($build->getBuildStatus() == HarbormasterBuild::STATUS_PENDING) ||
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:116: $build->setBuildStatus(HarbormasterBuild::STATUS_BUILDING);
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:121: $build->setBuildStatus(HarbormasterBuild::STATUS_BUILDING);
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:126: $build->setBuildStatus(HarbormasterBuild::STATUS_PAUSED);
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:132: if ($build->getBuildStatus() == HarbormasterBuild::STATUS_BUILDING) {
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:246: $build->setBuildStatus(HarbormasterBuild::STATUS_FAILED);
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:254: $build->setBuildStatus(HarbormasterBuild::STATUS_PASSED);
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:290: $build->setBuildStatus(HarbormasterBuild::STATUS_DEADLOCKED);
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:446: if ($build->getBuildStatus() != HarbormasterBuild::STATUS_PASSED) {
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:449: if ($build->getBuildStatus() == HarbormasterBuild::STATUS_FAILED ||
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:450: $build->getBuildStatus() == HarbormasterBuild::STATUS_ERROR ||
src/applications/harbormaster/engine/HarbormasterBuildEngine.php:451: $build->getBuildStatus() == HarbormasterBuild::STATUS_DEADLOCKED) {
```

after:

```lang=bash
$ grep -Rn "HarbormasterBuild::" *
src/applications/harbormaster/storage/HarbormasterBuildable.php:169: $build = HarbormasterBuild::initializeNewBuild($viewer)
src/applications/harbormaster/controller/HarbormasterStepEditController.php:242: $variables = HarbormasterBuild::getAvailableBuildVariables();
```

ran a manual build as a sanity check

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D16348

authored by

Mike Riley and committed by
yelirekim 42b81a80 2c55a4ad

+168 -160
+2
src/__phutil_library_map__.php
··· 1131 1131 'HarbormasterBuildQuery' => 'applications/harbormaster/query/HarbormasterBuildQuery.php', 1132 1132 'HarbormasterBuildRequest' => 'applications/harbormaster/engine/HarbormasterBuildRequest.php', 1133 1133 'HarbormasterBuildSearchEngine' => 'applications/harbormaster/query/HarbormasterBuildSearchEngine.php', 1134 + 'HarbormasterBuildStatus' => 'applications/harbormaster/constants/HarbormasterBuildStatus.php', 1134 1135 'HarbormasterBuildStatusDatasource' => 'applications/harbormaster/typeahead/HarbormasterBuildStatusDatasource.php', 1135 1136 'HarbormasterBuildStep' => 'applications/harbormaster/storage/configuration/HarbormasterBuildStep.php', 1136 1137 'HarbormasterBuildStepCoreCustomField' => 'applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php', ··· 5687 5688 'HarbormasterBuildQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 5688 5689 'HarbormasterBuildRequest' => 'Phobject', 5689 5690 'HarbormasterBuildSearchEngine' => 'PhabricatorApplicationSearchEngine', 5691 + 'HarbormasterBuildStatus' => 'Phobject', 5690 5692 'HarbormasterBuildStatusDatasource' => 'PhabricatorTypeaheadDatasource', 5691 5693 'HarbormasterBuildStep' => array( 5692 5694 'HarbormasterDAO',
+2 -1
src/applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php
··· 66 66 $id = $build->getID(); 67 67 $uri = '/harbormaster/build/'.$id.'/'; 68 68 $status = $build->getBuildStatus(); 69 + $status_name = HarbormasterBuildStatus::getBuildStatusName($status); 69 70 70 71 $data[] = array( 71 72 'id' => $id, ··· 75 76 'buildablePHID' => $build->getBuildablePHID(), 76 77 'buildPlanPHID' => $build->getBuildPlanPHID(), 77 78 'buildStatus' => $status, 78 - 'buildStatusName' => HarbormasterBuild::getBuildStatusName($status), 79 + 'buildStatusName' => $status_name, 79 80 ); 80 81 } 81 82
+121
src/applications/harbormaster/constants/HarbormasterBuildStatus.php
··· 1 + <?php 2 + 3 + final class HarbormasterBuildStatus extends Phobject { 4 + 5 + /** 6 + * Not currently being built. 7 + */ 8 + const STATUS_INACTIVE = 'inactive'; 9 + 10 + /** 11 + * Pending pick up by the Harbormaster daemon. 12 + */ 13 + const STATUS_PENDING = 'pending'; 14 + 15 + /** 16 + * Current building the buildable. 17 + */ 18 + const STATUS_BUILDING = 'building'; 19 + 20 + /** 21 + * The build has passed. 22 + */ 23 + const STATUS_PASSED = 'passed'; 24 + 25 + /** 26 + * The build has failed. 27 + */ 28 + const STATUS_FAILED = 'failed'; 29 + 30 + /** 31 + * The build has aborted. 32 + */ 33 + const STATUS_ABORTED = 'aborted'; 34 + 35 + /** 36 + * The build encountered an unexpected error. 37 + */ 38 + const STATUS_ERROR = 'error'; 39 + 40 + /** 41 + * The build has been paused. 42 + */ 43 + const STATUS_PAUSED = 'paused'; 44 + 45 + /** 46 + * The build has been deadlocked. 47 + */ 48 + const STATUS_DEADLOCKED = 'deadlocked'; 49 + 50 + 51 + /** 52 + * Get a human readable name for a build status constant. 53 + * 54 + * @param const Build status constant. 55 + * @return string Human-readable name. 56 + */ 57 + public static function getBuildStatusName($status) { 58 + $map = self::getBuildStatusMap(); 59 + return idx($map, $status, pht('Unknown ("%s")', $status)); 60 + } 61 + 62 + public static function getBuildStatusMap() { 63 + return array( 64 + self::STATUS_INACTIVE => pht('Inactive'), 65 + self::STATUS_PENDING => pht('Pending'), 66 + self::STATUS_BUILDING => pht('Building'), 67 + self::STATUS_PASSED => pht('Passed'), 68 + self::STATUS_FAILED => pht('Failed'), 69 + self::STATUS_ABORTED => pht('Aborted'), 70 + self::STATUS_ERROR => pht('Unexpected Error'), 71 + self::STATUS_PAUSED => pht('Paused'), 72 + self::STATUS_DEADLOCKED => pht('Deadlocked'), 73 + ); 74 + } 75 + 76 + public static function getBuildStatusIcon($status) { 77 + switch ($status) { 78 + case self::STATUS_INACTIVE: 79 + case self::STATUS_PENDING: 80 + return PHUIStatusItemView::ICON_OPEN; 81 + case self::STATUS_BUILDING: 82 + return PHUIStatusItemView::ICON_RIGHT; 83 + case self::STATUS_PASSED: 84 + return PHUIStatusItemView::ICON_ACCEPT; 85 + case self::STATUS_FAILED: 86 + return PHUIStatusItemView::ICON_REJECT; 87 + case self::STATUS_ABORTED: 88 + return PHUIStatusItemView::ICON_MINUS; 89 + case self::STATUS_ERROR: 90 + return PHUIStatusItemView::ICON_MINUS; 91 + case self::STATUS_PAUSED: 92 + return PHUIStatusItemView::ICON_MINUS; 93 + case self::STATUS_DEADLOCKED: 94 + return PHUIStatusItemView::ICON_WARNING; 95 + default: 96 + return PHUIStatusItemView::ICON_QUESTION; 97 + } 98 + } 99 + 100 + public static function getBuildStatusColor($status) { 101 + switch ($status) { 102 + case self::STATUS_INACTIVE: 103 + return 'dark'; 104 + case self::STATUS_PENDING: 105 + case self::STATUS_BUILDING: 106 + return 'blue'; 107 + case self::STATUS_PASSED: 108 + return 'green'; 109 + case self::STATUS_FAILED: 110 + case self::STATUS_ABORTED: 111 + case self::STATUS_ERROR: 112 + case self::STATUS_DEADLOCKED: 113 + return 'red'; 114 + case self::STATUS_PAUSED: 115 + return 'dark'; 116 + default: 117 + return 'bluegrey'; 118 + } 119 + } 120 + 121 + }
+3 -3
src/applications/harbormaster/controller/HarbormasterBuildViewController.php
··· 581 581 } else { 582 582 $status = $build->getBuildStatus(); 583 583 $status_name = 584 - HarbormasterBuild::getBuildStatusName($status); 585 - $icon = HarbormasterBuild::getBuildStatusIcon($status); 586 - $color = HarbormasterBuild::getBuildStatusColor($status); 584 + HarbormasterBuildStatus::getBuildStatusName($status); 585 + $icon = HarbormasterBuildStatus::getBuildStatusIcon($status); 586 + $color = HarbormasterBuildStatus::getBuildStatusColor($status); 587 587 } 588 588 589 589 $item->setTarget($status_name);
+4 -5
src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
··· 196 196 ->setHref($view_uri); 197 197 198 198 $status = $build->getBuildStatus(); 199 - $item->setStatusIcon( 200 - 'fa-dot-circle-o '.HarbormasterBuild::getBuildStatusColor($status), 201 - HarbormasterBuild::getBuildStatusName($status)); 202 - 203 - $item->addAttribute(HarbormasterBuild::getBuildStatusName($status)); 199 + $status_color = HarbormasterBuildStatus::getBuildStatusColor($status); 200 + $status_name = HarbormasterBuildStatus::getBuildStatusName($status); 201 + $item->setStatusIcon('fa-dot-circle-o '.$status_color, $status_name); 202 + $item->addAttribute($status_name); 204 203 205 204 if ($build->isRestarting()) { 206 205 $item->addIcon('fa-repeat', pht('Restarting'));
+16 -16
src/applications/harbormaster/engine/HarbormasterBuildEngine.php
··· 63 63 // If any exception is raised, the build is marked as a failure and the 64 64 // exception is re-thrown (this ensures we don't leave builds in an 65 65 // inconsistent state). 66 - $build->setBuildStatus(HarbormasterBuild::STATUS_ERROR); 66 + $build->setBuildStatus(HarbormasterBuildStatus::STATUS_ERROR); 67 67 $build->save(); 68 68 69 69 $lock->unlock(); ··· 106 106 private function updateBuild(HarbormasterBuild $build) { 107 107 if ($build->isAborting()) { 108 108 $this->releaseAllArtifacts($build); 109 - $build->setBuildStatus(HarbormasterBuild::STATUS_ABORTED); 109 + $build->setBuildStatus(HarbormasterBuildStatus::STATUS_ABORTED); 110 110 $build->save(); 111 111 } 112 112 113 - if (($build->getBuildStatus() == HarbormasterBuild::STATUS_PENDING) || 113 + if (($build->getBuildStatus() == HarbormasterBuildStatus::STATUS_PENDING) || 114 114 ($build->isRestarting())) { 115 115 $this->restartBuild($build); 116 - $build->setBuildStatus(HarbormasterBuild::STATUS_BUILDING); 116 + $build->setBuildStatus(HarbormasterBuildStatus::STATUS_BUILDING); 117 117 $build->save(); 118 118 } 119 119 120 120 if ($build->isResuming()) { 121 - $build->setBuildStatus(HarbormasterBuild::STATUS_BUILDING); 121 + $build->setBuildStatus(HarbormasterBuildStatus::STATUS_BUILDING); 122 122 $build->save(); 123 123 } 124 124 125 125 if ($build->isPausing() && !$build->isComplete()) { 126 - $build->setBuildStatus(HarbormasterBuild::STATUS_PAUSED); 126 + $build->setBuildStatus(HarbormasterBuildStatus::STATUS_PAUSED); 127 127 $build->save(); 128 128 } 129 129 130 130 $build->deleteUnprocessedCommands(); 131 131 132 - if ($build->getBuildStatus() == HarbormasterBuild::STATUS_BUILDING) { 132 + if ($build->getBuildStatus() == HarbormasterBuildStatus::STATUS_BUILDING) { 133 133 $this->updateBuildSteps($build); 134 134 } 135 135 } ··· 243 243 244 244 // If any step failed, fail the whole build, then bail. 245 245 if (count($failed)) { 246 - $build->setBuildStatus(HarbormasterBuild::STATUS_FAILED); 246 + $build->setBuildStatus(HarbormasterBuildStatus::STATUS_FAILED); 247 247 $build->save(); 248 248 return; 249 249 } ··· 251 251 // If every step is complete, we're done with this build. Mark it passed 252 252 // and bail. 253 253 if (count($complete) == count($steps)) { 254 - $build->setBuildStatus(HarbormasterBuild::STATUS_PASSED); 254 + $build->setBuildStatus(HarbormasterBuildStatus::STATUS_PASSED); 255 255 $build->save(); 256 256 return; 257 257 } ··· 287 287 if (!$runnable && !$waiting && !$underway) { 288 288 // This means the build is deadlocked, and the user has configured 289 289 // circular dependencies. 290 - $build->setBuildStatus(HarbormasterBuild::STATUS_DEADLOCKED); 290 + $build->setBuildStatus(HarbormasterBuildStatus::STATUS_DEADLOCKED); 291 291 $build->save(); 292 292 return; 293 293 } ··· 443 443 $all_pass = true; 444 444 $any_fail = false; 445 445 foreach ($buildable->getBuilds() as $build) { 446 - if ($build->getBuildStatus() != HarbormasterBuild::STATUS_PASSED) { 446 + if ($build->getBuildStatus() != HarbormasterBuildStatus::STATUS_PASSED) { 447 447 $all_pass = false; 448 448 } 449 - if ($build->getBuildStatus() == HarbormasterBuild::STATUS_FAILED || 450 - $build->getBuildStatus() == HarbormasterBuild::STATUS_ERROR || 451 - $build->getBuildStatus() == HarbormasterBuild::STATUS_DEADLOCKED) { 452 - $any_fail = true; 453 - } 449 + $any_fail = in_array($build->getBuildStatus(), array( 450 + HarbormasterBuildStatus::STATUS_FAILED, 451 + HarbormasterBuildStatus::STATUS_ERROR, 452 + HarbormasterBuildStatus::STATUS_DEADLOCKED, 453 + )); 454 454 } 455 455 456 456 if ($any_fail) {
+3 -3
src/applications/harbormaster/event/HarbormasterUIEventListener.php
··· 132 132 } 133 133 134 134 $status = $build->getBuildStatus(); 135 - $status_name = HarbormasterBuild::getBuildStatusName($status); 136 - $icon = HarbormasterBuild::getBuildStatusIcon($status); 137 - $color = HarbormasterBuild::getBuildStatusColor($status); 135 + $status_name = HarbormasterBuildStatus::getBuildStatusName($status); 136 + $icon = HarbormasterBuildStatus::getBuildStatusIcon($status); 137 + $color = HarbormasterBuildStatus::getBuildStatusColor($status); 138 138 139 139 $item->setIcon($icon, $color, $status_name); 140 140
+3 -3
src/applications/harbormaster/query/HarbormasterBuildSearchEngine.php
··· 107 107 108 108 $status = $build->getBuildStatus(); 109 109 110 - $status_icon = HarbormasterBuild::getBuildStatusIcon($status); 111 - $status_color = HarbormasterBuild::getBuildStatusColor($status); 112 - $status_label = HarbormasterBuild::getBuildStatusName($status); 110 + $status_icon = HarbormasterBuildStatus::getBuildStatusIcon($status); 111 + $status_color = HarbormasterBuildStatus::getBuildStatusColor($status); 112 + $status_label = HarbormasterBuildStatus::getBuildStatusName($status); 113 113 114 114 $item->setStatusIcon("{$status_icon} {$status_color}", $status_label); 115 115
+1 -1
src/applications/harbormaster/storage/HarbormasterBuildable.php
··· 170 170 ->setBuildablePHID($this->getPHID()) 171 171 ->setBuildPlanPHID($plan->getPHID()) 172 172 ->setBuildParameters($parameters) 173 - ->setBuildStatus(HarbormasterBuild::STATUS_PENDING); 173 + ->setBuildStatus(HarbormasterBuildStatus::STATUS_PENDING); 174 174 if ($initiator_phid) { 175 175 $build->setInitiatorPHID($initiator_phid); 176 176 }
+10 -125
src/applications/harbormaster/storage/build/HarbormasterBuild.php
··· 18 18 private $buildTargets = self::ATTACHABLE; 19 19 private $unprocessedCommands = self::ATTACHABLE; 20 20 21 - /** 22 - * Not currently being built. 23 - */ 24 - const STATUS_INACTIVE = 'inactive'; 25 - 26 - /** 27 - * Pending pick up by the Harbormaster daemon. 28 - */ 29 - const STATUS_PENDING = 'pending'; 30 - 31 - /** 32 - * Current building the buildable. 33 - */ 34 - const STATUS_BUILDING = 'building'; 35 - 36 - /** 37 - * The build has passed. 38 - */ 39 - const STATUS_PASSED = 'passed'; 40 - 41 - /** 42 - * The build has failed. 43 - */ 44 - const STATUS_FAILED = 'failed'; 45 - 46 - /** 47 - * The build has aborted. 48 - */ 49 - const STATUS_ABORTED = 'aborted'; 50 - 51 - /** 52 - * The build encountered an unexpected error. 53 - */ 54 - const STATUS_ERROR = 'error'; 55 - 56 - /** 57 - * The build has been paused. 58 - */ 59 - const STATUS_PAUSED = 'paused'; 60 - 61 - /** 62 - * The build has been deadlocked. 63 - */ 64 - const STATUS_DEADLOCKED = 'deadlocked'; 65 - 66 - 67 - /** 68 - * Get a human readable name for a build status constant. 69 - * 70 - * @param const Build status constant. 71 - * @return string Human-readable name. 72 - */ 73 - public static function getBuildStatusName($status) { 74 - $map = self::getBuildStatusMap(); 75 - return idx($map, $status, pht('Unknown ("%s")', $status)); 76 - } 77 - 78 - public static function getBuildStatusMap() { 79 - return array( 80 - self::STATUS_INACTIVE => pht('Inactive'), 81 - self::STATUS_PENDING => pht('Pending'), 82 - self::STATUS_BUILDING => pht('Building'), 83 - self::STATUS_PASSED => pht('Passed'), 84 - self::STATUS_FAILED => pht('Failed'), 85 - self::STATUS_ABORTED => pht('Aborted'), 86 - self::STATUS_ERROR => pht('Unexpected Error'), 87 - self::STATUS_PAUSED => pht('Paused'), 88 - self::STATUS_DEADLOCKED => pht('Deadlocked'), 89 - ); 90 - } 91 - 92 - public static function getBuildStatusIcon($status) { 93 - switch ($status) { 94 - case self::STATUS_INACTIVE: 95 - case self::STATUS_PENDING: 96 - return PHUIStatusItemView::ICON_OPEN; 97 - case self::STATUS_BUILDING: 98 - return PHUIStatusItemView::ICON_RIGHT; 99 - case self::STATUS_PASSED: 100 - return PHUIStatusItemView::ICON_ACCEPT; 101 - case self::STATUS_FAILED: 102 - return PHUIStatusItemView::ICON_REJECT; 103 - case self::STATUS_ABORTED: 104 - return PHUIStatusItemView::ICON_MINUS; 105 - case self::STATUS_ERROR: 106 - return PHUIStatusItemView::ICON_MINUS; 107 - case self::STATUS_PAUSED: 108 - return PHUIStatusItemView::ICON_MINUS; 109 - case self::STATUS_DEADLOCKED: 110 - return PHUIStatusItemView::ICON_WARNING; 111 - default: 112 - return PHUIStatusItemView::ICON_QUESTION; 113 - } 114 - } 115 - 116 - public static function getBuildStatusColor($status) { 117 - switch ($status) { 118 - case self::STATUS_INACTIVE: 119 - return 'dark'; 120 - case self::STATUS_PENDING: 121 - case self::STATUS_BUILDING: 122 - return 'blue'; 123 - case self::STATUS_PASSED: 124 - return 'green'; 125 - case self::STATUS_FAILED: 126 - case self::STATUS_ABORTED: 127 - case self::STATUS_ERROR: 128 - case self::STATUS_DEADLOCKED: 129 - return 'red'; 130 - case self::STATUS_PAUSED: 131 - return 'dark'; 132 - default: 133 - return 'bluegrey'; 134 - } 135 - } 136 - 137 21 public static function initializeNewBuild(PhabricatorUser $actor) { 138 22 return id(new HarbormasterBuild()) 139 - ->setBuildStatus(self::STATUS_INACTIVE) 23 + ->setBuildStatus(HarbormasterBuildStatus::STATUS_INACTIVE) 140 24 ->setBuildGeneration(0); 141 25 } 142 26 ··· 220 104 } 221 105 222 106 public function isBuilding() { 223 - return $this->getBuildStatus() === self::STATUS_PENDING || 224 - $this->getBuildStatus() === self::STATUS_BUILDING; 107 + return 108 + $this->getBuildStatus() === HarbormasterBuildStatus::STATUS_PENDING || 109 + $this->getBuildStatus() === HarbormasterBuildStatus::STATUS_BUILDING; 225 110 } 226 111 227 112 public function isAutobuild() { ··· 285 170 286 171 public function isComplete() { 287 172 switch ($this->getBuildStatus()) { 288 - case self::STATUS_PASSED: 289 - case self::STATUS_FAILED: 290 - case self::STATUS_ABORTED: 291 - case self::STATUS_ERROR: 292 - case self::STATUS_PAUSED: 173 + case HarbormasterBuildStatus::STATUS_PASSED: 174 + case HarbormasterBuildStatus::STATUS_FAILED: 175 + case HarbormasterBuildStatus::STATUS_ABORTED: 176 + case HarbormasterBuildStatus::STATUS_ERROR: 177 + case HarbormasterBuildStatus::STATUS_PAUSED: 293 178 return true; 294 179 } 295 180 ··· 297 182 } 298 183 299 184 public function isPaused() { 300 - return ($this->getBuildStatus() == self::STATUS_PAUSED); 185 + return ($this->getBuildStatus() == HarbormasterBuildStatus::STATUS_PAUSED); 301 186 } 302 187 303 188 public function getURI() {
+3 -3
src/applications/harbormaster/typeahead/HarbormasterBuildStatusDatasource.php
··· 27 27 private function buildResults() { 28 28 $results = array(); 29 29 30 - $status_map = HarbormasterBuild::getBuildStatusMap(); 30 + $status_map = HarbormasterBuildStatus::getBuildStatusMap(); 31 31 foreach ($status_map as $value => $name) { 32 32 $result = id(new PhabricatorTypeaheadResult()) 33 - ->setIcon(HarbormasterBuild::getBuildStatusIcon($value)) 34 - ->setColor(HarbormasterBuild::getBuildStatusColor($value)) 33 + ->setIcon(HarbormasterBuildStatus::getBuildStatusIcon($value)) 34 + ->setColor(HarbormasterBuildStatus::getBuildStatusColor($value)) 35 35 ->setPHID($value) 36 36 ->setName($name) 37 37 ->addAttribute(pht('Status'));