+6 -1

src/__phutil_library_map__.php

reviewed

··· 1365 1365 'HarbormasterBuildTransactionEditor' => 'applications/harbormaster/editor/HarbormasterBuildTransactionEditor.php', 1366 1366 'HarbormasterBuildTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildTransactionQuery.php', 1367 1367 'HarbormasterBuildUnitMessage' => 'applications/harbormaster/storage/build/HarbormasterBuildUnitMessage.php', 1368 1368 + 'HarbormasterBuildUnitMessageQuery' => 'applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php', 1368 1369 'HarbormasterBuildViewController' => 'applications/harbormaster/controller/HarbormasterBuildViewController.php', 1369 1370 'HarbormasterBuildWorker' => 'applications/harbormaster/worker/HarbormasterBuildWorker.php', 1370 1371 'HarbormasterBuildable' => 'applications/harbormaster/storage/HarbormasterBuildable.php', ··· 6983 6984 'HarbormasterBuildTransaction' => 'PhabricatorApplicationTransaction', 6984 6985 'HarbormasterBuildTransactionEditor' => 'PhabricatorApplicationTransactionEditor', 6985 6986 'HarbormasterBuildTransactionQuery' => 'PhabricatorApplicationTransactionQuery', 6986 6986 - 'HarbormasterBuildUnitMessage' => 'HarbormasterDAO', 6987 6987 + 'HarbormasterBuildUnitMessage' => array( 6988 6988 + 'HarbormasterDAO', 6989 6989 + 'PhabricatorPolicyInterface', 6990 6990 + ), 6991 6991 + 'HarbormasterBuildUnitMessageQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 6987 6992 'HarbormasterBuildViewController' => 'HarbormasterController', 6988 6993 'HarbormasterBuildWorker' => 'HarbormasterWorker', 6989 6994 'HarbormasterBuildable' => array(

+6 -4

src/applications/differential/controller/DifferentialChangesetViewController.php

reviewed

