Page MenuHomePhabricator
Files F14408493

D11059.id26550.diff
No OneTemporary
Actions

D11059.id26550.diff
View Options

diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1331,8 +1331,9 @@
$previous_comments = $comments_by_line_number[$comment->getChangesetID()]
[$comment->getLineNumber()];
foreach ($previous_comments as $previous_comment) {
- if ($previous_comment->getID() >= $comment->getID())
+ if ($previous_comment->getID() >= $comment->getID()) {
break;
+ }
$nested = $this->indentForMail(
array_merge(
$nested,
diff --git a/src/applications/differential/landing/DifferentialLandingActionMenuEventListener.php b/src/applications/differential/landing/DifferentialLandingActionMenuEventListener.php
--- a/src/applications/differential/landing/DifferentialLandingActionMenuEventListener.php
+++ b/src/applications/differential/landing/DifferentialLandingActionMenuEventListener.php
@@ -43,8 +43,9 @@
foreach ($strategies as $strategy) {
$viewer = $event->getUser();
$action = $strategy->createMenuItem($viewer, $revision, $repository);
- if ($action == null)
+ if ($action == null) {
continue;
+ }
if ($strategy->isActionDisabled($viewer, $revision, $repository)) {
$action->setDisabled(true);
}
diff --git a/src/applications/releeph/storage/ReleephRequest.php b/src/applications/releeph/storage/ReleephRequest.php
--- a/src/applications/releeph/storage/ReleephRequest.php
+++ b/src/applications/releeph/storage/ReleephRequest.php
@@ -127,15 +127,18 @@
if ($this->getInBranch()) {
return ReleephRequestStatus::STATUS_NEEDS_REVERT;
} else {
+ $intent_pass = ReleephRequest::INTENT_PASS;
+ $intent_want = ReleephRequest::INTENT_WANT;
+
$has_been_in_branch = $this->getCommitIdentifier();
// Regardless of why we reverted something, always say reverted if it
// was once in the branch.
if ($has_been_in_branch) {
return ReleephRequestStatus::STATUS_REVERTED;
- } else if ($this->getPusherIntent() === ReleephRequest::INTENT_PASS) {
+ } else if ($this->getPusherIntent() === $intent_pass) {
// Otherwise, if it has never been in the branch, explicitly say why:
return ReleephRequestStatus::STATUS_REJECTED;
- } else if ($this->getRequestorIntent() === ReleephRequest::INTENT_WANT) {
+ } else if ($this->getRequestorIntent() === $intent_want) {
return ReleephRequestStatus::STATUS_REQUESTED;
} else {
return ReleephRequestStatus::STATUS_ABANDONED;
diff --git a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
--- a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
@@ -52,6 +52,7 @@
break;
default:
$this->abortPull(pht('Unknown VCS "%s"!', $vcs));
+ break;
}
$callsign = $repository->getCallsign();
diff --git a/src/view/phui/PHUIInfoPanelView.php b/src/view/phui/PHUIInfoPanelView.php
--- a/src/view/phui/PHUIInfoPanelView.php
+++ b/src/view/phui/PHUIInfoPanelView.php
@@ -43,7 +43,9 @@
$tds[] = $this->renderCell($cell);
unset($this->infoblock[$key]);
$ii++;
- if ($ii > $this->columns) break;
+ if ($ii > $this->columns) {
+ break;
+ }
}
$trs[] = phutil_tag(
'tr',

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 4:43 AM (5 h, 20 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6925031
Default Alt Text
D11059.id26550.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility