From d0128afa290849cc6b195a6d510ebb1aa02b50a8 Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Mon, 9 Jun 2014 16:03:58 -0700 Subject: [PATCH] Applied various linter fixes. Summary: Applied some more linter fixes that I previously missed because my global `arc` install was out-of-date. Test Plan: Will run `arc unit` on another host. Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: epriestley, Korvin Differential Revision: https://secure.phabricator.com/D9443 --- .../patches/098.heraldruletypemigration.php | 2 +- scripts/aphront/aphrontpath.php | 2 +- scripts/symbols/generate_ctags_symbols.php | 2 +- src/aphront/AphrontRequest.php | 26 +++++++++---------- .../editor/PhabricatorAuditCommentEditor.php | 4 +-- .../provider/PhabricatorAuthProviderOAuth.php | 2 +- ...PhabricatorChatLogChannelLogController.php | 8 +++--- src/applications/conduit/call/ConduitCall.php | 4 +-- .../PhabricatorConfigIgnoreController.php | 2 +- .../ConpherenceWidgetController.php | 4 +-- .../view/ConpherenceLayoutView.php | 4 +-- .../PhabricatorDashboardViewController.php | 2 +- .../DifferentialGetWorkingCopy.php | 4 +-- .../editor/DifferentialTransactionEditor.php | 2 +- .../DifferentialLandingToHostedGit.php | 6 ++--- .../mail/DifferentialReplyHandler.php | 4 +-- .../parser/DifferentialHunkParser.php | 8 +++--- .../__tests__/data/missing_context.diff | 1 - .../__tests__/data/missing_context_2.diff | 1 - .../__tests__/data/missing_context_3.diff | 1 - .../view/DifferentialInlineCommentView.php | 2 +- ...iffusionSubversionWireProtocolTestCase.php | 2 +- .../diffusion/request/DiffusionRequest.php | 4 +-- .../diffusion/view/DiffusionView.php | 2 +- .../conduit/ConduitAPI_feed_query_Method.php | 2 +- .../herald/adapter/HeraldAdapter.php | 2 +- .../controller/HeraldRuleController.php | 2 +- ...bricatorApplicationUninstallController.php | 4 +-- ...bricatorMetaMTAEmailBodyParserTestCase.php | 4 +-- .../PhabricatorMailReplyHandler.php | 2 +- .../ConduitAPI_owners_query_Method.php | 8 +++--- src/applications/owners/mail/PackageMail.php | 2 +- .../owners/mail/PackageModifyMail.php | 4 +-- .../query/PhabricatorOwnerPathQuery.php | 4 +-- .../pholio/query/PholioMockSearchEngine.php | 6 ++--- .../controller/PhrequentTrackController.php | 2 +- .../PhabricatorProjectEditIconController.php | 2 +- .../product/ReleephProductEditController.php | 2 +- .../request/ReleephRequestEditController.php | 2 +- ...ricatorSettingsPanelDisplayPreferences.php | 4 +-- .../PhabricatorBotFeedNotificationHandler.php | 8 +++--- ...bricatorSMSImplementationTwilioAdapter.php | 2 +- src/view/control/AphrontCursorPagerView.php | 6 ++--- src/view/layout/PhabricatorSourceCodeView.php | 2 +- 44 files changed, 83 insertions(+), 86 deletions(-) diff --git a/resources/sql/patches/098.heraldruletypemigration.php b/resources/sql/patches/098.heraldruletypemigration.php index 9340455b2e..0efc8c7e94 100644 --- a/resources/sql/patches/098.heraldruletypemigration.php +++ b/resources/sql/patches/098.heraldruletypemigration.php @@ -41,7 +41,7 @@ foreach ($rules as $rule) { $rule->getRuleType(), $rule->getID()); - echo "Setting rule '" . $rule->getName() . "' to personal. "; + echo "Setting rule '".$rule->getName()."' to personal. "; } } } diff --git a/scripts/aphront/aphrontpath.php b/scripts/aphront/aphrontpath.php index 627ae064c1..04a051212c 100755 --- a/scripts/aphront/aphrontpath.php +++ b/scripts/aphront/aphrontpath.php @@ -22,5 +22,5 @@ if (!$controller && substr($path, -1) !== '/') { list($controller) = $application->buildControllerForPath($path.'/'); } if ($controller) { - echo get_class($controller) . "\n"; + echo get_class($controller)."\n"; } diff --git a/scripts/symbols/generate_ctags_symbols.php b/scripts/symbols/generate_ctags_symbols.php index 42d3dbf25f..6c52521d7e 100755 --- a/scripts/symbols/generate_ctags_symbols.php +++ b/scripts/symbols/generate_ctags_symbols.php @@ -110,7 +110,7 @@ function print_symbol($file, $line_num, $type, $token, $context, $language) { if ($file[0] == '.' || $file[0] == '..') { array_shift($file); } - $file = '/' . implode('/', $file); + $file = '/'.implode('/', $file); $parts = array( $context, diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php index cf609011bb..5393dc37d3 100644 --- a/src/aphront/AphrontRequest.php +++ b/src/aphront/AphrontRequest.php @@ -231,19 +231,19 @@ final class AphrontRequest { if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) { // TODO: Clean this up, see T1921. $more_info[] = - "To avoid this error, use phabricator_form() to construct forms. " . - "If you are already using phabricator_form(), make sure the form " . - "'action' uses a relative URI (i.e., begins with a '/'). Forms " . - "using absolute URIs do not include CSRF tokens, to prevent " . - "leaking tokens to external sites.\n\n" . - "If this page performs writes which do not require CSRF " . - "protection (usually, filling caches or logging), you can use " . - "AphrontWriteGuard::beginScopedUnguardedWrites() to temporarily " . - "bypass CSRF protection while writing. You should use this only " . - "for writes which can not be protected with normal CSRF " . - "mechanisms.\n\n" . - "Some UI elements (like PhabricatorActionListView) also have " . - "methods which will allow you to render links as forms (like " . + "To avoid this error, use phabricator_form() to construct forms. ". + "If you are already using phabricator_form(), make sure the form ". + "'action' uses a relative URI (i.e., begins with a '/'). Forms ". + "using absolute URIs do not include CSRF tokens, to prevent ". + "leaking tokens to external sites.\n\n". + "If this page performs writes which do not require CSRF ". + "protection (usually, filling caches or logging), you can use ". + "AphrontWriteGuard::beginScopedUnguardedWrites() to temporarily ". + "bypass CSRF protection while writing. You should use this only ". + "for writes which can not be protected with normal CSRF ". + "mechanisms.\n\n". + "Some UI elements (like PhabricatorActionListView) also have ". + "methods which will allow you to render links as forms (like ". "setRenderAsForm(true))."; } diff --git a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php index b157b4d2fe..88a293a576 100644 --- a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php +++ b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php @@ -261,7 +261,7 @@ final class PhabricatorAuditCommentEditor extends PhabricatorEditor { ->setAuditorPHID($auditor_phid) ->setAuditStatus($audit_requested) ->setAuditReasons( - array('Added by ' . $actor->getUsername())) + array('Added by '.$actor->getUsername())) ->save(); } } @@ -274,7 +274,7 @@ final class PhabricatorAuditCommentEditor extends PhabricatorEditor { ->setAuditorPHID($cc_phid) ->setAuditStatus($audit_cc) ->setAuditReasons( - array('Added by ' . $actor->getUsername())) + array('Added by '.$actor->getUsername())) ->save(); } } diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuth.php b/src/applications/auth/provider/PhabricatorAuthProviderOAuth.php index 786057c970..0547da8200 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderOAuth.php +++ b/src/applications/auth/provider/PhabricatorAuthProviderOAuth.php @@ -81,7 +81,7 @@ abstract class PhabricatorAuthProviderOAuth extends PhabricatorAuthProvider { public function getConfigurationHelp() { $help = $this->getProviderConfigurationHelp(); - return $help . "\n\n" . + return $help."\n\n". pht('Use the **OAuth App Notes** field to record details about which '. 'account the external application is registered under.'); } diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php index b5e78baf27..e0727e1ea2 100644 --- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php +++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php @@ -152,7 +152,7 @@ final class PhabricatorChatLogChannelLogController array( 'href' => $first_uri, ), - "\xC2\xAB ". pht('Newest')); + "\xC2\xAB ".pht('Newest')); } $prev_uri = $pager->getPrevPageURI(); @@ -162,7 +162,7 @@ final class PhabricatorChatLogChannelLogController array( 'href' => $prev_uri, ), - "\xE2\x80\xB9 " . pht('Newer')); + "\xE2\x80\xB9 ".pht('Newer')); } $next_uri = $pager->getNextPageURI(); @@ -172,7 +172,7 @@ final class PhabricatorChatLogChannelLogController array( 'href' => $next_uri, ), - pht('Older') . " \xE2\x80\xBA"); + pht('Older')." \xE2\x80\xBA"); } $pager_top = phutil_tag( @@ -224,7 +224,7 @@ final class PhabricatorChatLogChannelLogController array( 'href' => '#latest' ), - pht('Jump to Bottom') . " \xE2\x96\xBE"); + pht('Jump to Bottom')." \xE2\x96\xBE"); $jump = phutil_tag( 'div', diff --git a/src/applications/conduit/call/ConduitCall.php b/src/applications/conduit/call/ConduitCall.php index 99f266ff1e..85d7ecc5bb 100644 --- a/src/applications/conduit/call/ConduitCall.php +++ b/src/applications/conduit/call/ConduitCall.php @@ -27,8 +27,8 @@ final class ConduitCall { $this->handler->defineParamTypes()); if ($invalid_params) { throw new ConduitException( - "Method '{$method}' doesn't define these parameters: '" . - implode("', '", array_keys($invalid_params)) . "'."); + "Method '{$method}' doesn't define these parameters: '". + implode("', '", array_keys($invalid_params))."'."); } if ($this->servers) { diff --git a/src/applications/config/controller/PhabricatorConfigIgnoreController.php b/src/applications/config/controller/PhabricatorConfigIgnoreController.php index 9bc23d3458..2a6fe1886c 100644 --- a/src/applications/config/controller/PhabricatorConfigIgnoreController.php +++ b/src/applications/config/controller/PhabricatorConfigIgnoreController.php @@ -34,7 +34,7 @@ final class PhabricatorConfigIgnoreController 'This issue will no longer be suppressed, and will return to its '. 'rightful place as a global setup warning.'); } else { - throw new Exception('Unrecognized verb: ' . $this->verb); + throw new Exception('Unrecognized verb: '.$this->verb); } $dialog = id(new AphrontDialogView()) diff --git a/src/applications/conpherence/controller/ConpherenceWidgetController.php b/src/applications/conpherence/controller/ConpherenceWidgetController.php index 809b04a64a..d72b348c9d 100644 --- a/src/applications/conpherence/controller/ConpherenceWidgetController.php +++ b/src/applications/conpherence/controller/ConpherenceWidgetController.php @@ -274,8 +274,8 @@ final class ConpherenceWidgetController extends phabricator_format_local_time( $status->getDateFrom(), $user, - $time_str) . - ' - ' . + $time_str). + ' - '. phabricator_format_local_time( $status->getDateTo(), $user, diff --git a/src/applications/conpherence/view/ConpherenceLayoutView.php b/src/applications/conpherence/view/ConpherenceLayoutView.php index 3bd75347d8..5036304f73 100644 --- a/src/applications/conpherence/view/ConpherenceLayoutView.php +++ b/src/applications/conpherence/view/ConpherenceLayoutView.php @@ -59,7 +59,7 @@ final class ConpherenceLayoutView extends AphrontView { $selected_id = null; $selected_thread_id = null; if ($this->thread) { - $selected_id = $this->thread->getPHID() . '-nav-item'; + $selected_id = $this->thread->getPHID().'-nav-item'; $selected_thread_id = $this->thread->getID(); } $this->initBehavior('conpherence-menu', @@ -77,7 +77,7 @@ final class ConpherenceLayoutView extends AphrontView { $this->initBehavior( 'conpherence-widget-pane', array( - 'widgetBaseUpdateURI' => $this->baseURI . 'update/', + 'widgetBaseUpdateURI' => $this->baseURI.'update/', 'widgetRegistry' => array( 'conpherence-message-pane' => array( 'name' => pht('Thread'), diff --git a/src/applications/dashboard/controller/PhabricatorDashboardViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardViewController.php index 0201a8e2ee..695428c88a 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardViewController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardViewController.php @@ -70,7 +70,7 @@ final class PhabricatorDashboardViewController 'yet. Use %s to add panels.', phutil_tag( 'a', - array('href'=>$manage_uri), + array('href' => $manage_uri), pht('Manage Dashboard')))); } diff --git a/src/applications/differential/DifferentialGetWorkingCopy.php b/src/applications/differential/DifferentialGetWorkingCopy.php index 91245bf296..7708d84833 100644 --- a/src/applications/differential/DifferentialGetWorkingCopy.php +++ b/src/applications/differential/DifferentialGetWorkingCopy.php @@ -17,7 +17,7 @@ final class DifferentialGetWorkingCopy { $origin_path = $repo->getLocalPath(); $path = rtrim($origin_path, '/'); - $path = $path . '__workspace'; + $path = $path.'__workspace'; if (!Filesystem::pathExists($path)) { $repo->execxLocalCommand( @@ -53,7 +53,7 @@ final class DifferentialGetWorkingCopy { $origin_path = $repo->getLocalPath(); $path = rtrim($origin_path, '/'); - $path = $path . '__workspace'; + $path = $path.'__workspace'; if (!Filesystem::pathExists($path)) { $repo->execxLocalCommand( diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php index 87e73ab085..eb61f82276 100644 --- a/src/applications/differential/editor/DifferentialTransactionEditor.php +++ b/src/applications/differential/editor/DifferentialTransactionEditor.php @@ -1322,7 +1322,7 @@ final class DifferentialTransactionEditor $result[] = "{$file}:{$range} {$inline_content}"; } else { $result[] = '================'; - $result[] = 'Comment at: ' . $file . ':' . $range; + $result[] = 'Comment at: '.$file.':'.$range; $result[] = $hunk_parser->makeContextDiff( $changeset->getHunks(), $comment->getIsNewFile(), diff --git a/src/applications/differential/landing/DifferentialLandingToHostedGit.php b/src/applications/differential/landing/DifferentialLandingToHostedGit.php index 0b4642a776..2cf3350341 100644 --- a/src/applications/differential/landing/DifferentialLandingToHostedGit.php +++ b/src/applications/differential/landing/DifferentialLandingToHostedGit.php @@ -53,8 +53,8 @@ final class DifferentialLandingToHostedGit $missing_binary = "\nindex " - . "0000000000000000000000000000000000000000.." - . "0000000000000000000000000000000000000000\n"; + ."0000000000000000000000000000000000000000.." + ."0000000000000000000000000000000000000000\n"; if (strpos($raw_diff, $missing_binary) !== false) { throw new Exception('Patch is missing content for a binary file'); } @@ -85,7 +85,7 @@ final class DifferentialLandingToHostedGit $author_date = $revision->getDateCreated(); $workspace->execxLocal( - '-c user.name=%s -c user.email=%s ' . + '-c user.name=%s -c user.email=%s '. 'commit --date=%s --author=%s '. '--message=%s', // -c will set the 'committer' diff --git a/src/applications/differential/mail/DifferentialReplyHandler.php b/src/applications/differential/mail/DifferentialReplyHandler.php index 1abb30bc97..39e5dd2506 100644 --- a/src/applications/differential/mail/DifferentialReplyHandler.php +++ b/src/applications/differential/mail/DifferentialReplyHandler.php @@ -105,11 +105,11 @@ class DifferentialReplyHandler extends PhabricatorMailReplyHandler { // unrecognized commands will be parsed as part of the comment. $command = DifferentialAction::ACTION_COMMENT; $supported_commands = $this->getSupportedCommands(); - $regex = "/\A\n*!(" . implode('|', $supported_commands) . ")\n*/"; + $regex = "/\A\n*!(".implode('|', $supported_commands).")\n*/"; $matches = array(); if (preg_match($regex, $body, $matches)) { $command = $matches[1]; - $body = trim(str_replace('!' . $command, '', $body)); + $body = trim(str_replace('!'.$command, '', $body)); } $actor = $this->getActor(); diff --git a/src/applications/differential/parser/DifferentialHunkParser.php b/src/applications/differential/parser/DifferentialHunkParser.php index f404d81f4a..79e8d7eb5a 100644 --- a/src/applications/differential/parser/DifferentialHunkParser.php +++ b/src/applications/differential/parser/DifferentialHunkParser.php @@ -638,12 +638,12 @@ final class DifferentialHunkParser { if ($hunk_offset['-'] !== null || $hunk_offset['+'] !== null) { $header = '@@'; if ($hunk_offset['-'] !== null) { - $header .= ' -' . ($hunk->getOldOffset() + $hunk_offset['-']) . - ',' . ($hunk_last['-'] - $hunk_offset['-'] + 1); + $header .= ' -'.($hunk->getOldOffset() + $hunk_offset['-']). + ','.($hunk_last['-'] - $hunk_offset['-'] + 1); } if ($hunk_offset['+'] !== null) { - $header .= ' +' . ($hunk->getNewOffset() + $hunk_offset['+']) . - ',' . ($hunk_last['+'] - $hunk_offset['+'] + 1); + $header .= ' +'.($hunk->getNewOffset() + $hunk_offset['+']). + ','.($hunk_last['+'] - $hunk_offset['+'] + 1); } $header .= ' @@'; $context[] = $header; diff --git a/src/applications/differential/parser/__tests__/data/missing_context.diff b/src/applications/differential/parser/__tests__/data/missing_context.diff index e5f2e19ad6..357a785299 100644 --- a/src/applications/differential/parser/__tests__/data/missing_context.diff +++ b/src/applications/differential/parser/__tests__/data/missing_context.diff @@ -8,4 +8,3 @@ index a1f7255..b5fb7b8 100644 fig -grape honeydew - diff --git a/src/applications/differential/parser/__tests__/data/missing_context_2.diff b/src/applications/differential/parser/__tests__/data/missing_context_2.diff index 4e683981ad..514236ded2 100644 --- a/src/applications/differential/parser/__tests__/data/missing_context_2.diff +++ b/src/applications/differential/parser/__tests__/data/missing_context_2.diff @@ -9,4 +9,3 @@ index a1f7255..fa84742 100644 +guava +gooseberry honeydew - diff --git a/src/applications/differential/parser/__tests__/data/missing_context_3.diff b/src/applications/differential/parser/__tests__/data/missing_context_3.diff index d8802ab89e..28f93725a4 100644 --- a/src/applications/differential/parser/__tests__/data/missing_context_3.diff +++ b/src/applications/differential/parser/__tests__/data/missing_context_3.diff @@ -15,4 +15,3 @@ index bf66874..071dd49 100644 banana grape -honeydew - diff --git a/src/applications/differential/view/DifferentialInlineCommentView.php b/src/applications/differential/view/DifferentialInlineCommentView.php index 0b491b64e0..074d202405 100644 --- a/src/applications/differential/view/DifferentialInlineCommentView.php +++ b/src/applications/differential/view/DifferentialInlineCommentView.php @@ -75,7 +75,7 @@ final class DifferentialInlineCommentView extends AphrontView { $sigil = 'differential-inline-comment'; if ($this->preview) { - $sigil = $sigil . ' differential-inline-comment-preview'; + $sigil = $sigil.' differential-inline-comment-preview'; } $content = $inline->getContent(); diff --git a/src/applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php b/src/applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php index 088f7222ed..bd99b82035 100644 --- a/src/applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php +++ b/src/applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php @@ -78,7 +78,7 @@ final class DiffusionSubversionWireProtocolTestCase 'value' => 'duck', ), array( - 'type'=> 'string', + 'type' => 'string', 'value' => 'quack', ), ), diff --git a/src/applications/diffusion/request/DiffusionRequest.php b/src/applications/diffusion/request/DiffusionRequest.php index e18f2a3578..a98a7080b6 100644 --- a/src/applications/diffusion/request/DiffusionRequest.php +++ b/src/applications/diffusion/request/DiffusionRequest.php @@ -691,8 +691,8 @@ abstract class DiffusionRequest { $host = php_uname('n'); $callsign = $this->getRepository()->getCallsign(); throw new DiffusionSetupException( - "The clone of this repository ('{$callsign}') on the local machine " . - "('{$host}') could not be read. Ensure that the repository is in a " . + "The clone of this repository ('{$callsign}') on the local machine ". + "('{$host}') could not be read. Ensure that the repository is in a ". "location where the web server has read permissions."); } diff --git a/src/applications/diffusion/view/DiffusionView.php b/src/applications/diffusion/view/DiffusionView.php index bc2172021b..44613f05cc 100644 --- a/src/applications/diffusion/view/DiffusionView.php +++ b/src/applications/diffusion/view/DiffusionView.php @@ -120,7 +120,7 @@ abstract class DiffusionView extends AphrontView { $callsign = $repository->getCallsign(); if (strlen($summary)) { - $commit_name .= ': ' . $summary; + $commit_name .= ': '.$summary; } return phutil_tag( diff --git a/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php b/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php index 3c40c3ec11..973e656f03 100644 --- a/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php +++ b/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php @@ -44,7 +44,7 @@ final class ConduitAPI_feed_query_Method return array( 'ERR-UNKNOWN-TYPE' => - 'Unsupported view type, possibles are: ' . $view_types + 'Unsupported view type, possibles are: '.$view_types ); } diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php index 7cd571aa8a..dbfde93337 100644 --- a/src/applications/herald/adapter/HeraldAdapter.php +++ b/src/applications/herald/adapter/HeraldAdapter.php @@ -483,7 +483,7 @@ abstract class HeraldAdapter { // We add the 'S' flag because we use the regexp multiple times. // It shouldn't cause any troubles if the flag is already there // - /.*/S is evaluated same as /.*/SS. - $result = @preg_match($condition_value . 'S', $value); + $result = @preg_match($condition_value.'S', $value); if ($result === false) { throw new HeraldInvalidConditionException( 'Regular expression is not valid!'); diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php index ecda679c83..48c296c096 100644 --- a/src/applications/herald/controller/HeraldRuleController.php +++ b/src/applications/herald/controller/HeraldRuleController.php @@ -643,7 +643,7 @@ final class HeraldRuleController extends HeraldController { foreach ($all_rules as $current_rule) { if ($current_rule->getIsDisabled()) { $current_rule->makeEphemeral(); - $current_rule->setName($rule->getName(). ' '.pht('(Disabled)')); + $current_rule->setName($rule->getName().' '.pht('(Disabled)')); } } diff --git a/src/applications/meta/controller/PhabricatorApplicationUninstallController.php b/src/applications/meta/controller/PhabricatorApplicationUninstallController.php index 052ef30222..80b0151cfa 100644 --- a/src/applications/meta/controller/PhabricatorApplicationUninstallController.php +++ b/src/applications/meta/controller/PhabricatorApplicationUninstallController.php @@ -54,7 +54,7 @@ final class PhabricatorApplicationUninstallController if ($selected->canUninstall()) { $dialog->setTitle('Confirmation') ->appendChild( - 'Install '. $selected->getName(). ' application?') + 'Install '.$selected->getName().' application?') ->addSubmitButton('Install'); } else { @@ -65,7 +65,7 @@ final class PhabricatorApplicationUninstallController if ($selected->canUninstall()) { $dialog->setTitle('Confirmation') ->appendChild( - 'Really Uninstall '. $selected->getName(). ' application?') + 'Really Uninstall '.$selected->getName().' application?') ->addSubmitButton('Uninstall'); } else { $dialog->setTitle('Information') diff --git a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php b/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php index 08414f2e97..4a9c2cc845 100644 --- a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php +++ b/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php @@ -49,7 +49,7 @@ EOEMAIL; $bodies = $this->getEmailBodies(); $with_commands = array(); foreach ($bodies as $body) { - $with_commands[] = "!whatevs dude\n" . $body; + $with_commands[] = "!whatevs dude\n".$body; } return $with_commands; } @@ -58,7 +58,7 @@ EOEMAIL; $bodies = $this->getEmailBodies(); $with_commands = array(); foreach ($bodies as $body) { - $with_commands[] = "!whatevs\n" . $body; + $with_commands[] = "!whatevs\n".$body; } return $with_commands; } diff --git a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php index eaa890ae37..64784a1963 100644 --- a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php +++ b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php @@ -239,7 +239,7 @@ abstract class PhabricatorMailReplyHandler { $single_handle_prefix = PhabricatorEnv::getEnvConfig( 'metamta.single-reply-handler-prefix'); return ($single_handle_prefix) - ? $single_handle_prefix . '+' . $address + ? $single_handle_prefix.'+'.$address : $address; } diff --git a/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php b/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php index 6d93d659ba..45805eeb6f 100644 --- a/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php +++ b/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php @@ -7,9 +7,9 @@ final class ConduitAPI_owners_query_Method extends ConduitAPI_owners_Method { public function getMethodDescription() { - return 'Query for packages by one of the following: repository/path, ' . - 'packages with a given user or project owner, or packages affiliated ' . - 'with a user (owned by either the user or a project they are a member ' . + return 'Query for packages by one of the following: repository/path, '. + 'packages with a given user or project owner, or packages affiliated '. + 'with a user (owned by either the user or a project they are a member '. 'of.) You should only provide at most one search query.'; } @@ -31,7 +31,7 @@ final class ConduitAPI_owners_query_Method public function defineErrorTypes() { return array( 'ERR-INVALID-USAGE' => - 'Provide one of a single owner phid (user/project), a single ' . + 'Provide one of a single owner phid (user/project), a single '. 'affiliated user phid (user), or a repository/path.', 'ERR-INVALID-PARAMETER' => 'parameter should be a phid', 'ERR_REP_NOT_FOUND' => 'The repository callsign is not recognized', diff --git a/src/applications/owners/mail/PackageMail.php b/src/applications/owners/mail/PackageMail.php index b0110caad2..58060d9633 100644 --- a/src/applications/owners/mail/PackageMail.php +++ b/src/applications/owners/mail/PackageMail.php @@ -44,7 +44,7 @@ abstract class PackageMail extends PhabricatorMail { $handles = $this->getHandles(); $section = array(); $section[] = ' In repository '.$handles[$repository_phid]->getName(). - ' - '. PhabricatorEnv::getProductionURI($handles[$repository_phid] + ' - '.PhabricatorEnv::getProductionURI($handles[$repository_phid] ->getURI()); foreach ($paths as $path => $excluded) { $section[] = ' '.($excluded ? 'Excluded' : 'Included').' '.$path; diff --git a/src/applications/owners/mail/PackageModifyMail.php b/src/applications/owners/mail/PackageModifyMail.php index 740100a0ae..206fece688 100644 --- a/src/applications/owners/mail/PackageModifyMail.php +++ b/src/applications/owners/mail/PackageModifyMail.php @@ -81,9 +81,9 @@ final class PackageModifyMail extends PackageMail { $section = array(); $section[] = 'PRIMARY OWNER CHANGE'; - $section[] = ' Old owner: ' . + $section[] = ' Old owner: '. $handles[$old_primary_owner_phid]->getName(); - $section[] = ' New owner: ' . + $section[] = ' New owner: '. $handles[$primary_owner_phid]->getName(); return implode("\n", $section); diff --git a/src/applications/owners/query/PhabricatorOwnerPathQuery.php b/src/applications/owners/query/PhabricatorOwnerPathQuery.php index e80e4e3e48..0e13b21bea 100644 --- a/src/applications/owners/query/PhabricatorOwnerPathQuery.php +++ b/src/applications/owners/query/PhabricatorOwnerPathQuery.php @@ -20,9 +20,9 @@ final class PhabricatorOwnerPathQuery { $result = array(); foreach ($paths as $path) { - $basic_path = '/' . $path->getPath(); + $basic_path = '/'.$path->getPath(); if ($path->getFileType() == DifferentialChangeType::FILE_DIRECTORY) { - $basic_path = rtrim($basic_path, '/') . '/'; + $basic_path = rtrim($basic_path, '/').'/'; } $result[] = $basic_path; } diff --git a/src/applications/pholio/query/PholioMockSearchEngine.php b/src/applications/pholio/query/PholioMockSearchEngine.php index 96b546160e..822d318f99 100644 --- a/src/applications/pholio/query/PholioMockSearchEngine.php +++ b/src/applications/pholio/query/PholioMockSearchEngine.php @@ -41,9 +41,9 @@ final class PholioMockSearchEngine ->execute(); $statuses = array( - ''=>pht('Any Status'), - 'closed'=>pht('Closed'), - 'open'=>pht('Open')); + '' => pht('Any Status'), + 'closed' => pht('Closed'), + 'open' => pht('Open')); $status = $saved_query->getParameter('statuses', array()); $status = head($status); diff --git a/src/applications/phrequent/controller/PhrequentTrackController.php b/src/applications/phrequent/controller/PhrequentTrackController.php index 0dd5219d7a..b4b167550f 100644 --- a/src/applications/phrequent/controller/PhrequentTrackController.php +++ b/src/applications/phrequent/controller/PhrequentTrackController.php @@ -23,7 +23,7 @@ final class PhrequentTrackController if (!$this->isStartingTracking() && !$this->isStoppingTracking()) { - throw new Exception('Unrecognized verb: ' . $this->verb); + throw new Exception('Unrecognized verb: '.$this->verb); } switch ($this->verb) { diff --git a/src/applications/project/controller/PhabricatorProjectEditIconController.php b/src/applications/project/controller/PhabricatorProjectEditIconController.php index c38baa510d..e2ad4e2bf9 100644 --- a/src/applications/project/controller/PhabricatorProjectEditIconController.php +++ b/src/applications/project/controller/PhabricatorProjectEditIconController.php @@ -66,7 +66,7 @@ final class PhabricatorProjectEditIconController if ($icon == $project->getIcon()) { $class_extra = ' selected'; - $tip = $label . pht(' - selected'); + $tip = $label.pht(' - selected'); } else { $class_extra = null; $tip = $label; diff --git a/src/applications/releeph/controller/product/ReleephProductEditController.php b/src/applications/releeph/controller/product/ReleephProductEditController.php index bd852dcd50..855ef06530 100644 --- a/src/applications/releeph/controller/product/ReleephProductEditController.php +++ b/src/applications/releeph/controller/product/ReleephProductEditController.php @@ -162,7 +162,7 @@ final class ReleephProductEditController extends ReleephProductController { ->setValue($pick_failure_instructions) ->setName('pickFailureInstructions') ->setCaption( - pht('Instructions for pick failures, which will be used ' . + pht('Instructions for pick failures, which will be used '. 'in emails generated by failed picks'))) ->appendChild( id(new AphrontFormTextAreaControl()) diff --git a/src/applications/releeph/controller/request/ReleephRequestEditController.php b/src/applications/releeph/controller/request/ReleephRequestEditController.php index 608ae83780..c8e74185c9 100644 --- a/src/applications/releeph/controller/request/ReleephRequestEditController.php +++ b/src/applications/releeph/controller/request/ReleephRequestEditController.php @@ -196,7 +196,7 @@ final class ReleephRequestEditController extends ReleephBranchController { $age_string = ''; if ($is_edit) { $age_string = phabricator_format_relative_time( - time() - $pull->getDateCreated()) . ' ago'; + time() - $pull->getDateCreated()).' ago'; } // Warn the user if we've been redirected here because we tried to diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php index 47ae324df4..a464227b85 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php @@ -113,10 +113,10 @@ EXAMPLE; ->setOptions( array( 'glyph' => - pht("In page titles, show Tool names as unicode glyphs: " . + pht("In page titles, show Tool names as unicode glyphs: ". "\xE2\x9A\x99"), 'text' => - pht('In page titles, show Tool names as plain text: ' . + pht('In page titles, show Tool names as plain text: '. '[Differential]'), ))) ->appendChild( diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php index 731a2d4067..81520518d9 100644 --- a/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php +++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php @@ -104,7 +104,7 @@ final class PhabricatorBotFeedNotificationHandler $latest = $this->getConduit()->callMethodSynchronous( 'feed.query', array( - 'limit'=>1 + 'limit' => 1, )); foreach ($latest as $story) { @@ -127,9 +127,9 @@ final class PhabricatorBotFeedNotificationHandler $stories = $this->getConduit()->callMethodSynchronous( 'feed.query', array( - 'limit'=>$config_page_size, - 'after'=>$chrono_key_cursor, - 'view'=>'text' + 'limit' => $config_page_size, + 'after' => $chrono_key_cursor, + 'view' => 'text', )); foreach ($stories as $story) { diff --git a/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTwilioAdapter.php b/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTwilioAdapter.php index d5101965b5..56a91f7caf 100644 --- a/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTwilioAdapter.php +++ b/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTwilioAdapter.php @@ -93,7 +93,7 @@ final class PhabricatorSMSImplementationTwilioAdapter $prepend = '+1'; break; } - return $prepend . $number; + return $prepend.$number; } } diff --git a/src/view/control/AphrontCursorPagerView.php b/src/view/control/AphrontCursorPagerView.php index 59fc86493e..fe6089c4b0 100644 --- a/src/view/control/AphrontCursorPagerView.php +++ b/src/view/control/AphrontCursorPagerView.php @@ -146,7 +146,7 @@ final class AphrontCursorPagerView extends AphrontView { array( 'href' => $first_uri, ), - "\xC2\xAB ". pht('First')); + "\xC2\xAB ".pht('First')); } $prev_uri = $this->getPrevPageURI(); @@ -156,7 +156,7 @@ final class AphrontCursorPagerView extends AphrontView { array( 'href' => $prev_uri, ), - "\xE2\x80\xB9 " . pht('Prev')); + "\xE2\x80\xB9 ".pht('Prev')); } $next_uri = $this->getNextPageURI(); @@ -166,7 +166,7 @@ final class AphrontCursorPagerView extends AphrontView { array( 'href' => $next_uri, ), - pht('Next') . " \xE2\x80\xBA"); + pht('Next')." \xE2\x80\xBA"); } return phutil_tag( diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php index 05fab2301c..4eaa6356df 100644 --- a/src/view/layout/PhabricatorSourceCodeView.php +++ b/src/view/layout/PhabricatorSourceCodeView.php @@ -71,7 +71,7 @@ final class PhabricatorSourceCodeView extends AphrontView { } if ($this->canClickHighlight) { - $line_uri = $this->uri . '$' . $line_number; + $line_uri = $this->uri.'$'.$line_number; $line_href = (string) new PhutilURI($line_uri); $tag_number = javelin_tag(