··· 420 420 } 421 421 422 422 private function loadCoverage(DifferentialChangeset $changeset) { 423 423 + $viewer = $this->getViewer(); 424 424 + 423 425 $target_phids = $changeset->getDiff()->getBuildTargetPHIDs(); 424 426 if (!$target_phids) { 425 427 return null; 426 428 } 427 429 428 428 - $unit = id(new HarbormasterBuildUnitMessage())->loadAllWhere( 429 429 - 'buildTargetPHID IN (%Ls)', 430 430 - $target_phids); 431 431 - 430 430 + $unit = id(new HarbormasterBuildUnitMessageQuery()) 431 431 + ->setViewer($viewer) 432 432 + ->withBuildTargetPHIDs($target_phids) 433 433 + ->execute(); 432 434 if (!$unit) { 433 435 return null; 434 436 }

+4 -3

src/applications/differential/controller/DifferentialController.php

reviewed

··· 192 192 $all_target_phids = array_mergev($target_map); 193 193 194 194 if ($all_target_phids) { 195 195 - $unit_messages = id(new HarbormasterBuildUnitMessage())->loadAllWhere( 196 196 - 'buildTargetPHID IN (%Ls)', 197 197 - $all_target_phids); 195 195 + $unit_messages = id(new HarbormasterBuildUnitMessageQuery()) 196 196 + ->setViewer($viewer) 197 197 + ->withBuildTargetPHIDs($all_target_phids) 198 198 + ->execute(); 198 199 $unit_messages = mgroup($unit_messages, 'getBuildTargetPHID'); 199 200 } else { 200 201 $unit_messages = array();

+4 -3

src/applications/differential/storage/DifferentialDiff.php

reviewed

··· 387 387 return array(); 388 388 } 389 389 390 390 - $unit = id(new HarbormasterBuildUnitMessage())->loadAllWhere( 391 391 - 'buildTargetPHID IN (%Ls)', 392 392 - $target_phids); 390 390 + $unit = id(new HarbormasterBuildUnitMessageQuery()) 391 391 + ->setViewer($viewer) 392 392 + ->withBuildTargetPHIDs($target_phids) 393 393 + ->execute(); 393 394 394 395 $map = array(); 395 396 foreach ($unit as $message) {

+4 -3

src/applications/harbormaster/controller/HarbormasterBuildableViewController.php

reviewed

··· 312 312 'buildTargetPHID IN (%Ls)', 313 313 $target_phids); 314 314 315 315 - $unit_data = id(new HarbormasterBuildUnitMessage())->loadAllWhere( 316 316 - 'buildTargetPHID IN (%Ls)', 317 317 - $target_phids); 315 315 + $unit_data = id(new HarbormasterBuildUnitMessageQuery()) 316 316 + ->setViewer($viewer) 317 317 + ->withBuildTargetPHIDs($target_phids) 318 318 + ->execute(); 318 319 319 320 if ($lint_data) { 320 321 $lint_table = id(new HarbormasterLintPropertyView())

+4 -3

src/applications/harbormaster/controller/HarbormasterUnitMessageListController.php

reviewed

··· 31 31 32 32 $unit_data = array(); 33 33 if ($target_phids) { 34 34 - $unit_data = id(new HarbormasterBuildUnitMessage())->loadAllWhere( 35 35 - 'buildTargetPHID IN (%Ls)', 36 36 - $target_phids); 34 34 + $unit_data = id(new HarbormasterBuildUnitMessageQuery()) 35 35 + ->setViewer($viewer) 36 36 + ->withBuildTargetPHIDs($target_phids) 37 37 + ->execute(); 37 38 } else { 38 39 $unit_data = array(); 39 40 }

+4 -1

src/applications/harbormaster/controller/HarbormasterUnitMessageViewController.php

reviewed

··· 12 12 13 13 $message_id = $request->getURIData('id'); 14 14 15 15 - $message = id(new HarbormasterBuildUnitMessage())->load($message_id); 15 15 + $message = id(new HarbormasterBuildUnitMessageQuery()) 16 16 + ->setViewer($viewer) 17 17 + ->withIDs(array($message_id)) 18 18 + ->executeOne(); 16 19 if (!$message) { 17 20 return new Aphront404Response(); 18 21 }

+64

src/applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class HarbormasterBuildUnitMessageQuery 4 4 + extends PhabricatorCursorPagedPolicyAwareQuery { 5 5 + 6 6 + private $ids; 7 7 + private $phids; 8 8 + private $targetPHIDs; 9 9 + 10 10 + public function withIDs(array $ids) { 11 11 + $this->ids = $ids; 12 12 + return $this; 13 13 + } 14 14 + 15 15 + public function withPHIDs(array $phids) { 16 16 + $this->phids = $phids; 17 17 + return $this; 18 18 + } 19 19 + 20 20 + public function withBuildTargetPHIDs(array $target_phids) { 21 21 + $this->targetPHIDs = $target_phids; 22 22 + return $this; 23 23 + } 24 24 + 25 25 + public function newResultObject() { 26 26 + return new HarbormasterBuildUnitMessage(); 27 27 + } 28 28 + 29 29 + protected function loadPage() { 30 30 + return $this->loadStandardPage($this->newResultObject()); 31 31 + } 32 32 + 33 33 + protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) { 34 34 + $where = parent::buildWhereClauseParts($conn); 35 35 + 36 36 + if ($this->ids !== null) { 37 37 + $where[] = qsprintf( 38 38 + $conn, 39 39 + 'id IN (%Ld)', 40 40 + $this->ids); 41 41 + } 42 42 + 43 43 + if ($this->phids !== null) { 44 44 + $where[] = qsprintf( 45 45 + $conn, 46 46 + 'phid in (%Ls)', 47 47 + $this->phids); 48 48 + } 49 49 + 50 50 + if ($this->targetPHIDs !== null) { 51 51 + $where[] = qsprintf( 52 52 + $conn, 53 53 + 'buildTargetPHID in (%Ls)', 54 54 + $this->targetPHIDs); 55 55 + } 56 56 + 57 57 + return $where; 58 58 + } 59 59 + 60 60 + public function getQueryApplicationClass() { 61 61 + return 'PhabricatorHarbormasterApplication'; 62 62 + } 63 63 + 64 64 + }

+23 -1

src/applications/harbormaster/storage/build/HarbormasterBuildUnitMessage.php

reviewed

··· 1 1 <?php 2 2 3 3 final class HarbormasterBuildUnitMessage 4 4 - extends HarbormasterDAO { 4 4 + extends HarbormasterDAO 5 5 + implements PhabricatorPolicyInterface { 5 6 6 7 protected $buildTargetPHID; 7 8 protected $engine; ··· 257 258 ); 258 259 259 260 return implode("\0", $parts); 261 261 + } 262 262 + 263 263 + 264 264 + /* -( PhabricatorPolicyInterface )----------------------------------------- */ 265 265 + 266 266 + 267 267 + public function getCapabilities() { 268 268 + return array( 269 269 + PhabricatorPolicyCapability::CAN_VIEW, 270 270 + ); 271 271 + } 272 272 + 273 273 + public function getPolicy($capability) { 274 274 + switch ($capability) { 275 275 + case PhabricatorPolicyCapability::CAN_VIEW: 276 276 + return PhabricatorPolicies::getMostOpenPolicy(); 277 277 + } 278 278 + } 279 279 + 280 280 + public function hasAutomaticCapability($capability, PhabricatorUser $viewer) { 281 281 + return false; 260 282 } 261 283 262 284 }