@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.

Merge duplicate branches in switch/case statements

Summary: Simplify code by merging statements which contain the very same code.

Test Plan: Read and compare code.

Reviewers: O1 Blessed Committers, mainframe98

Reviewed By: O1 Blessed Committers, mainframe98

Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Differential Revision: https://we.phorge.it/D26479

+18 -67
+2 -5
src/applications/audit/storage/PhabricatorAuditTransaction.php
··· 148 148 case PhabricatorAuditActionConstants::CONCERN: 149 149 return 'fa-exclamation-circle'; 150 150 case PhabricatorAuditActionConstants::ACCEPT: 151 + case PhabricatorAuditActionConstants::CLOSE: 151 152 return 'fa-check'; 152 153 case PhabricatorAuditActionConstants::RESIGN: 153 154 return 'fa-plane'; 154 - case PhabricatorAuditActionConstants::CLOSE: 155 - return 'fa-check'; 156 155 } 157 156 } 158 157 ··· 470 469 $tags[] = self::MAILTAG_ACTION_RESIGN; 471 470 break; 472 471 case DiffusionCommitAuditorsTransaction::TRANSACTIONTYPE: 472 + case PhabricatorAuditActionConstants::ADD_AUDITORS: 473 473 $tags[] = self::MAILTAG_ADD_AUDITORS; 474 474 break; 475 475 case PhabricatorAuditActionConstants::ACTION: ··· 487 487 $tags[] = self::MAILTAG_ACTION_CLOSE; 488 488 break; 489 489 } 490 - break; 491 - case PhabricatorAuditActionConstants::ADD_AUDITORS: 492 - $tags[] = self::MAILTAG_ADD_AUDITORS; 493 490 break; 494 491 case PhabricatorAuditActionConstants::ADD_CCS: 495 492 $tags[] = self::MAILTAG_ADD_CCS;
-2
src/applications/calendar/editor/PhabricatorCalendarImportEditor.php
··· 44 44 $should_reload = true; 45 45 break; 46 46 case PhabricatorCalendarImportFrequencyTransaction::TRANSACTIONTYPE: 47 - $should_trigger = true; 48 - break; 49 47 case PhabricatorCalendarImportDisableTransaction::TRANSACTIONTYPE: 50 48 $should_trigger = true; 51 49 break;
+4 -18
src/applications/calendar/parser/ics/PhutilICSParser.php
··· 484 484 $result = $map[$result]; 485 485 break; 486 486 case 'CAL-ADDRESS': 487 + case 'RECUR': 488 + case 'URI': 489 + case 'UTC-OFFSET': 487 490 $result = $data; 488 491 break; 489 492 case 'DATE': ··· 491 494 $result = explode(',', $data); 492 495 break; 493 496 case 'DATE-TIME': 494 - if (!strlen($data)) { 495 - $result = array(); 496 - } else { 497 - $result = explode(',', $data); 498 - } 499 - break; 500 497 case 'DURATION': 501 498 if (!strlen($data)) { 502 499 $result = array(); ··· 517 514 } 518 515 break; 519 516 case 'PERIOD': 517 + case 'TIME': 520 518 $result = explode(',', $data); 521 519 break; 522 - case 'RECUR': 523 - $result = $data; 524 - break; 525 520 case 'TEXT': 526 521 $result = $this->unescapeTextValue($data); 527 - break; 528 - case 'TIME': 529 - $result = explode(',', $data); 530 - break; 531 - case 'URI': 532 - $result = $data; 533 - break; 534 - case 'UTC-OFFSET': 535 - $result = $data; 536 522 break; 537 523 default: 538 524 // RFC5545 says we MUST preserve the data for any types we don't
-1
src/applications/calendar/storage/PhabricatorCalendarEvent.php
··· 675 675 $status = $this->getUserInviteStatus($viewer_phid); 676 676 switch ($status) { 677 677 case PhabricatorCalendarEventInvitee::STATUS_ATTENDING: 678 - return 'green'; 679 678 case PhabricatorCalendarEventInvitee::STATUS_INVITED: 680 679 return 'green'; 681 680 case PhabricatorCalendarEventInvitee::STATUS_DECLINED:
+1 -3
src/applications/conpherence/controller/ConpherenceUpdateController.php
··· 325 325 326 326 $need_transactions = false; 327 327 switch ($action) { 328 + case ConpherenceUpdateActions::ADD_PERSON: 328 329 case ConpherenceUpdateActions::LOAD: 329 - $need_transactions = true; 330 - break; 331 330 case ConpherenceUpdateActions::MESSAGE: 332 - case ConpherenceUpdateActions::ADD_PERSON: 333 331 $need_transactions = true; 334 332 break; 335 333 case ConpherenceUpdateActions::REMOVE_PERSON:
-2
src/applications/dashboard/controller/panel/PhabricatorDashboardPanelTabsController.php
··· 114 114 115 115 switch (phid_get_type($context_phid)) { 116 116 case PhabricatorDashboardDashboardPHIDType::TYPECONST: 117 - $cancel_uri = $context->getURI(); 118 - break; 119 117 case PhabricatorDashboardPanelPHIDType::TYPECONST: 120 118 $cancel_uri = $context->getURI(); 121 119 break;
+2 -7
src/applications/differential/storage/DifferentialTransaction.php
··· 418 418 case DifferentialAction::ACTION_RECLAIM: 419 419 case DifferentialAction::ACTION_REOPEN: 420 420 return 'fa-bullhorn'; 421 + case DifferentialAction::ACTION_CLAIM: 421 422 case DifferentialAction::ACTION_RESIGN: 422 - return 'fa-flag'; 423 - case DifferentialAction::ACTION_CLAIM: 424 423 return 'fa-flag'; 425 424 default: 426 425 break; ··· 468 467 case self::TYPE_ACTION: 469 468 switch ($this->getNewValue()) { 470 469 case DifferentialAction::ACTION_CLOSE: 470 + case DifferentialAction::ACTION_ABANDON: 471 471 return PhabricatorTransactions::COLOR_INDIGO; 472 472 case DifferentialAction::ACTION_ACCEPT: 473 473 return PhabricatorTransactions::COLOR_GREEN; 474 474 case DifferentialAction::ACTION_REJECT: 475 - return PhabricatorTransactions::COLOR_RED; 476 - case DifferentialAction::ACTION_ABANDON: 477 - return PhabricatorTransactions::COLOR_INDIGO; 478 475 case DifferentialAction::ACTION_RETHINK: 479 476 return PhabricatorTransactions::COLOR_RED; 480 477 case DifferentialAction::ACTION_REQUEST: 481 - return PhabricatorTransactions::COLOR_SKY; 482 478 case DifferentialAction::ACTION_RECLAIM: 483 - return PhabricatorTransactions::COLOR_SKY; 484 479 case DifferentialAction::ACTION_REOPEN: 485 480 return PhabricatorTransactions::COLOR_SKY; 486 481 case DifferentialAction::ACTION_RESIGN:
+1 -3
src/applications/diffusion/controller/DiffusionPathValidateController.php
··· 32 32 33 33 if (!$valid) { 34 34 switch ($browse_results->getReasonForEmptyResultSet()) { 35 - case DiffusionBrowseResultSet::REASON_IS_FILE: 36 - $valid = true; 37 - break; 38 35 case DiffusionBrowseResultSet::REASON_IS_EMPTY: 36 + case DiffusionBrowseResultSet::REASON_IS_FILE: 39 37 $valid = true; 40 38 break; 41 39 }
+1 -3
src/applications/diffusion/protocol/DiffusionSubversionWireProtocol.php
··· 134 134 $value = $item['value']; 135 135 $type = $item['type']; 136 136 switch ($type) { 137 - case 'word': 138 - $out[] = $value; 139 - break; 140 137 case 'number': 138 + case 'word': 141 139 $out[] = $value; 142 140 break; 143 141 case 'string':
+1 -2
src/applications/drydock/worker/DrydockResourceUpdateWorker.php
··· 71 71 $this->activateResource($resource); 72 72 break; 73 73 case DrydockResourceStatus::STATUS_ACTIVE: 74 + case DrydockResourceStatus::STATUS_DESTROYED: 74 75 // Nothing to do. 75 76 break; 76 77 case DrydockResourceStatus::STATUS_RELEASED: 77 78 case DrydockResourceStatus::STATUS_BROKEN: 78 79 $this->destroyResource($resource); 79 80 break; 80 - case DrydockResourceStatus::STATUS_DESTROYED: 81 - // Nothing to do. 82 81 break; 83 82 } 84 83
-2
src/applications/feed/conduit/FeedQueryConduitAPIMethod.php
··· 107 107 108 108 switch ($view_type) { 109 109 case 'html': 110 - $data = $view->render(); 111 - break; 112 110 case 'html-summary': 113 111 $data = $view->render(); 114 112 break;
-7
src/applications/files/document/PhabricatorJupyterDocumentEngine.php
··· 201 201 202 202 switch ($type) { 203 203 case '-': 204 - $result[] = phutil_tag( 205 - 'span', 206 - array( 207 - 'class' => 'bright', 208 - ), 209 - $text); 210 - break; 211 204 case '+': 212 205 $result[] = phutil_tag( 213 206 'span',
+1 -2
src/applications/herald/adapter/HeraldAdapter.php
··· 512 512 $condition_value); 513 513 case self::CONDITION_EXISTS: 514 514 case self::CONDITION_IS_TRUE: 515 + case self::CONDITION_UNCONDITIONALLY: 515 516 return (bool)$field_value; 516 517 case self::CONDITION_NOT_EXISTS: 517 518 case self::CONDITION_IS_FALSE: 518 519 return !$field_value; 519 - case self::CONDITION_UNCONDITIONALLY: 520 - return (bool)$field_value; 521 520 case self::CONDITION_NEVER: 522 521 return false; 523 522 case self::CONDITION_REGEXP:
+4 -8
src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
··· 505 505 switch ($type) { 506 506 case PhabricatorTransactions::TYPE_CREATE: 507 507 case PhabricatorTransactions::TYPE_HISTORY: 508 + case PhabricatorTransactions::TYPE_MFA: 509 + case PhabricatorTransactions::TYPE_COMMENT: 510 + case PhabricatorTransactions::TYPE_FILE: 508 511 return null; 509 512 case PhabricatorTransactions::TYPE_SUBTYPE: 510 513 return $object->getEditEngineSubtype(); 511 - case PhabricatorTransactions::TYPE_MFA: 512 - return null; 513 514 case PhabricatorTransactions::TYPE_SUBSCRIBERS: 514 515 return array_values($this->subscribers); 515 516 case PhabricatorTransactions::TYPE_VIEW_POLICY: ··· 578 579 // NOTE: Custom fields have their old value pre-populated when they are 579 580 // built by PhabricatorCustomFieldList. 580 581 return $xaction->getOldValue(); 581 - case PhabricatorTransactions::TYPE_COMMENT: 582 - return null; 583 - case PhabricatorTransactions::TYPE_FILE: 584 - return null; 585 582 default: 586 583 return $this->getCustomTransactionOldValue($object, $xaction); 587 584 } ··· 602 599 603 600 switch ($type) { 604 601 case PhabricatorTransactions::TYPE_CREATE: 602 + case PhabricatorTransactions::TYPE_COMMENT: 605 603 return null; 606 604 case PhabricatorTransactions::TYPE_SUBSCRIBERS: 607 605 return $this->getPHIDTransactionNewValue($xaction); ··· 649 647 case PhabricatorTransactions::TYPE_CUSTOMFIELD: 650 648 $field = $this->getCustomFieldForTransaction($object, $xaction); 651 649 return $field->getNewValueFromApplicationTransactions($xaction); 652 - case PhabricatorTransactions::TYPE_COMMENT: 653 - return null; 654 650 default: 655 651 return $this->getCustomTransactionNewValue($object, $xaction); 656 652 }
+1 -2
src/applications/transactions/storage/PhabricatorApplicationTransaction.php
··· 791 791 switch ($this->getTransactionType()) { 792 792 case PhabricatorTransactions::TYPE_TOKEN: 793 793 case PhabricatorTransactions::TYPE_MFA: 794 + case PhabricatorTransactions::TYPE_INLINESTATE: 794 795 return true; 795 796 case PhabricatorTransactions::TYPE_SUBSCRIBERS: 796 797 // See T8952. When an application (usually Herald) modifies ··· 815 816 break; 816 817 } 817 818 break; 818 - case PhabricatorTransactions::TYPE_INLINESTATE: 819 - return true; 820 819 } 821 820 822 821 return $this->shouldHide();