From 5d1f94ac8a2c1e9cc5bd59a94faf6ff992ec80ef Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 4 Jun 2013 15:28:24 -0700 Subject: [PATCH] Fix some Phabricator lint warnings Summary: Lint. Test Plan: Lint. Reviewers: chad Reviewed By: chad CC: aran Differential Revision: https://secure.phabricator.com/D6127 --- scripts/user/account_admin.php | 3 +-- .../differential/parser/DifferentialHunkParser.php | 14 +++++++------- .../__tests__/DifferentialHunkParserTestCase.php | 4 ++-- src/applications/phid/PhabricatorObjectHandle.php | 4 ++-- .../pholio/editor/PholioMockEditor.php | 2 +- .../PhabricatorApplicationTransactionEditor.php | 2 +- .../PhabricatorBotBaseStreamingProtocolAdapter.php | 2 +- .../edges/editor/PhabricatorEdgeEditor.php | 2 +- src/view/layout/PhabricatorCrumbsView.php | 3 +-- src/view/phui/PHUIFeedStoryView.php | 2 +- 10 files changed, 18 insertions(+), 20 deletions(-) diff --git a/scripts/user/account_admin.php b/scripts/user/account_admin.php index f27b4d86a2..d966240f15 100755 --- a/scripts/user/account_admin.php +++ b/scripts/user/account_admin.php @@ -113,8 +113,7 @@ if (!$is_new) { if (!$verify_email->getIsVerified()) { $set_verified = phutil_console_confirm( 'Should the primary email address be verified?', - $default_no = true - ); + $default_no = true); } else { // already verified so let's not make a fuss $verify_email = null; diff --git a/src/applications/differential/parser/DifferentialHunkParser.php b/src/applications/differential/parser/DifferentialHunkParser.php index 5d2f9a6222..d6a325513a 100644 --- a/src/applications/differential/parser/DifferentialHunkParser.php +++ b/src/applications/differential/parser/DifferentialHunkParser.php @@ -585,8 +585,8 @@ final class DifferentialHunkParser { $end = $end + $add_context; $hunk_content = array(); $hunk_pos = array( "-" => 0, "+" => 0 ); - $hunk_offset = array( "-" => NULL, "+" => NULL ); - $hunk_last = array( "-" => NULL, "+" => NULL ); + $hunk_offset = array( "-" => null, "+" => null ); + $hunk_last = array( "-" => null, "+" => null ); foreach (explode("\n", $hunk->getChanges()) as $line) { $in_common = strncmp($line, " ", 1) === 0; $in_old = strncmp($line, "-", 1) === 0 || $in_common; @@ -598,13 +598,13 @@ final class DifferentialHunkParser { if (!$skip || ($hunk_pos[$prefix] != $start && $hunk_pos[$prefix] != $end)) { if ($in_old) { - if ($hunk_offset["-"] === NULL) { + if ($hunk_offset["-"] === null) { $hunk_offset["-"] = $hunk_pos["-"]; } $hunk_last["-"] = $hunk_pos["-"]; } if ($in_new) { - if ($hunk_offset["+"] === NULL) { + if ($hunk_offset["+"] === null) { $hunk_offset["+"] = $hunk_pos["+"]; } $hunk_last["+"] = $hunk_pos["+"]; @@ -617,13 +617,13 @@ final class DifferentialHunkParser { if ($in_new) { ++$hunk_pos["+"]; } } } - if ($hunk_offset["-"] !== NULL || $hunk_offset["+"] !== NULL) { + if ($hunk_offset["-"] !== null || $hunk_offset["+"] !== null) { $header = "@@"; - if ($hunk_offset["-"] !== NULL) { + if ($hunk_offset["-"] !== null) { $header .= " -" . ($hunk->getOldOffset() + $hunk_offset["-"]) . "," . ($hunk_last["-"] - $hunk_offset["-"] + 1); } - if ($hunk_offset["+"] !== NULL) { + if ($hunk_offset["+"] !== null) { $header .= " +" . ($hunk->getNewOffset() + $hunk_offset["+"]) . "," . ($hunk_last["+"] - $hunk_offset["+"] + 1); } diff --git a/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php b/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php index cfec9d9c5e..4f5aa2b178 100644 --- a/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php +++ b/src/applications/differential/parser/__tests__/DifferentialHunkParserTestCase.php @@ -9,7 +9,7 @@ final class DifferentialHunkParserTestCase extends PhabricatorTestCase { // $length: 0 based (0 meaning 1 line) private function createNewComment($line, $length) { $comment = $this->createComment(); - $comment->setIsNewFile(True); + $comment->setIsNewFile(true); $comment->setLineNumber($line); $comment->setLineLength($length); return $comment; @@ -18,7 +18,7 @@ final class DifferentialHunkParserTestCase extends PhabricatorTestCase { // $length: 0 based (0 meaning 1 line) private function createOldComment($line, $length) { $comment = $this->createComment(); - $comment->setIsNewFile(False); + $comment->setIsNewFile(false); $comment->setLineNumber($line); $comment->setLineLength($length); return $comment; diff --git a/src/applications/phid/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php index a7114c856a..cb85132065 100644 --- a/src/applications/phid/PhabricatorObjectHandle.php +++ b/src/applications/phid/PhabricatorObjectHandle.php @@ -61,12 +61,12 @@ final class PhabricatorObjectHandle { } return $this->getName(); } - + public function setTitle($title) { $this->title = $title; return $this; } - + public function getTitle() { return $this->title; } diff --git a/src/applications/pholio/editor/PholioMockEditor.php b/src/applications/pholio/editor/PholioMockEditor.php index eadfda86bf..d00d852a37 100644 --- a/src/applications/pholio/editor/PholioMockEditor.php +++ b/src/applications/pholio/editor/PholioMockEditor.php @@ -144,7 +144,7 @@ final class PholioMockEditor extends PhabricatorApplicationTransactionEditor { $head = array(); $tail = array(); - // Move inline comments to the end, so the comments preceed them. + // Move inline comments to the end, so the comments precede them. foreach ($xactions as $xaction) { $type = $xaction->getTransactionType(); if ($type == PholioTransactionType::TYPE_INLINE) { diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php index ae39382c77..f427b62a04 100644 --- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php +++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php @@ -841,7 +841,7 @@ abstract class PhabricatorApplicationTransactionEditor $head = array(); $tail = array(); - // Move bare comments to the end, so the actions preceed them. + // Move bare comments to the end, so the actions precede them. foreach ($xactions as $xaction) { $type = $xaction->getTransactionType(); if ($type == PhabricatorTransactions::TYPE_COMMENT) { diff --git a/src/infrastructure/daemon/bot/adapter/PhabricatorBotBaseStreamingProtocolAdapter.php b/src/infrastructure/daemon/bot/adapter/PhabricatorBotBaseStreamingProtocolAdapter.php index 6c4d7f1627..2e81dee3ed 100644 --- a/src/infrastructure/daemon/bot/adapter/PhabricatorBotBaseStreamingProtocolAdapter.php +++ b/src/infrastructure/daemon/bot/adapter/PhabricatorBotBaseStreamingProtocolAdapter.php @@ -131,7 +131,7 @@ abstract class PhabricatorBotBaseStreamingProtocolAdapter return false; } - protected function performPost($endpoint, $data = Null) { + protected function performPost($endpoint, $data = null) { $uri = new PhutilURI($this->server); $uri->setPath($endpoint); diff --git a/src/infrastructure/edges/editor/PhabricatorEdgeEditor.php b/src/infrastructure/edges/editor/PhabricatorEdgeEditor.php index 4ee2b68b84..7de1b43f3d 100644 --- a/src/infrastructure/edges/editor/PhabricatorEdgeEditor.php +++ b/src/infrastructure/edges/editor/PhabricatorEdgeEditor.php @@ -355,7 +355,7 @@ final class PhabricatorEdgeEditor extends PhabricatorEditor { * response to edits, and is primarily useful when performing migrations. You * should not normally need to use it. * - * @param bool True to supress events related to edits. + * @param bool True to suppress events related to edits. * @return this * @task internal */ diff --git a/src/view/layout/PhabricatorCrumbsView.php b/src/view/layout/PhabricatorCrumbsView.php index 9fc18f98c9..c742db4b88 100644 --- a/src/view/layout/PhabricatorCrumbsView.php +++ b/src/view/layout/PhabricatorCrumbsView.php @@ -47,8 +47,7 @@ final class PhabricatorCrumbsView extends AphrontView { array( 'class' => 'phabricator-crumbs-action-name' ), - $action->getName() - ); + $action->getName()); $action_sigils = $action->getSigils(); if ($action->getWorkflow()) { diff --git a/src/view/phui/PHUIFeedStoryView.php b/src/view/phui/PHUIFeedStoryView.php index d8f0eb9d4b..59f9e3d6fd 100644 --- a/src/view/phui/PHUIFeedStoryView.php +++ b/src/view/phui/PHUIFeedStoryView.php @@ -208,7 +208,7 @@ final class PHUIFeedStoryView extends AphrontView { } public function setAppIconFromPHID($phid) { - switch(phid_get_type($phid)) { + switch (phid_get_type($phid)) { case PhabricatorPHIDConstants::PHID_TYPE_MOCK: $this->setAppIcon("pholio-dark"); break;