diff --git a/conf/default.conf.php b/conf/default.conf.php index 8895942921..f8c9e3e427 100644 --- a/conf/default.conf.php +++ b/conf/default.conf.php @@ -798,7 +798,7 @@ return array( // '#/autobuilt/#', ), - // If you set this to true, users can accept their own revisions. This action + // If you set this to true, users can accept their own revisions. This action // is disabled by default because it's most likely not a behavior you want, // but it proves useful if you are working alone on a project and want to make // use of all of differential's features. @@ -817,7 +817,7 @@ return array( // If you set this to true, any user can reopen a revision so long as it has // been closed. This can be useful if a revision is accidentally closed or - // if a developer changes his or her mind after closing a revision. If it is + // if a developer changes his or her mind after closing a revision. If it is // false, reopening is not allowed. 'differential.allow-reopen' => false, diff --git a/externals/balanced-php/tests/Balanced/SuiteTest.php b/externals/balanced-php/tests/Balanced/SuiteTest.php index 83cdbb162d..9c324b912d 100644 --- a/externals/balanced-php/tests/Balanced/SuiteTest.php +++ b/externals/balanced-php/tests/Balanced/SuiteTest.php @@ -27,8 +27,6 @@ use Balanced\Card; *
  • $BALANCED_URL_ROOT If set applies to \Balanced\Settings::$url_root. *
  • $BALANCED_API_KEY If set applies to \Balanced\Settings::$api_key. * - * - * @group suite */ class SuiteTest extends \PHPUnit_Framework_TestCase { @@ -784,17 +782,17 @@ class SuiteTest extends \PHPUnit_Framework_TestCase } function testEvents() { - $prev_num_events = Marketplace::mine()->events->total(); - $account = self::_createBuyer(); - $account->debit(123); - $cur_num_events = Marketplace::mine()->events->total(); - $count = 0; + $prev_num_events = Marketplace::mine()->events->total(); + $account = self::_createBuyer(); + $account->debit(123); + $cur_num_events = Marketplace::mine()->events->total(); + $count = 0; while ($cur_num_events == $prev_num_events && $count < 10) { printf("waiting for events - %d, %d == %d\n", $count + 1, $cur_num_events, $prev_num_events); sleep(2); // 2 seconds - $cur_num_events = Marketplace::mine()->events->total(); - $count += 1; - } + $cur_num_events = Marketplace::mine()->events->total(); + $count += 1; + } $this->assertTrue($cur_num_events > $prev_num_events); } } diff --git a/src/aphront/AphrontController.php b/src/aphront/AphrontController.php index a591271270..352e56ee11 100644 --- a/src/aphront/AphrontController.php +++ b/src/aphront/AphrontController.php @@ -1,8 +1,5 @@ 'PhabricatorMonospaced'), $details), )); } + } diff --git a/src/aphront/console/plugin/DarkConsoleEventPlugin.php b/src/aphront/console/plugin/DarkConsoleEventPlugin.php index bc191e00ea..02dc4e8b78 100644 --- a/src/aphront/console/plugin/DarkConsoleEventPlugin.php +++ b/src/aphront/console/plugin/DarkConsoleEventPlugin.php @@ -1,8 +1,5 @@ getAllListeners(); foreach ($listeners as $key => $listener) { $listeners[$key] = array( @@ -95,4 +91,5 @@ final class DarkConsoleEventPlugin extends DarkConsolePlugin { return phutil_implode_html("\n", $out); } + } diff --git a/src/aphront/console/plugin/DarkConsolePlugin.php b/src/aphront/console/plugin/DarkConsolePlugin.php index 20a93199c0..be1eeb846c 100644 --- a/src/aphront/console/plugin/DarkConsolePlugin.php +++ b/src/aphront/console/plugin/DarkConsolePlugin.php @@ -1,8 +1,5 @@ getServiceCallLog(); diff --git a/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php b/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php index f56ad00b9a..2a0d22f775 100644 --- a/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php +++ b/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php @@ -1,8 +1,5 @@ tag and then uses // Object.prototype.__defineSetter__() or similar to read response data. diff --git a/src/aphront/response/AphrontWebpageResponse.php b/src/aphront/response/AphrontWebpageResponse.php index 9bc2a54e83..bda0d94244 100644 --- a/src/aphront/response/AphrontWebpageResponse.php +++ b/src/aphront/response/AphrontWebpageResponse.php @@ -1,8 +1,5 @@ getValue('channelIDs'); diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php b/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php index d31f040b5e..7ee3fb2f07 100644 --- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php +++ b/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php @@ -1,10 +1,6 @@ buildSideNavView()->getMenu(); } - } diff --git a/src/applications/conduit/controller/PhabricatorConduitLogController.php b/src/applications/conduit/controller/PhabricatorConduitLogController.php index 60597e5aef..07c48dd2f5 100644 --- a/src/applications/conduit/controller/PhabricatorConduitLogController.php +++ b/src/applications/conduit/controller/PhabricatorConduitLogController.php @@ -1,8 +1,5 @@ pht('Certificate Install Token'), )); } + } diff --git a/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php index 351d9b4a8c..db341da764 100644 --- a/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php +++ b/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php @@ -1,8 +1,5 @@ getValue('client'); $client_version = (int)$request->getValue('clientVersion'); $client_description = (string)$request->getValue('clientDescription'); @@ -109,9 +105,7 @@ final class ConduitAPI_conduit_connect_Method extends ConduitAPIMethod { $token = $request->getValue('authToken'); $signature = $request->getValue('authSignature'); - $user = id(new PhabricatorUser())->loadOneWhere( - 'username = %s', - $username); + $user = id(new PhabricatorUser())->loadOneWhere('username = %s', $username); if (!$user) { throw new ConduitException('ERR-INVALID-USER'); } diff --git a/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php index d8db634c5b..e03bed8c07 100644 --- a/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php +++ b/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php @@ -1,8 +1,5 @@ getUser(), diff --git a/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php b/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php index d05b3cd1a8..1131c23884 100644 --- a/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php +++ b/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php @@ -1,8 +1,5 @@ result = $result; return $this; } + public function getResult() { return $this->result; } @@ -21,6 +19,7 @@ final class ConduitAPIResponse { $this->errorCode = $error_code; return $this; } + public function getErrorCode() { return $this->errorCode; } @@ -40,4 +39,5 @@ final class ConduitAPIResponse { 'error_info' => $this->getErrorInfo(), ); } + } diff --git a/src/applications/conduit/protocol/ConduitException.php b/src/applications/conduit/protocol/ConduitException.php index c916216df0..754889a494 100644 --- a/src/applications/conduit/protocol/ConduitException.php +++ b/src/applications/conduit/protocol/ConduitException.php @@ -1,8 +1,5 @@ getValue('participantPHIDs', array()); $message = $request->getValue('message'); $title = $request->getValue('title'); @@ -60,6 +56,8 @@ final class ConduitAPI_conpherence_createthread_Method return array( 'conpherenceID' => $conpherence->getID(), 'conpherencePHID' => $conpherence->getPHID(), - 'conpherenceURI' => $this->getConpherenceURI($conpherence)); + 'conpherenceURI' => $this->getConpherenceURI($conpherence), + ); } + } diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php b/src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php index be04ce07d6..9f69d031bb 100644 --- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php +++ b/src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php @@ -1,12 +1,8 @@ $rendered_transactions, 'latest_transaction_id' => $latest_transaction_id, - 'oldest_transaction_id' => $oldest_transaction_id + 'oldest_transaction_id' => $oldest_transaction_id, ); - } + } diff --git a/src/applications/conpherence/controller/ConpherenceListController.php b/src/applications/conpherence/controller/ConpherenceListController.php index 285015f005..0cf678ff67 100644 --- a/src/applications/conpherence/controller/ConpherenceListController.php +++ b/src/applications/conpherence/controller/ConpherenceListController.php @@ -1,10 +1,6 @@ $scroll_up_participant, 'scroll_down_participant' => $scroll_down_participant, - 'participation' => $participation); + 'participation' => $participation, + ); } private function loadConpherenceThreadData($participation) { diff --git a/src/applications/conpherence/controller/ConpherenceNewController.php b/src/applications/conpherence/controller/ConpherenceNewController.php index b2a3cdd4a7..f224de2a13 100644 --- a/src/applications/conpherence/controller/ConpherenceNewController.php +++ b/src/applications/conpherence/controller/ConpherenceNewController.php @@ -1,8 +1,5 @@ setDialog($dialog); } + } diff --git a/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php b/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php index 50ea0359e5..6201b04b21 100644 --- a/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php +++ b/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php @@ -1,13 +1,9 @@ getRequest(); $user = $request->getUser(); $conpherences = array(); @@ -108,4 +104,5 @@ final class ConpherenceNotificationPanelController return id(new AphrontAjaxResponse())->setContent($json); } + } diff --git a/src/applications/conpherence/controller/ConpherenceWidgetController.php b/src/applications/conpherence/controller/ConpherenceWidgetController.php index 8136ccba13..10c53b73cd 100644 --- a/src/applications/conpherence/controller/ConpherenceWidgetController.php +++ b/src/applications/conpherence/controller/ConpherenceWidgetController.php @@ -1,10 +1,6 @@ userPreferences = $pref; return $this; } + public function getUserPreferences() { return $this->userPreferences; } @@ -22,6 +19,7 @@ final class ConpherenceWidgetController extends $this->conpherence = $conpherence; return $this; } + public function getConpherence() { return $this->conpherence; } @@ -30,6 +28,7 @@ final class ConpherenceWidgetController extends $this->conpherenceID = $conpherence_id; return $this; } + public function getConpherenceID() { return $this->conpherenceID; } diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php index e1894c92ee..8389995b5c 100644 --- a/src/applications/conpherence/editor/ConpherenceEditor.php +++ b/src/applications/conpherence/editor/ConpherenceEditor.php @@ -1,8 +1,5 @@ withParticipantPHIDs(array($my_phid)) * ->withParticipationStatus(ConpherenceParticipationStatus::BEHIND) * ->execute(); - * - * @group conpherence */ final class ConpherenceParticipantCountQuery extends PhabricatorOffsetPagedQuery { @@ -65,7 +63,6 @@ final class ConpherenceParticipantCountQuery } private function buildGroupByClause(AphrontDatabaseConnection $conn_r) { - $group_by = qsprintf( $conn_r, 'GROUP BY participantPHID'); diff --git a/src/applications/conpherence/query/ConpherenceParticipantQuery.php b/src/applications/conpherence/query/ConpherenceParticipantQuery.php index b755a30388..f9c31deed6 100644 --- a/src/applications/conpherence/query/ConpherenceParticipantQuery.php +++ b/src/applications/conpherence/query/ConpherenceParticipantQuery.php @@ -30,11 +30,8 @@ * * For counts of read, un-read, or all conpherences by participant, see * @{class:ConpherenceParticipantCountQuery}. - * - * @group conpherence */ -final class ConpherenceParticipantQuery - extends PhabricatorOffsetPagedQuery { +final class ConpherenceParticipantQuery extends PhabricatorOffsetPagedQuery { const LIMIT = 100; const ORDER_NEWER = 'newer'; @@ -116,7 +113,6 @@ final class ConpherenceParticipantQuery } private function buildOrderClause(AphrontDatabaseConnection $conn_r) { - $order_word = ($this->order == self::ORDER_OLDER) ? 'DESC' : 'ASC'; // if these are different direction we won't get as efficient a query // see http://dev.mysql.com/doc/refman/5.5/en/order-by-optimization.html diff --git a/src/applications/conpherence/query/ConpherenceThreadQuery.php b/src/applications/conpherence/query/ConpherenceThreadQuery.php index 984efa5ba3..239b7245e4 100644 --- a/src/applications/conpherence/query/ConpherenceThreadQuery.php +++ b/src/applications/conpherence/query/ConpherenceThreadQuery.php @@ -1,8 +1,5 @@ handles = $handles; return $this; } + public function getHandles() { return $this->handles; } @@ -27,6 +25,7 @@ final class ConpherenceTransactionView extends AphrontView { $this->conpherenceTransaction = $tx; return $this; } + private function getConpherenceTransaction() { return $this->conpherenceTransaction; } @@ -99,4 +98,5 @@ final class ConpherenceTransactionView extends AphrontView { return $transaction_view->render(); } + } diff --git a/src/applications/conpherence/view/ConpherenceWidgetView.php b/src/applications/conpherence/view/ConpherenceWidgetView.php index 010ad5ba19..b3e704dcd9 100644 --- a/src/applications/conpherence/view/ConpherenceWidgetView.php +++ b/src/applications/conpherence/view/ConpherenceWidgetView.php @@ -1,8 +1,5 @@ conpherence; } + } diff --git a/src/applications/countdown/controller/PhabricatorCountdownController.php b/src/applications/countdown/controller/PhabricatorCountdownController.php index f1a5f09968..c16f143bb3 100644 --- a/src/applications/countdown/controller/PhabricatorCountdownController.php +++ b/src/applications/countdown/controller/PhabricatorCountdownController.php @@ -1,8 +1,5 @@ getRequest(); $user = $request->getUser(); diff --git a/src/applications/countdown/controller/PhabricatorCountdownEditController.php b/src/applications/countdown/controller/PhabricatorCountdownEditController.php index 07cba1f472..76c813490d 100644 --- a/src/applications/countdown/controller/PhabricatorCountdownEditController.php +++ b/src/applications/countdown/controller/PhabricatorCountdownEditController.php @@ -1,8 +1,5 @@ $page_title, )); } + } diff --git a/src/applications/countdown/query/PhabricatorCountdownQuery.php b/src/applications/countdown/query/PhabricatorCountdownQuery.php index 6d82fe268b..ed05648d02 100644 --- a/src/applications/countdown/query/PhabricatorCountdownQuery.php +++ b/src/applications/countdown/query/PhabricatorCountdownQuery.php @@ -1,8 +1,5 @@ loadAllFromArray($data); - return $countdowns; } diff --git a/src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php b/src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php index 3134a9d40d..e615a63fde 100644 --- a/src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php +++ b/src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php @@ -1,8 +1,5 @@ loadOneWhere( 'diffID = %d AND name = %s', diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php index eded1991e6..6d1223c195 100644 --- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php +++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php @@ -146,7 +146,7 @@ final class PhabricatorDifferentialConfigOptions ->setSummary(pht('Allows users to accept their own revisions.')) ->setDescription( pht( - "If you set this to true, users can accept their own revisions. ". + "If you set this to true, users can accept their own revisions. ". "This action is disabled by default because it's most likely not ". "a behavior you want, but it proves useful if you are working ". "alone on a project and want to make use of all of ". @@ -186,9 +186,9 @@ final class PhabricatorDifferentialConfigOptions ->setSummary(pht('Allows any user to reopen a closed revision.')) ->setDescription( pht('If you set this to true, any user can reopen a revision so '. - 'long as it has been closed. This can be useful if a revision '. + 'long as it has been closed. This can be useful if a revision '. 'is accidentally closed or if a developer changes his or her '. - 'mind after closing a revision. If it is false, reopening '. + 'mind after closing a revision. If it is false, reopening '. 'is not allowed.')), $this->newOption('differential.close-on-accept', 'bool', false) ->setBoolOptions( diff --git a/src/applications/differential/parser/DifferentialChangesetParser.php b/src/applications/differential/parser/DifferentialChangesetParser.php index 7b9bc23397..db9604a779 100644 --- a/src/applications/differential/parser/DifferentialChangesetParser.php +++ b/src/applications/differential/parser/DifferentialChangesetParser.php @@ -598,7 +598,7 @@ final class DifferentialChangesetParser { if ($changetype == DifferentialChangeType::TYPE_MOVE_AWAY) { // sometimes we show moved files as unchanged, sometimes deleted, // and sometimes inconsistent with what actually happened at the - // destination of the move. Rather than make a false claim, + // destination of the move. Rather than make a false claim, // omit the 'not changed' notice if this is the source of a move $unchanged = false; } diff --git a/src/applications/differential/remarkup/DifferentialRemarkupRule.php b/src/applications/differential/remarkup/DifferentialRemarkupRule.php index 1535463a29..9fe9e4fdd6 100644 --- a/src/applications/differential/remarkup/DifferentialRemarkupRule.php +++ b/src/applications/differential/remarkup/DifferentialRemarkupRule.php @@ -1,10 +1,6 @@ false, ) + parent::getConfiguration(); } + } diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php index cdae68c5d6..3db8cbeaf9 100644 --- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php +++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php @@ -1,10 +1,6 @@ pht('VCS is not supported for this method.')); } + /** * Subclasses should override this to specify custom error types. */ @@ -61,6 +59,7 @@ abstract class ConduitAPI_diffusion_abstractquery_Method 'branch' => 'optional string', ); } + /** * Subclasses should override this to specify custom param types. */ @@ -129,4 +128,5 @@ abstract class ConduitAPI_diffusion_abstractquery_Method } return $result; } + } diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php index 35fadde7f6..ddd1ad7e95 100644 --- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php +++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php @@ -1,8 +1,5 @@ setTextList($text_list); return $file_content->toDictionary(); } + } diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php index 51462659af..c9556f6f5b 100644 --- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php +++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php @@ -1,8 +1,5 @@ getValue('commits'); diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php index 1e11ef114b..0321bfe9e2 100644 --- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php +++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php @@ -1,8 +1,5 @@ mpull($path_changes, 'toDictionary'), - 'parents' => $this->parents); + 'parents' => $this->parents, + ); } protected function getGitResult(ConduitAPIRequest $request) { diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php index 92af65a3d8..df208a2d05 100644 --- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php +++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php @@ -1,10 +1,7 @@ execx('mkdir %s', $full_path); } else { - // Windows is terrible. The mkdir command doesn't even support putting - // the path in quotes. IN QUOTES. ARGUHRGHUGHHGG!! Do some terribly + // Windows is terrible. The mkdir command doesn't even support putting + // the path in quotes. IN QUOTES. ARGUHRGHUGHHGG!! Do some terribly // inaccurate sanity checking since we can't safely escape the path. if (preg_match('/^[A-Z]\\:\\\\[a-zA-Z0-9\\\\\\ ]/', $full_path) === 0) { throw new Exception( diff --git a/src/applications/feed/conduit/ConduitAPI_feed_Method.php b/src/applications/feed/conduit/ConduitAPI_feed_Method.php index 0f4c86263f..a0afd09715 100644 --- a/src/applications/feed/conduit/ConduitAPI_feed_Method.php +++ b/src/applications/feed/conduit/ConduitAPI_feed_Method.php @@ -1,8 +1,5 @@ - 'Unsupported view type, possibles are: '.$view_types + 'Unsupported view type, possibles are: '.$view_types, ); } @@ -53,7 +49,6 @@ final class ConduitAPI_feed_query_Method } protected function execute(ConduitAPIRequest $request) { - $results = array(); $user = $request->getUser(); diff --git a/src/applications/files/conduit/ConduitAPI_file_Method.php b/src/applications/files/conduit/ConduitAPI_file_Method.php index 0c003dd730..45f525221d 100644 --- a/src/applications/files/conduit/ConduitAPI_file_Method.php +++ b/src/applications/files/conduit/ConduitAPI_file_Method.php @@ -1,8 +1,5 @@ 'image/jpeg', 'image/jpg' => 'image/jpg', diff --git a/src/applications/files/controller/PhabricatorFileCommentController.php b/src/applications/files/controller/PhabricatorFileCommentController.php index 1895f6c75d..16e6e3f3a9 100644 --- a/src/applications/files/controller/PhabricatorFileCommentController.php +++ b/src/applications/files/controller/PhabricatorFileCommentController.php @@ -1,10 +1,6 @@ getLocalDiskFileStorageRoot(); // Generate a random, unique file path like "ab/29/1f918a9ac39201ff". We diff --git a/src/applications/files/engine/PhabricatorMySQLFileStorageEngine.php b/src/applications/files/engine/PhabricatorMySQLFileStorageEngine.php index 77a46a9703..cd86170f66 100644 --- a/src/applications/files/engine/PhabricatorMySQLFileStorageEngine.php +++ b/src/applications/files/engine/PhabricatorMySQLFileStorageEngine.php @@ -9,7 +9,6 @@ * * @task impl Implementation * @task internal Internals - * @group filestorage */ final class PhabricatorMySQLFileStorageEngine extends PhabricatorFileStorageEngine { diff --git a/src/applications/files/engine/PhabricatorTestStorageEngine.php b/src/applications/files/engine/PhabricatorTestStorageEngine.php index 0dc2c8757b..04398016dd 100644 --- a/src/applications/files/engine/PhabricatorTestStorageEngine.php +++ b/src/applications/files/engine/PhabricatorTestStorageEngine.php @@ -2,8 +2,6 @@ /** * Test storage engine. Does not actually store files. Used for unit tests. - * - * @group filestorage */ final class PhabricatorTestStorageEngine extends PhabricatorFileStorageEngine { diff --git a/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php b/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php index a83261fa60..7d30a5f640 100644 --- a/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php +++ b/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php @@ -4,8 +4,6 @@ * Default storage engine selector. See * @{class:PhabricatorFileStorageEngineSelector} and @{article:File Storage * Technical Documentation} for more information. - * - * @group filestorage */ final class PhabricatorDefaultFileStorageEngineSelector extends PhabricatorFileStorageEngineSelector { diff --git a/src/applications/files/engineselector/PhabricatorFileStorageEngineSelector.php b/src/applications/files/engineselector/PhabricatorFileStorageEngineSelector.php index 7c42f4647a..3785b724f1 100644 --- a/src/applications/files/engineselector/PhabricatorFileStorageEngineSelector.php +++ b/src/applications/files/engineselector/PhabricatorFileStorageEngineSelector.php @@ -6,7 +6,6 @@ * of suitable @{class:PhabricatorFileStorageEngine}s. For more information, * see @{article:File Storage Technical Documentation}. * - * @group filestorage * @task select Selecting Storage Engines */ abstract class PhabricatorFileStorageEngineSelector { diff --git a/src/applications/files/exception/PhabricatorFileStorageConfigurationException.php b/src/applications/files/exception/PhabricatorFileStorageConfigurationException.php index a561dfb06c..ec81bc3f22 100644 --- a/src/applications/files/exception/PhabricatorFileStorageConfigurationException.php +++ b/src/applications/files/exception/PhabricatorFileStorageConfigurationException.php @@ -4,9 +4,5 @@ * Thrown by storage engines to indicate an configuration error which should * abort the storage attempt, as opposed to a transient storage error which * should be retried on other engines. - * - * @group files */ -final class PhabricatorFileStorageConfigurationException extends Exception { - -} +final class PhabricatorFileStorageConfigurationException extends Exception {} diff --git a/src/applications/files/mail/FileCreateMailReceiver.php b/src/applications/files/mail/FileCreateMailReceiver.php index fb11b7ba63..955c4db547 100644 --- a/src/applications/files/mail/FileCreateMailReceiver.php +++ b/src/applications/files/mail/FileCreateMailReceiver.php @@ -1,10 +1,6 @@ getID(); - } } diff --git a/src/applications/files/query/PhabricatorFileQuery.php b/src/applications/files/query/PhabricatorFileQuery.php index f3243fe1fa..f4af58646f 100644 --- a/src/applications/files/query/PhabricatorFileQuery.php +++ b/src/applications/files/query/PhabricatorFileQuery.php @@ -1,8 +1,5 @@ loadOneWhere( 'contentHash = %s LIMIT 1', $hash); @@ -413,7 +409,6 @@ final class PhabricatorFile extends PhabricatorFileDAO } public function delete() { - // We want to delete all the rows which mark this file as the transformation // of some other file (since we're getting rid of it). We also delete all // the transformations of this file, so that a user who deletes an image @@ -587,7 +582,6 @@ final class PhabricatorFile extends PhabricatorFileDAO } public function isTransformableImage() { - // NOTE: The way the 'gd' extension works in PHP is that you can install it // with support for only some file types, so it might be able to handle // PNG but not JPEG. Try to generate thumbnails for whatever we can. Setup diff --git a/src/applications/files/storage/PhabricatorFileDAO.php b/src/applications/files/storage/PhabricatorFileDAO.php index b8999a7122..e8a49b7a46 100644 --- a/src/applications/files/storage/PhabricatorFileDAO.php +++ b/src/applications/files/storage/PhabricatorFileDAO.php @@ -1,8 +1,5 @@ getTransactionPHID() != null); } + } diff --git a/src/applications/files/storage/PhabricatorTransformedFile.php b/src/applications/files/storage/PhabricatorTransformedFile.php index cc28210efa..e77f1ddffb 100644 --- a/src/applications/files/storage/PhabricatorTransformedFile.php +++ b/src/applications/files/storage/PhabricatorTransformedFile.php @@ -1,8 +1,5 @@ assertTrue($first_handle != $second_handle); } - public function testFileStorageUploadSameFile() { $engine = new PhabricatorTestStorageEngine(); diff --git a/src/applications/flag/conduit/ConduitAPI_flag_Method.php b/src/applications/flag/conduit/ConduitAPI_flag_Method.php index 177d057e45..f37c9c5b4d 100644 --- a/src/applications/flag/conduit/ConduitAPI_flag_Method.php +++ b/src/applications/flag/conduit/ConduitAPI_flag_Method.php @@ -1,8 +1,5 @@ setViewer($request->getUser()); diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php index 45dad6f344..49f91d8690 100644 --- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php +++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php @@ -106,7 +106,7 @@ final class HarbormasterPlanViewController try { $implementation = $step->getStepImplementation(); } catch (Exception $ex) { - // We can't initialize the implementation. This might be because + // We can't initialize the implementation. This might be because // it's been renamed or no longer exists. $item = id(new PHUIObjectItemView()) ->setObjectName(pht('Step %d', $i++)) diff --git a/src/applications/harbormaster/query/HarbormasterBuildTransactionQuery.php b/src/applications/harbormaster/query/HarbormasterBuildTransactionQuery.php index ede890bc3a..2d697f1ad2 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildTransactionQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildTransactionQuery.php @@ -1,8 +1,5 @@ self::CHUNK_BYTE_LIMIT) { @@ -85,7 +85,7 @@ final class HarbormasterBuildLog extends HarbormasterDAO return; } - // Retrieve the size of last chunk from the DB for this log. If the + // Retrieve the size of last chunk from the DB for this log. If the // chunk is over 500K, then we need to create a new log entry. $conn = $this->establishConnection('w'); $result = queryfx_all( @@ -142,7 +142,7 @@ final class HarbormasterBuildLog extends HarbormasterDAO public function getLogText() { // TODO: This won't cope very well if we're pulling like a 700MB - // log file out of the DB. We should probably implement some sort + // log file out of the DB. We should probably implement some sort // of optional limit parameter so that when we're rendering out only // 25 lines in the UI, we don't wastefully read in the whole log. diff --git a/src/applications/herald/adapter/HeraldCommitAdapter.php b/src/applications/herald/adapter/HeraldCommitAdapter.php index a3507db90b..db723d68ba 100644 --- a/src/applications/herald/adapter/HeraldCommitAdapter.php +++ b/src/applications/herald/adapter/HeraldCommitAdapter.php @@ -1,8 +1,5 @@ getID(); } - } diff --git a/src/applications/legalpad/storage/LegalpadTransaction.php b/src/applications/legalpad/storage/LegalpadTransaction.php index 164e9e31dc..1cd4a1dcb0 100644 --- a/src/applications/legalpad/storage/LegalpadTransaction.php +++ b/src/applications/legalpad/storage/LegalpadTransaction.php @@ -1,8 +1,5 @@ getTransactionPHID() != null); } + } diff --git a/src/applications/legalpad/view/LegalpadTransactionView.php b/src/applications/legalpad/view/LegalpadTransactionView.php index 73d2418939..a68619c000 100644 --- a/src/applications/legalpad/view/LegalpadTransactionView.php +++ b/src/applications/legalpad/view/LegalpadTransactionView.php @@ -1,9 +1,4 @@ pht('(No Filtering)'), '-2' => pht('(Marked With Any Flag)'), diff --git a/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php b/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php index 1c9ba594d6..4a0ddae147 100644 --- a/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php +++ b/src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php @@ -1,10 +1,6 @@ getValue('ownerPHID'); if ($owner_phid !== null) { - $this->validatePHIDList(array($owner_phid), - PhabricatorPeoplePHIDTypeUser::TYPECONST, - 'ownerPHID'); + $this->validatePHIDList( + array($owner_phid), + PhabricatorPeoplePHIDTypeUser::TYPECONST, + 'ownerPHID'); $changes[ManiphestTransaction::TYPE_OWNER] = $owner_phid; } $ccs = $request->getValue('ccPHIDs'); if ($ccs !== null) { - $this->validatePHIDList($ccs, - PhabricatorPeoplePHIDTypeUser::TYPECONST, - 'ccPHIDS'); + $this->validatePHIDList( + $ccs, + PhabricatorPeoplePHIDTypeUser::TYPECONST, + 'ccPHIDS'); $changes[ManiphestTransaction::TYPE_CCS] = $ccs; } $project_phids = $request->getValue('projectPHIDs'); if ($project_phids !== null) { - $this->validatePHIDList($project_phids, - PhabricatorProjectPHIDTypeProject::TYPECONST, - 'projectPHIDS'); + $this->validatePHIDList( + $project_phids, + PhabricatorProjectPHIDTypeProject::TYPECONST, + 'projectPHIDS'); $changes[ManiphestTransaction::TYPE_PROJECTS] = $project_phids; } @@ -207,7 +207,6 @@ abstract class ConduitAPI_maniphest_Method extends ConduitAPIMethod { $event->setUser($request->getUser()); $event->setConduitRequest($request); PhutilEventEngine::dispatchEvent($event); - } protected function buildTaskInfoDictionaries(array $tasks) { diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php index 6771301321..3eaf5fa214 100644 --- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php +++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php @@ -1,8 +1,5 @@ requireApplicationCapability( ManiphestCapabilityBulkEdit::CAPABILITY); diff --git a/src/applications/maniphest/controller/ManiphestExportController.php b/src/applications/maniphest/controller/ManiphestExportController.php index f30b5cb930..9c84c39491 100644 --- a/src/applications/maniphest/controller/ManiphestExportController.php +++ b/src/applications/maniphest/controller/ManiphestExportController.php @@ -1,8 +1,5 @@ setContent($content); } + } diff --git a/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php b/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php index 776f802447..75f75c49bc 100644 --- a/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php +++ b/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php @@ -1,8 +1,5 @@ setContent($body)); $xactions[] = $xaction; } - } $ccs = $mail->loadCCPHIDs(); @@ -184,7 +179,6 @@ final class ManiphestReplyHandler extends PhabricatorMailReplyHandler { )); $event->setUser($user); PhutilEventEngine::dispatchEvent($event); - } } diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php index a890926822..1b29705493 100644 --- a/src/applications/maniphest/query/ManiphestTaskQuery.php +++ b/src/applications/maniphest/query/ManiphestTaskQuery.php @@ -3,11 +3,8 @@ /** * Query tasks by specific criteria. This class uses the higher-performance * but less-general Maniphest indexes to satisfy queries. - * - * @group maniphest */ -final class ManiphestTaskQuery - extends PhabricatorCursorPagedPolicyAwareQuery { +final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery { private $taskIDs = array(); private $taskPHIDs = array(); @@ -182,7 +179,6 @@ final class ManiphestTaskQuery } public function loadPage() { - // TODO: (T603) It is possible for a user to find the PHID of a project // they can't see, then query for tasks in that project and deduce the // identity of unknown/invisible projects. Before we allow the user to @@ -358,7 +354,6 @@ final class ManiphestTaskQuery } private function buildStatusWhereClause(AphrontDatabaseConnection $conn) { - static $map = array( self::STATUS_RESOLVED => ManiphestTaskStatus::STATUS_CLOSED_RESOLVED, self::STATUS_WONTFIX => ManiphestTaskStatus::STATUS_CLOSED_WONTFIX, @@ -413,7 +408,6 @@ final class ManiphestTaskQuery return null; } - private function buildAuthorWhereClause(AphrontDatabaseConnection $conn) { if (!$this->authorPHIDs) { return null; @@ -941,7 +935,6 @@ final class ManiphestTaskQuery return 'task.phid'; } - public function getQueryApplicationClass() { return 'PhabricatorApplicationManiphest'; } diff --git a/src/applications/maniphest/remarkup/ManiphestRemarkupRule.php b/src/applications/maniphest/remarkup/ManiphestRemarkupRule.php index e3bb9200a4..be3921cc5d 100644 --- a/src/applications/maniphest/remarkup/ManiphestRemarkupRule.php +++ b/src/applications/maniphest/remarkup/ManiphestRemarkupRule.php @@ -1,10 +1,6 @@ assertEmail($expect, true, true); } - public function testBodyRenderNoHerald() { $expect = <<assertEqual($expect, $body->render()); } - } diff --git a/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php b/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php index 38a58dbdc7..374ae7e4eb 100644 --- a/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php +++ b/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php @@ -1,8 +1,5 @@ error; } + public function setError($error) { // errors sometimes redirect to the client (302) but otherwise // the spec says all code 400 @@ -60,6 +58,7 @@ final class PhabricatorOAuthResponse extends AphrontResponse { private function getErrorDescription() { return $this->errorDescription; } + public function setErrorDescription($error_description) { $this->errorDescription = $error_description; return $this; @@ -104,4 +103,5 @@ final class PhabricatorOAuthResponse extends AphrontResponse { public function buildResponseString() { return $this->encodeJSONForHTTPResponse($this->buildResponseDict()); } + } diff --git a/src/applications/oauthserver/PhabricatorOAuthServer.php b/src/applications/oauthserver/PhabricatorOAuthServer.php index 2180e53967..a903c554f5 100644 --- a/src/applications/oauthserver/PhabricatorOAuthServer.php +++ b/src/applications/oauthserver/PhabricatorOAuthServer.php @@ -12,12 +12,12 @@ * For an OAuth 2.0 server, there are two main steps: * * 1) Authorization - the user authorizes a given client to access the data - * the OAuth 2.0 server protects. Once this is achieved / if it has + * the OAuth 2.0 server protects. Once this is achieved / if it has * been achived already, the OAuth server sends the client an authorization * code. * 2) Access Token - the client should send the authorization code received in * step 1 along with its id and secret to the OAuth server to receive an - * access token. This access token can later be used to access Phabricator + * access token. This access token can later be used to access Phabricator * data on behalf of the user. * * @task auth Authorizing @{class:PhabricatorOAuthServerClient}s and @@ -25,8 +25,6 @@ * @task token Validating @{class:PhabricatorOAuthServerAuthorizationCode}s * and generating @{class:PhabricatorOAuthServerAccessToken}s * @task internal Internals - * - * @group oauthserver */ final class PhabricatorOAuthServer { @@ -36,9 +34,6 @@ final class PhabricatorOAuthServer { private $user; private $client; - /** - * @group internal - */ private function getUser() { if (!$this->user) { throw new Exception('You must setUser before you can getUser!'); @@ -51,9 +46,6 @@ final class PhabricatorOAuthServer { return $this; } - /** - * @group internal - */ private function getClient() { if (!$this->client) { throw new Exception('You must setClient before you can getClient!'); diff --git a/src/applications/oauthserver/PhabricatorOAuthServerScope.php b/src/applications/oauthserver/PhabricatorOAuthServerScope.php index 7950237dd2..be3b066a6e 100644 --- a/src/applications/oauthserver/PhabricatorOAuthServerScope.php +++ b/src/applications/oauthserver/PhabricatorOAuthServerScope.php @@ -63,7 +63,7 @@ final class PhabricatorOAuthServerScope { /** * A scopes list is considered valid if each scope is a known scope - * and each scope is seen only once. Otherwise, the list is invalid. + * and each scope is seen only once. Otherwise, the list is invalid. */ static public function validateScopesList($scope_list) { $scopes = explode(' ', $scope_list); diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php index 79e5f79da0..11330447e6 100644 --- a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php +++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php @@ -1,10 +1,7 @@ 'optional string', 'path' => 'optional string', ); - } public function defineReturnType() { @@ -120,8 +115,7 @@ final class ConduitAPI_owners_query_Method $request->getValue('projectOwner')) ? 1 : 0; - $is_affiliated_query = $request->getValue('userAffiliated') ? - 1 : 0; + $is_affiliated_query = $request->getValue('userAffiliated') ? 1 : 0; $repo = $request->getValue('repositoryCallsign'); $path = $request->getValue('path'); @@ -155,4 +149,5 @@ final class ConduitAPI_owners_query_Method return self::buildPackageInformationDictionaries($packages); } + } diff --git a/src/applications/paste/conduit/ConduitAPI_paste_Method.php b/src/applications/paste/conduit/ConduitAPI_paste_Method.php index 4a5768b22f..0338cf6b7c 100644 --- a/src/applications/paste/conduit/ConduitAPI_paste_Method.php +++ b/src/applications/paste/conduit/ConduitAPI_paste_Method.php @@ -1,8 +1,5 @@ id = idx($data, 'id'); } - public function processRequest() { $request = $this->getRequest(); $user = $request->getUser(); diff --git a/src/applications/paste/mail/PasteCreateMailReceiver.php b/src/applications/paste/mail/PasteCreateMailReceiver.php index 5693a0e768..e75f9d9606 100644 --- a/src/applications/paste/mail/PasteCreateMailReceiver.php +++ b/src/applications/paste/mail/PasteCreateMailReceiver.php @@ -1,10 +1,6 @@ setRelatedPHID($paste->getPHID()) ->setBody($body->render()) ->saveAndSend(); - } } diff --git a/src/applications/paste/mail/PasteMockMailReceiver.php b/src/applications/paste/mail/PasteMockMailReceiver.php index bab2160abe..94f352ce39 100644 --- a/src/applications/paste/mail/PasteMockMailReceiver.php +++ b/src/applications/paste/mail/PasteMockMailReceiver.php @@ -1,8 +1,5 @@ getID(); - } } diff --git a/src/applications/paste/query/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php index a1b88d1102..934dc3d4ee 100644 --- a/src/applications/paste/query/PhabricatorPasteQuery.php +++ b/src/applications/paste/query/PhabricatorPasteQuery.php @@ -1,8 +1,5 @@ getLanguage(); $source = $paste->getRawContent(); @@ -255,7 +251,6 @@ final class PhabricatorPasteQuery } } - public function getQueryApplicationClass() { return 'PhabricatorApplicationPaste'; } diff --git a/src/applications/paste/query/PhabricatorPasteTransactionQuery.php b/src/applications/paste/query/PhabricatorPasteTransactionQuery.php index 5ea3db4422..b0e9b5bc47 100644 --- a/src/applications/paste/query/PhabricatorPasteTransactionQuery.php +++ b/src/applications/paste/query/PhabricatorPasteTransactionQuery.php @@ -1,8 +1,5 @@ getTransactionPHID() != null); } + } diff --git a/src/applications/people/conduit/ConduitAPI_user_disable_Method.php b/src/applications/people/conduit/ConduitAPI_user_disable_Method.php index cca8ae00c6..bf7a274baf 100644 --- a/src/applications/people/conduit/ConduitAPI_user_disable_Method.php +++ b/src/applications/people/conduit/ConduitAPI_user_disable_Method.php @@ -1,10 +1,6 @@ loadOneWhere( 'phid = %s', $request->getValue('phid')); diff --git a/src/applications/people/conduit/ConduitAPI_user_query_Method.php b/src/applications/people/conduit/ConduitAPI_user_query_Method.php index 1464dd0f82..51c7e90f22 100644 --- a/src/applications/people/conduit/ConduitAPI_user_query_Method.php +++ b/src/applications/people/conduit/ConduitAPI_user_query_Method.php @@ -1,17 +1,12 @@ 'optional list', 'emails' => 'optional list', @@ -80,4 +75,5 @@ final class ConduitAPI_user_query_Method } return $results; } + } diff --git a/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php b/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php index aaf0429705..17d7407e43 100644 --- a/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php +++ b/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php @@ -1,18 +1,13 @@ setViewer($request->getUser()); @@ -80,5 +75,4 @@ final class ConduitAPI_phame_query_Method extends ConduitAPI_phame_Method { return $results; } - } diff --git a/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php b/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php index 3df67eb188..ea3c88c2fd 100644 --- a/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php +++ b/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php @@ -1,8 +1,5 @@ setViewer($request->getUser()); @@ -105,5 +101,4 @@ final class ConduitAPI_phame_queryposts_Method extends ConduitAPI_phame_Method { return $results; } - } diff --git a/src/applications/phame/controller/PhameResourceController.php b/src/applications/phame/controller/PhameResourceController.php index f63c3d765c..ad41ecda74 100644 --- a/src/applications/phame/controller/PhameResourceController.php +++ b/src/applications/phame/controller/PhameResourceController.php @@ -1,8 +1,5 @@ setDialog($dialog); } + } diff --git a/src/applications/phame/controller/blog/PhameBlogFeedController.php b/src/applications/phame/controller/blog/PhameBlogFeedController.php index c855932ab5..d239650638 100644 --- a/src/applications/phame/controller/blog/PhameBlogFeedController.php +++ b/src/applications/phame/controller/blog/PhameBlogFeedController.php @@ -1,8 +1,5 @@ setObject($blog) ->setObjectURI($this->getRequest()->getRequestURI()) diff --git a/src/applications/phame/controller/post/PhamePostDeleteController.php b/src/applications/phame/controller/post/PhamePostDeleteController.php index 8faa715a5e..a02c0e1cff 100644 --- a/src/applications/phame/controller/post/PhamePostDeleteController.php +++ b/src/applications/phame/controller/post/PhamePostDeleteController.php @@ -1,8 +1,5 @@ setDialog($dialog); } + } diff --git a/src/applications/phame/controller/post/PhamePostEditController.php b/src/applications/phame/controller/post/PhamePostEditController.php index ee407d5d47..165ec3894a 100644 --- a/src/applications/phame/controller/post/PhamePostEditController.php +++ b/src/applications/phame/controller/post/PhamePostEditController.php @@ -1,10 +1,6 @@ setFrameable(true); return $response; } + } diff --git a/src/applications/phame/controller/post/PhamePostListController.php b/src/applications/phame/controller/post/PhamePostListController.php index c7628742bd..d04436a02d 100644 --- a/src/applications/phame/controller/post/PhamePostListController.php +++ b/src/applications/phame/controller/post/PhamePostListController.php @@ -1,8 +1,5 @@ $title, )); } + } diff --git a/src/applications/phame/controller/post/PhamePostNotLiveController.php b/src/applications/phame/controller/post/PhamePostNotLiveController.php index 885bc3b1a9..8cfddb8436 100644 --- a/src/applications/phame/controller/post/PhamePostNotLiveController.php +++ b/src/applications/phame/controller/post/PhamePostNotLiveController.php @@ -1,8 +1,5 @@ getViewURI(); return id(new AphrontRedirectResponse())->setURI($live_uri); } + } diff --git a/src/applications/phame/controller/post/PhamePostPreviewController.php b/src/applications/phame/controller/post/PhamePostPreviewController.php index 8353b98d72..5b87ec680b 100644 --- a/src/applications/phame/controller/post/PhamePostPreviewController.php +++ b/src/applications/phame/controller/post/PhamePostPreviewController.php @@ -1,10 +1,6 @@ setContent($content); } + } diff --git a/src/applications/phame/controller/post/PhamePostPublishController.php b/src/applications/phame/controller/post/PhamePostPublishController.php index 78131df28f..fcc7b29dc8 100644 --- a/src/applications/phame/controller/post/PhamePostPublishController.php +++ b/src/applications/phame/controller/post/PhamePostPublishController.php @@ -1,8 +1,5 @@ setDialog($dialog); } + } diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php index b87cc28493..7c12ba5565 100644 --- a/src/applications/phame/controller/post/PhamePostViewController.php +++ b/src/applications/phame/controller/post/PhamePostViewController.php @@ -1,8 +1,5 @@ getValue('phid'); $handle = id(new PhabricatorHandleQuery()) diff --git a/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php b/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php index 9e09fc1534..e9bc6a5e1b 100644 --- a/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php +++ b/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php @@ -1,10 +1,6 @@ getValue('phids'); $handles = id(new PhabricatorHandleQuery()) diff --git a/src/applications/phid/handle/view/render.php b/src/applications/phid/handle/view/render.php index d2197d1d6f..49d18f95fe 100644 --- a/src/applications/phid/handle/view/render.php +++ b/src/applications/phid/handle/view/render.php @@ -4,7 +4,6 @@ * Implodes selected handles from a pool of handles. Useful if you load handles * for various phids, but only render a few of them at a time. * - * @group handle * @return PhutilSafeHTML */ function implode_selected_handle_links($glue, array $handles, array $phids) { diff --git a/src/applications/pholio/config/PhabricatorPholioConfigOptions.php b/src/applications/pholio/config/PhabricatorPholioConfigOptions.php index 1f31095c70..67cd29d853 100644 --- a/src/applications/pholio/config/PhabricatorPholioConfigOptions.php +++ b/src/applications/pholio/config/PhabricatorPholioConfigOptions.php @@ -1,8 +1,5 @@ buildSideNavView(true)->getMenu(); } - - } diff --git a/src/applications/pholio/controller/PholioImageUploadController.php b/src/applications/pholio/controller/PholioImageUploadController.php index f24c7adb7d..530563dc8f 100644 --- a/src/applications/pholio/controller/PholioImageUploadController.php +++ b/src/applications/pholio/controller/PholioImageUploadController.php @@ -1,8 +1,5 @@ getTransactionPHID() != null); } + } diff --git a/src/applications/pholio/view/PholioMockEmbedView.php b/src/applications/pholio/view/PholioMockEmbedView.php index 10241ad5f6..146127fad3 100644 --- a/src/applications/pholio/view/PholioMockEmbedView.php +++ b/src/applications/pholio/view/PholioMockEmbedView.php @@ -1,8 +1,5 @@ getLatestVersion()->getFilePHID(); if ($file_phid !== null) { // If the file PHID is present, then this is a new file that - // we know about, but the caller does not. We need to tell + // we know about, but the caller does not. We need to tell // the caller to create the file. $hash_current = $files[$file_phid]->getContentHash(); $patches[] = array( diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php b/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php index 7d5f6cff59..96a33a7704 100644 --- a/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php +++ b/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php @@ -1,8 +1,5 @@ appendChild(phutil_tag('p', array(), pht( 'Because Phragment generates files (such as ZIP archives and '. 'patches) as they are requested, it requires that you configure '. - 'the `security.alterate-file-domain` option. This option on it\'s '. + 'the `security.alterate-file-domain` option. This option on it\'s '. 'own will also provide additional security when serving files '. 'across Phabricator.'))); } @@ -219,7 +219,7 @@ abstract class PhragmentController extends PhabricatorController { /** * We use this to disable the download links if the alternate domain is - * not configured correctly. Although the download links will mostly work + * not configured correctly. Although the download links will mostly work * for logged in users without an alternate domain, the behaviour is * reasonably non-consistent and will deny public users, even if policies * are configured otherwise (because the Files app does not support showing diff --git a/src/applications/phragment/controller/PhragmentRevertController.php b/src/applications/phragment/controller/PhragmentRevertController.php index ccf5d3299e..9b13a79277 100644 --- a/src/applications/phragment/controller/PhragmentRevertController.php +++ b/src/applications/phragment/controller/PhragmentRevertController.php @@ -78,7 +78,7 @@ final class PhragmentRevertController extends PhragmentController { ->addCancelButton(pht('Cancel')) ->appendParagraph(pht( 'Reverting this fragment to version %d will create a new version of '. - 'the fragment. It will not delete any version history.', + 'the fragment. It will not delete any version history.', $version->getSequence(), $version->getSequence())); return id(new AphrontDialogResponse())->setDialog($dialog); diff --git a/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php b/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php index 4c94e5d284..d9958195b7 100644 --- a/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php +++ b/src/applications/phragment/controller/PhragmentSnapshotDeleteController.php @@ -45,7 +45,7 @@ final class PhragmentSnapshotDeleteController extends PhragmentController { ->addSubmitButton(pht('Delete')) ->addCancelButton(pht('Cancel')) ->appendParagraph(pht( - 'Deleting this snapshot is a permanent operation. You can not '. + 'Deleting this snapshot is a permanent operation. You can not '. 'recover the state of the snapshot.')); return id(new AphrontDialogResponse())->setDialog($dialog); } diff --git a/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php b/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php index fe08f9901c..fa0b40d8c5 100644 --- a/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php +++ b/src/applications/phragment/controller/PhragmentSnapshotPromoteController.php @@ -130,7 +130,7 @@ final class PhragmentSnapshotPromoteController extends PhragmentController { ->save(); } } else { - // The user is promoting the snapshot to another snapshot. We just + // The user is promoting the snapshot to another snapshot. We just // copy the other snapshot's child entries and change the snapshot // PHID to make it identical. $children = id(new PhragmentSnapshotChildQuery()) diff --git a/src/applications/phragment/storage/PhragmentFragment.php b/src/applications/phragment/storage/PhragmentFragment.php index 49e49713e4..e4480b64ed 100644 --- a/src/applications/phragment/storage/PhragmentFragment.php +++ b/src/applications/phragment/storage/PhragmentFragment.php @@ -158,7 +158,7 @@ final class PhragmentFragment extends PhragmentDAO $path = trim($zip->getNameIndex($i), '/'); $stream = $zip->getStream($path); $data = null; - // If the stream is false, then it is a directory entry. We leave + // If the stream is false, then it is a directory entry. We leave // $data set to null for directories so we know not to create a // version entry for them. if ($stream !== false) { @@ -169,7 +169,7 @@ final class PhragmentFragment extends PhragmentDAO } // We need to detect any directories that are in the ZIP folder that - // aren't explicitly noted in the ZIP. This can happen if the file + // aren't explicitly noted in the ZIP. This can happen if the file // entries in the ZIP look like: // // * something/blah.png @@ -204,7 +204,7 @@ final class PhragmentFragment extends PhragmentDAO } // FIXME: What happens when a child exists, but the current user - // can't see it. We're going to create a new child with the exact + // can't see it. We're going to create a new child with the exact // same path and then bad things will happen. $children = id(new PhragmentFragmentQuery()) ->setViewer($viewer) @@ -237,7 +237,7 @@ final class PhragmentFragment extends PhragmentDAO // Iterate over the mappings to find new files. foreach ($mappings as $path => $data) { if (!array_key_exists($base_path.'/'.$path, $children)) { - // The file is being created. If the data is null, + // The file is being created. If the data is null, // then this is explicitly a directory being created. $file = null; if ($mappings[$path] !== null) { diff --git a/src/applications/phrequent/storage/PhrequentDAO.php b/src/applications/phrequent/storage/PhrequentDAO.php index 65680cfd2f..ec5783b7fe 100644 --- a/src/applications/phrequent/storage/PhrequentDAO.php +++ b/src/applications/phrequent/storage/PhrequentDAO.php @@ -1,8 +1,5 @@ getRequest(); $document = $request->getStr('document'); @@ -26,4 +22,5 @@ final class PhrictionDocumentPreviewController return id(new AphrontAjaxResponse())->setContent($content); } + } diff --git a/src/applications/phriction/controller/PhrictionMoveController.php b/src/applications/phriction/controller/PhrictionMoveController.php index f855fa6be3..c278c4133c 100644 --- a/src/applications/phriction/controller/PhrictionMoveController.php +++ b/src/applications/phriction/controller/PhrictionMoveController.php @@ -1,10 +1,6 @@ setDialog($dialog); } + } diff --git a/src/applications/phriction/editor/PhrictionDocumentEditor.php b/src/applications/phriction/editor/PhrictionDocumentEditor.php index f095abd97c..df5a7a90b4 100644 --- a/src/applications/phriction/editor/PhrictionDocumentEditor.php +++ b/src/applications/phriction/editor/PhrictionDocumentEditor.php @@ -2,8 +2,6 @@ /** * Create or update Phriction documents. - * - * @group phriction */ final class PhrictionDocumentEditor extends PhabricatorEditor { diff --git a/src/applications/phriction/remarkup/PhrictionRemarkupRule.php b/src/applications/phriction/remarkup/PhrictionRemarkupRule.php index c6ae9f5b14..b8f61b2c02 100644 --- a/src/applications/phriction/remarkup/PhrictionRemarkupRule.php +++ b/src/applications/phriction/remarkup/PhrictionRemarkupRule.php @@ -1,10 +1,6 @@ getPHID()]; $h_project = $handles[$project->getPHID()]; - // Not as customizable as a ReleephRequest's commit message. It doesn't + // Not as customizable as a ReleephRequest's commit message. It doesn't // really need to be. // TODO: Yes it does, see FB-specific stuff below. $commit_message = array(); diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php index 7082aaba28..d355356aa8 100644 --- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php +++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php @@ -75,7 +75,7 @@ final class ConduitAPI_releephwork_nextrequest_Method * discovered by Phabricator (using the `id` column to perform that * ordering). * - * This is easy for $needs_pick as the ordinal is stored. It is hard for + * This is easy for $needs_pick as the ordinal is stored. It is hard for * reverts, as we have to look that information up. */ $needs_pick = $this->sortPicks($needs_pick); diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php index bea2b28e0e..3773e2e6b1 100644 --- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php +++ b/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php @@ -16,7 +16,7 @@ final class ConduitAPI_releephwork_record_Method * * When the daemons discover this commit in the repository with * DifferentialReleephRequestFieldSpecification, we'll be able to record the - * commit's PHID as well. That process is slow though, and we don't want to + * commit's PHID as well. That process is slow though, and we don't want to * wait a whole minute before marking something as cleanly picked or * reverted. */ diff --git a/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php b/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php index 9054122d29..d32db47069 100644 --- a/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php +++ b/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php @@ -65,7 +65,7 @@ final class PhabricatorApplicationReleephConfigOptions ->setDescription( pht( 'The default branch template for new branches in unconfigured '. - 'Releeph projects. This is also configurable on a per-project '. + 'Releeph projects. This is also configurable on a per-project '. 'basis.')), ); } diff --git a/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php b/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php index e0f3eef1bd..658c98eb53 100644 --- a/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php +++ b/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php @@ -70,7 +70,7 @@ final class ReleephRequestDifferentialCreateController $dialog->appendChild( pht('This differential revision changes code that is associated '. - 'with multiple Releeph branches. '. + 'with multiple Releeph branches. '. 'Please select the branch where you would like this code to be picked.')); foreach ($branch_groups as $project_id => $branches) { diff --git a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php index d6572a3550..02ffa826b2 100644 --- a/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php +++ b/src/applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php @@ -141,8 +141,8 @@ final class DifferentialReleephRequestFieldSpecification { * Reviewers: user1 * * Some of these fields are recognized by Differential (e.g. "Requested - * By"). They are folded up into the "Releeph" field, parsed by this - * class. As such $value includes more than just the first-line: + * By"). They are folded up into the "Releeph" field, parsed by this + * class. As such $value includes more than just the first-line: * * "picks RQ1\n\nRequested By: edward\n\nApproved By: edward (requestor)" * diff --git a/src/applications/releeph/field/specification/ReleephFieldSpecification.php b/src/applications/releeph/field/specification/ReleephFieldSpecification.php index 93e175a374..b0017f1b40 100644 --- a/src/applications/releeph/field/specification/ReleephFieldSpecification.php +++ b/src/applications/releeph/field/specification/ReleephFieldSpecification.php @@ -210,10 +210,10 @@ abstract class ReleephFieldSpecification private $engine; /** - * ReleephFieldSpecification implements much of PhabricatorMarkupInterface - * for you. If you return true from `shouldMarkup()`, and implement - * `getMarkupText()` then your text will be rendered through the Phabricator - * markup pipeline. + * @{class:ReleephFieldSpecification} implements much of + * @{interface:PhabricatorMarkupInterface} for you. If you return true from + * `shouldMarkup()`, and implement `getMarkupText()` then your text will be + * rendered through the Phabricator markup pipeline. * * Output is retrievable with `getMarkupEngineOutput()`. */ diff --git a/src/applications/releeph/storage/ReleephBranch.php b/src/applications/releeph/storage/ReleephBranch.php index d779af56a8..f3a2b3738c 100644 --- a/src/applications/releeph/storage/ReleephBranch.php +++ b/src/applications/releeph/storage/ReleephBranch.php @@ -49,7 +49,7 @@ final class ReleephBranch extends ReleephDAO // If symbolicName is omitted, set it to the basename. // // This means that we can enforce symbolicName as a UNIQUE column in the - // DB. We'll interpret symbolicName === basename as meaning "no symbolic + // DB. We'll interpret symbolicName === basename as meaning "no symbolic // name". // // SYMBOLIC_NAME_NOTE diff --git a/src/applications/releeph/storage/ReleephProject.php b/src/applications/releeph/storage/ReleephProject.php index 5735a49b87..612922eee1 100644 --- a/src/applications/releeph/storage/ReleephProject.php +++ b/src/applications/releeph/storage/ReleephProject.php @@ -9,7 +9,7 @@ final class ReleephProject extends ReleephDAO protected $name; // Specifying the place to pick from is a requirement for svn, though not - // for git. It's always useful though for reasoning about what revs have + // for git. It's always useful though for reasoning about what revs have // been picked and which haven't. protected $trunkBranch; diff --git a/src/applications/releeph/storage/ReleephRequest.php b/src/applications/releeph/storage/ReleephRequest.php index 07af37534b..56b201cf63 100644 --- a/src/applications/releeph/storage/ReleephRequest.php +++ b/src/applications/releeph/storage/ReleephRequest.php @@ -50,7 +50,7 @@ final class ReleephRequest extends ReleephDAO $this->getPusherIntent() == self::INTENT_WANT && /** * We use "!= pass" instead of "== want" in case the requestor intent is - * not present. In other words, only revert if the requestor explicitly + * not present. In other words, only revert if the requestor explicitly * passed. */ $this->getRequestorIntent() != self::INTENT_PASS; diff --git a/src/applications/releeph/storage/ReleephRequestTransaction.php b/src/applications/releeph/storage/ReleephRequestTransaction.php index 63cd215154..1df45416be 100644 --- a/src/applications/releeph/storage/ReleephRequestTransaction.php +++ b/src/applications/releeph/storage/ReleephRequestTransaction.php @@ -254,7 +254,7 @@ final class ReleephRequestTransaction } // ReleephSummaryFieldSpecification is usually blank when an RQ is created, - // creating a transaction change from null to "". Hide these! + // creating a transaction change from null to "". Hide these! if ($type === ReleephRequestTransaction::TYPE_EDIT_FIELD) { if ($this->getOldValue() === null && $this->getNewValue() === '') { return true; diff --git a/src/applications/repository/PhabricatorRepositoryConfigOptions.php b/src/applications/repository/PhabricatorRepositoryConfigOptions.php index db362ea033..bbf70f40ca 100644 --- a/src/applications/repository/PhabricatorRepositoryConfigOptions.php +++ b/src/applications/repository/PhabricatorRepositoryConfigOptions.php @@ -1,8 +1,5 @@ toDictionary(); } - } diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php b/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php index e66191fc96..e42ae18460 100644 --- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php +++ b/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php @@ -1,8 +1,5 @@ setHeaderText($add_comment_header) ->setAction($this->getApplicationURI('/comment/'.$poll->getID().'/')) ->setSubmitButtonName(pht('Add Comment')); - } } diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php index d1d10cd00e..2443519eeb 100644 --- a/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php +++ b/src/applications/slowvote/controller/PhabricatorSlowvoteVoteController.php @@ -1,8 +1,5 @@ updateVotes($user, $poll, $old_votes, $votes); return id(new AphrontRedirectResponse())->setURI('/V'.$poll->getID()); - } private function updateVotes($user, $poll, $old_votes, $votes) { - if (!empty($votes) && count($votes) > 1 && $poll->getMethod() == PhabricatorSlowvotePoll::METHOD_PLURALITY) { return id(new Aphront400Response()); @@ -108,8 +103,6 @@ final class PhabricatorSlowvoteVoteController ->setOptionID($vote) ->save(); } - } - } diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php index e69f5eeb39..81204aecd7 100644 --- a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php +++ b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php @@ -1,8 +1,5 @@ `Display Preferences`. -Once DarkConsole is enabled, you can show or hide it by pressing ##`## on your +to `true`, and then turning it on in `Settings` -> `Display Preferences`. Once +DarkConsole is enabled, you can show or hide it by pressing ##`## on your keyboard. Since the setting is not available to logged-out users, you can also set diff --git a/src/docs/contributor/database.diviner b/src/docs/contributor/database.diviner index 6b085039cc..273f1d273b 100644 --- a/src/docs/contributor/database.diviner +++ b/src/docs/contributor/database.diviner @@ -118,8 +118,8 @@ PHIDs allow us to represent relationships between different types of objects in a homogenous way. For example, the concept of "subscribers" is more powerfully done with PHIDs -because we could theoretically have users, projects, teams, and more all -as "subscribers" of other objects. Using an ID column we would need to add a +because we could theoretically have users, projects, teams, and more all as +"subscribers" of other objects. Using an ID column we would need to add a "type" column to avoid ID collision; using PHIDs does not require this additional column. @@ -148,14 +148,14 @@ to avoid it if possible. There are three simple steps to update the schema: # Create a `.sql` file in `resources/sql/patches/`. This file should: - - Contain the approprate MySQL commands to update the schema. - - Be named as `YYYYMMDD.patchname.ext`. For example, `20130217.example.sql`. - - Use `${NAMESPACE}` rather than `phabricator` for database names. - - Use `COLLATE utf8_bin` for any columns that are to be used as identifiers, -such as PHID columns. Otherwise, use `COLLATE utf8_general_ci`. - - Name all indexes so it is possible to delete them later. + - Contain the approprate MySQL commands to update the schema. + - Be named as `YYYYMMDD.patchname.ext`. For example, `20130217.example.sql`. + - Use `${NAMESPACE}` rather than `phabricator` for database names. + - Use `COLLATE utf8_bin` for any columns that are to be used as identifiers, + such as PHID columns. Otherwise, use `COLLATE utf8_general_ci`. + - Name all indexes so it is possible to delete them later. # Edit `src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php` and -add your patch to @{method@phabricator:PhabricatorBuiltinPatchList::getPatches}. + add your patch to @{method@phabricator:PhabricatorBuiltinPatchList::getPatches}. # Run `bin/storage upgrade`. It is also possible to create more complex patches in PHP for data migration diff --git a/src/docs/contributor/phabricator_code_layout.diviner b/src/docs/contributor/phabricator_code_layout.diviner index db86f5e4d4..b4e7eb5cbc 100644 --- a/src/docs/contributor/phabricator_code_layout.diviner +++ b/src/docs/contributor/phabricator_code_layout.diviner @@ -71,7 +71,7 @@ something like: complicated edits and should be used pragmatically versus Storage objects. - **DerpException**: exceptions used in the ##Derp## application. - **DerpQuery**: query one or more storage objects for pertinent ##Derp## - application data. @{class:PhabricatorOffsetPagedQuery} is particularly + application data. @{class:PhabricatorOffsetPagedQuery} is particularly handy for pagination and works well with @{class:AphrontPagerView}. - **DerpReplyHandler**: business logic from any configured email interactions users can have with the ##Derp## application. diff --git a/src/docs/contributor/using_edges.diviner b/src/docs/contributor/using_edges.diviner index c607b1f9ea..89d07f4c2f 100644 --- a/src/docs/contributor/using_edges.diviner +++ b/src/docs/contributor/using_edges.diviner @@ -5,9 +5,9 @@ Guide to the Edges infrastructure. = Overview = -Edges are a generic way of storing a relationship between two objects (like -a Task and its attached files). If you are familiar with the Facebook -associations framework, Phabricator Edges are substantially similar. +Edges are a generic way of storing a relationship between two objects (like a +Task and its attached files). If you are familiar with the Facebook associations +framework, Phabricator Edges are substantially similar. An edge is defined by a source PHID (the edge origin), a destination PHID (the edge destination) and an edge type (which describes the relationship, diff --git a/src/docs/flavor/things_you_should_do_soon.diviner b/src/docs/flavor/things_you_should_do_soon.diviner index e1d960fd5e..1953d7777f 100644 --- a/src/docs/flavor/things_you_should_do_soon.diviner +++ b/src/docs/flavor/things_you_should_do_soon.diviner @@ -1,8 +1,8 @@ @title Things You Should Do Soon @group sundry -Describes things you should start thinking about soon, because scaling will -be easier if you put a plan in place. +Describes things you should start thinking about soon, because scaling will be +easier if you put a plan in place. = Overview = diff --git a/src/docs/tech/celerity.diviner b/src/docs/tech/celerity.diviner index f9bb7ab875..d864f1b437 100644 --- a/src/docs/tech/celerity.diviner +++ b/src/docs/tech/celerity.diviner @@ -54,9 +54,8 @@ the relevant resources and packages, managing cache lifetimes and handling any neessary preprocessing. It uses @{class:CelerityResourceMap} to locate resources and read packaging rules. -The dependency and packaging maps are generated by -##bin/celerity map##, which updates -##resources/celerity/map.php##.. +The dependency and packaging maps are generated by ##bin/celerity map##, +which updates ##resources/celerity/map.php##. @{class:CelerityStaticResourceResponse} also manages some Javelin information, and @{function:celerity_generate_unique_node_id} uses this metadata to provide diff --git a/src/docs/user/userguide/events.diviner b/src/docs/user/userguide/events.diviner index 7c3e79b8dc..292be9ec45 100644 --- a/src/docs/user/userguide/events.diviner +++ b/src/docs/user/userguide/events.diviner @@ -188,7 +188,7 @@ The constant for this event is `PhabricatorEventType::TYPE_DIFFERENTIAL_WILLMARKGENERATED`. This event is dispatched before Differential decides if a file is generated (and -doesn't need to be reviewed) or not. Data available on this event: +doesn't need to be reviewed) or not. Data available on this event: - ##corpus## Body of the file. - ##is_generated## Boolean indicating if this file should be treated as diff --git a/src/docs/user/userguide/jump.diviner b/src/docs/user/userguide/jump.diviner index 5910484760..f4ae81ecdf 100644 --- a/src/docs/user/userguide/jump.diviner +++ b/src/docs/user/userguide/jump.diviner @@ -24,6 +24,5 @@ a navigational command into the box and press return. - **p** - Jump to Project - **p Some Project** - Jump to Project: Some Project - **s SymbolName** - Jump to Symbol SymbolName - - **task: (new title)** - Jumps to Task Creation Page with pre-filled - title. + - **task: (new title)** - Jumps to Task Creation Page with pre-filled title. - **(default)** - Search for input. diff --git a/src/docs/user/userguide/owners.diviner b/src/docs/user/userguide/owners.diviner index 23238ae943..4d4095fc39 100644 --- a/src/docs/user/userguide/owners.diviner +++ b/src/docs/user/userguide/owners.diviner @@ -24,7 +24,7 @@ be marked as "Needing Attention" if - no revision found for the commit, - the commit author is not recognized, or - the author or the reviewer specified in the commits don't match the ones in - the Differential revision + the Differential revision The owners of the package can accept or specify concern for such commits by clicking the "Audit Status" link. diff --git a/src/docs/user/userguide/remarkup.diviner b/src/docs/user/userguide/remarkup.diviner index 7716811db3..6f5bf914e2 100644 --- a/src/docs/user/userguide/remarkup.diviner +++ b/src/docs/user/userguide/remarkup.diviner @@ -556,6 +556,6 @@ Some general notes about this syntax: = Fullscreen Mode = -Remarkup editors provide a fullscreen composition mode. This can make it easier +Remarkup editors provide a fullscreen composition mode. This can make it easier to edit large blocks of text, or improve focus by removing distractions. You can exit **Fullscreen** mode by clicking the button again or by pressing escape. diff --git a/src/infrastructure/celerity/CelerityAPI.php b/src/infrastructure/celerity/CelerityAPI.php index 4a786adbe2..d5649471af 100644 --- a/src/infrastructure/celerity/CelerityAPI.php +++ b/src/infrastructure/celerity/CelerityAPI.php @@ -3,8 +3,6 @@ /** * Indirection layer which provisions for a terrifying future where we need to * build multiple resource responses per page. - * - * @group celerity */ final class CelerityAPI { diff --git a/src/infrastructure/celerity/CelerityPhabricatorResourceController.php b/src/infrastructure/celerity/CelerityPhabricatorResourceController.php index 3f42e50c57..5a4610da84 100644 --- a/src/infrastructure/celerity/CelerityPhabricatorResourceController.php +++ b/src/infrastructure/celerity/CelerityPhabricatorResourceController.php @@ -2,10 +2,8 @@ /** * Delivers CSS and JS resources to the browser. This controller handles all - * ##/res/## requests, and manages caching, package construction, and resource + * `/res/` requests, and manages caching, package construction, and resource * preprocessing. - * - * @group celerity */ final class CelerityPhabricatorResourceController extends CelerityResourceController { diff --git a/src/infrastructure/celerity/CelerityResourceTransformer.php b/src/infrastructure/celerity/CelerityResourceTransformer.php index faf5ba295e..5071e43da7 100644 --- a/src/infrastructure/celerity/CelerityResourceTransformer.php +++ b/src/infrastructure/celerity/CelerityResourceTransformer.php @@ -1,8 +1,5 @@ startupDelay > 0) { - // the event loop runs every 1s so delay enough to fully conenct - $this->startupDelay--; + // the event loop runs every 1s so delay enough to fully conenct + $this->startupDelay--; - return; + return; } if ($this->lastSeenChronoKey == 0) { // Since we only want to post notifications about new stories, skip diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php index 9dd449b155..b649d33619 100644 --- a/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php +++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotHandler.php @@ -3,8 +3,6 @@ /** * Responds to IRC messages. You plug a bunch of these into a * @{class:PhabricatorBot} to give it special behavior. - * - * @group irc */ abstract class PhabricatorBotHandler { @@ -70,4 +68,5 @@ abstract class PhabricatorBotHandler { return $this->writeMessage($reply); } + } diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php index 7f110c9487..4f0a9dee35 100644 --- a/src/infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php +++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotLogHandler.php @@ -2,15 +2,12 @@ /** * Logs chatter. - * - * @group irc */ final class PhabricatorBotLogHandler extends PhabricatorBotHandler { private $futures = array(); public function receiveMessage(PhabricatorBotMessage $message) { - switch ($message->getCommand()) { case 'MESSAGE': $target = $message->getTarget(); diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php index 009982fb5b..10bbbd48b9 100644 --- a/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php +++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotMacroHandler.php @@ -1,8 +1,5 @@ getCommand()) { - case 'MESSAGE': - $message = $original_message->getBody(); - $matches = null; + case 'MESSAGE': + $message = $original_message->getBody(); + $matches = null; - $paste_ids = array(); - $commit_names = array(); - $vote_ids = array(); - $file_ids = array(); - $object_names = array(); - $output = array(); + $paste_ids = array(); + $commit_names = array(); + $vote_ids = array(); + $file_ids = array(); + $object_names = array(); + $output = array(); - $pattern = - '@'. - '(?getConduit()->callMethodSynchronous( - 'phid.lookup', - array( - 'names' => $object_names, - )); - foreach ($objects as $object) { - $output[$object['phid']] = $object['fullName'].' - '.$object['uri']; - } - } - - if ($vote_ids) { - foreach ($vote_ids as $vote_id) { - $vote = $this->getConduit()->callMethodSynchronous( - 'slowvote.info', + if ($object_names) { + $objects = $this->getConduit()->callMethodSynchronous( + 'phid.lookup', array( - 'poll_id' => $vote_id, + 'names' => $object_names, )); - $output[$vote['phid']] = 'V'.$vote['id'].': '.$vote['question']. - ' Come Vote '.$vote['uri']; - } - } - - if ($file_ids) { - foreach ($file_ids as $file_id) { - $file = $this->getConduit()->callMethodSynchronous( - 'file.info', - array( - 'id' => $file_id, - )); - $output[$file['phid']] = $file['objectName'].': '.$file['uri'].' - '. - $file['name']; - } - } - - if ($paste_ids) { - foreach ($paste_ids as $paste_id) { - $paste = $this->getConduit()->callMethodSynchronous( - 'paste.info', - array( - 'paste_id' => $paste_id, - )); - // Eventually I'd like to show the username of the paster as well, - // however that will need something like a user.username_from_phid - // since we (ideally) want to keep the bot to Conduit calls...and - // not call to Phabricator-specific stuff (like actually loading - // the User object and fetching his/her username.) - $output[$paste['phid']] = 'P'.$paste['id'].': '.$paste['uri'].' - '. - $paste['title']; - - if ($paste['language']) { - $output[$paste['phid']] .= ' ('.$paste['language'].')'; + foreach ($objects as $object) { + $output[$object['phid']] = $object['fullName'].' - '.$object['uri']; } } - } - if ($commit_names) { - $commits = $this->getConduit()->callMethodSynchronous( - 'diffusion.getcommits', - array( - 'commits' => $commit_names, - )); - foreach ($commits as $commit) { - if (isset($commit['error'])) { + if ($vote_ids) { + foreach ($vote_ids as $vote_id) { + $vote = $this->getConduit()->callMethodSynchronous( + 'slowvote.info', + array( + 'poll_id' => $vote_id, + )); + $output[$vote['phid']] = 'V'.$vote['id'].': '.$vote['question']. + ' Come Vote '.$vote['uri']; + } + } + + if ($file_ids) { + foreach ($file_ids as $file_id) { + $file = $this->getConduit()->callMethodSynchronous( + 'file.info', + array( + 'id' => $file_id, + )); + $output[$file['phid']] = $file['objectName'].': '.$file['uri'].' - '. + $file['name']; + } + } + + if ($paste_ids) { + foreach ($paste_ids as $paste_id) { + $paste = $this->getConduit()->callMethodSynchronous( + 'paste.info', + array( + 'paste_id' => $paste_id, + )); + // Eventually I'd like to show the username of the paster as well, + // however that will need something like a user.username_from_phid + // since we (ideally) want to keep the bot to Conduit calls...and + // not call to Phabricator-specific stuff (like actually loading + // the User object and fetching his/her username.) + $output[$paste['phid']] = 'P'.$paste['id'].': '.$paste['uri'].' - '. + $paste['title']; + + if ($paste['language']) { + $output[$paste['phid']] .= ' ('.$paste['language'].')'; + } + } + } + + if ($commit_names) { + $commits = $this->getConduit()->callMethodSynchronous( + 'diffusion.getcommits', + array( + 'commits' => $commit_names, + )); + foreach ($commits as $commit) { + if (isset($commit['error'])) { + continue; + } + $output[$commit['commitPHID']] = $commit['uri']; + } + } + + foreach ($output as $phid => $description) { + + // Don't mention the same object more than once every 10 minutes + // in public channels, so we avoid spamming the chat over and over + // again for discsussions of a specific revision, for example. + + $target_name = $original_message->getTarget()->getName(); + if (empty($this->recentlyMentioned[$target_name])) { + $this->recentlyMentioned[$target_name] = array(); + } + + $quiet_until = idx( + $this->recentlyMentioned[$target_name], + $phid, + 0) + (60 * 10); + + if (time() < $quiet_until) { + // Remain quiet on this channel. continue; } - $output[$commit['commitPHID']] = $commit['uri']; + + $this->recentlyMentioned[$target_name][$phid] = time(); + $this->replyTo($original_message, $description); } - } - - foreach ($output as $phid => $description) { - - // Don't mention the same object more than once every 10 minutes - // in public channels, so we avoid spamming the chat over and over - // again for discsussions of a specific revision, for example. - - $target_name = $original_message->getTarget()->getName(); - if (empty($this->recentlyMentioned[$target_name])) { - $this->recentlyMentioned[$target_name] = array(); - } - - $quiet_until = idx( - $this->recentlyMentioned[$target_name], - $phid, - 0) + (60 * 10); - - if (time() < $quiet_until) { - // Remain quiet on this channel. - continue; - } - - $this->recentlyMentioned[$target_name][$phid] = time(); - $this->replyTo($original_message, $description); - } - break; + break; } } diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php index 536f8713ad..48734af94a 100644 --- a/src/infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php +++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotSymbolHandler.php @@ -2,48 +2,45 @@ /** * Watches for "where is ?" - * - * @group irc */ final class PhabricatorBotSymbolHandler extends PhabricatorBotHandler { public function receiveMessage(PhabricatorBotMessage $message) { - switch ($message->getCommand()) { - case 'MESSAGE': - $text = $message->getBody(); + case 'MESSAGE': + $text = $message->getBody(); - $matches = null; - if (!preg_match('/where(?: in the world)? is (\S+?)\?/i', - $text, $matches)) { - break; + $matches = null; + if (!preg_match('/where(?: in the world)? is (\S+?)\?/i', + $text, $matches)) { + break; + } + + $symbol = $matches[1]; + $results = $this->getConduit()->callMethodSynchronous( + 'diffusion.findsymbols', + array( + 'name' => $symbol, + )); + + $default_uri = $this->getURI('/diffusion/symbol/'.$symbol.'/'); + + if (count($results) > 1) { + $response = "Multiple symbols named '{$symbol}': {$default_uri}"; + } else if (count($results) == 1) { + $result = head($results); + $response = + $result['type'].' '. + $result['name'].' '. + '('.$result['language'].'): '. + nonempty($result['uri'], $default_uri); + } else { + $response = "No symbol '{$symbol}' found anywhere."; } - $symbol = $matches[1]; - $results = $this->getConduit()->callMethodSynchronous( - 'diffusion.findsymbols', - array( - 'name' => $symbol, - )); + $this->replyTo($message, $response); - $default_uri = $this->getURI('/diffusion/symbol/'.$symbol.'/'); - - if (count($results) > 1) { - $response = "Multiple symbols named '{$symbol}': {$default_uri}"; - } else if (count($results) == 1) { - $result = head($results); - $response = - $result['type'].' '. - $result['name'].' '. - '('.$result['language'].'): '. - nonempty($result['uri'], $default_uri); - } else { - $response = "No symbol '{$symbol}' found anywhere."; - } - - $this->replyTo($message, $response); - - break; + break; } } diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php index e052230410..59a921555c 100644 --- a/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php +++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotWhatsNewHandler.php @@ -2,8 +2,6 @@ /** * Responds to "Whats new?" with some recent feed content - * - * @group irc */ final class PhabricatorBotWhatsNewHandler extends PhabricatorBotHandler { diff --git a/src/infrastructure/daemon/workers/PhabricatorWorker.php b/src/infrastructure/daemon/workers/PhabricatorWorker.php index b162f4344a..074d580a52 100644 --- a/src/infrastructure/daemon/workers/PhabricatorWorker.php +++ b/src/infrastructure/daemon/workers/PhabricatorWorker.php @@ -2,8 +2,6 @@ /** * @task config Configuring Retries and Failures - * - * @group worker */ abstract class PhabricatorWorker { @@ -215,7 +213,7 @@ abstract class PhabricatorWorker { /** - * Queue a task to be executed after this one suceeds. + * Queue a task to be executed after this one succeeds. * * The followup task will be queued only if this task completes cleanly. * diff --git a/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php b/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php index 3447206173..ca0d5db5c6 100644 --- a/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php +++ b/src/infrastructure/daemon/workers/query/PhabricatorWorkerLeaseQuery.php @@ -2,8 +2,6 @@ /** * Select and lease tasks from the worker task queue. - * - * @group worker */ final class PhabricatorWorkerLeaseQuery extends PhabricatorQuery { diff --git a/src/infrastructure/events/PhabricatorEvent.php b/src/infrastructure/events/PhabricatorEvent.php index 03116cdd9e..bfb08b203b 100644 --- a/src/infrastructure/events/PhabricatorEvent.php +++ b/src/infrastructure/events/PhabricatorEvent.php @@ -1,9 +1,5 @@ listen(PhabricatorEventType::TYPE_TEST_DIDRUNTEST); } diff --git a/src/infrastructure/events/constant/PhabricatorEventType.php b/src/infrastructure/events/constant/PhabricatorEventType.php index 780d894a4b..f33cd4a2d4 100644 --- a/src/infrastructure/events/constant/PhabricatorEventType.php +++ b/src/infrastructure/events/constant/PhabricatorEventType.php @@ -3,8 +3,6 @@ /** * For detailed explanations of these events, see * @{article:Events User Guide: Installing Event Listeners}. - * - * @group events */ final class PhabricatorEventType extends PhutilEventType { diff --git a/src/infrastructure/markup/PhabricatorMarkupInterface.php b/src/infrastructure/markup/PhabricatorMarkupInterface.php index 437d3da8f8..f28c7ab50b 100644 --- a/src/infrastructure/markup/PhabricatorMarkupInterface.php +++ b/src/infrastructure/markup/PhabricatorMarkupInterface.php @@ -14,8 +14,6 @@ * these cases, the implementation can largely ignore the `$field` parameter. * * @task markup Markup Interface - * - * @group markup */ interface PhabricatorMarkupInterface { @@ -26,7 +24,7 @@ interface PhabricatorMarkupInterface { /** * Get a key to identify this field. This should uniquely identify the block * of text to be rendered and be usable as a cache key. If the object has a - * PHID, using the PHID and the field name is likley reasonable: + * PHID, using the PHID and the field name is likely reasonable: * * "{$phid}:{$field}" * diff --git a/src/infrastructure/markup/PhabricatorSyntaxHighlighter.php b/src/infrastructure/markup/PhabricatorSyntaxHighlighter.php index fbd339a8c5..4906f5bc38 100644 --- a/src/infrastructure/markup/PhabricatorSyntaxHighlighter.php +++ b/src/infrastructure/markup/PhabricatorSyntaxHighlighter.php @@ -1,8 +1,5 @@ highlightSource($language, $source); } - } diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php index 2627468896..e0057bf3dd 100644 --- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php +++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php @@ -1,10 +1,6 @@ load($id); * - * This will load the Dog record with ID $id into $dog, or ##null## if no such + * This will load the Dog record with ID $id into $dog, or `null` if no such * record exists (@{method:load} is an instance method rather than a static * method because PHP does not support late static binding, at least until PHP * 5.3). @@ -161,8 +161,6 @@ * @task util Utilities * @task xaction Managing Transactions * @task isolate Isolation for Unit Testing - * - * @group storage */ abstract class LiskDAO { @@ -464,7 +462,7 @@ abstract class LiskDAO { * * @task load */ - public function loadAllWhere($pattern/* , $arg, $arg, $arg ... */) { + public function loadAllWhere($pattern /* , $arg, $arg, $arg ... */) { $args = func_get_args(); array_unshift($args, null); $data = call_user_func_array( @@ -484,7 +482,7 @@ abstract class LiskDAO { * * @task load */ - public function loadColumnsWhere(array $columns, $pattern/* , $args... */) { + public function loadColumnsWhere(array $columns, $pattern /* , $args... */) { if (!$this->getConfigOption(self::CONFIG_PARTIAL_OBJECTS)) { throw new BadMethodCallException( 'This class does not support partial objects.'); @@ -499,7 +497,7 @@ abstract class LiskDAO { /** * Load a single object identified by a 'WHERE' clause. You provide - * everything after the 'WHERE', and Lisk builds the first half of the + * everything after the 'WHERE', and Lisk builds the first half of the * query. See loadAllWhere(). This method is similar, but returns a single * result instead of a list. * @@ -509,7 +507,7 @@ abstract class LiskDAO { * * @task load */ - public function loadOneWhere($pattern/* , $arg, $arg, $arg ... */) { + public function loadOneWhere($pattern /* , $arg, $arg, $arg ... */) { $args = func_get_args(); array_unshift($args, null); $data = call_user_func_array( @@ -530,7 +528,7 @@ abstract class LiskDAO { } - protected function loadRawDataWhere($columns, $pattern/* , $args... */) { + protected function loadRawDataWhere($columns, $pattern /* , $args... */) { $connection = $this->establishConnection('r'); $lock_clause = ''; @@ -579,7 +577,6 @@ abstract class LiskDAO { * @task load */ public function reload() { - if (!$this->getID()) { throw new Exception("Unable to reload object that hasn't been loaded!"); } @@ -601,10 +598,11 @@ abstract class LiskDAO { * Initialize this object's properties from a dictionary. Generally, you * load single objects with loadOneWhere(), but sometimes it may be more * convenient to pull data from elsewhere directly (e.g., a complicated - * join via queryData()) and then load from an array representation. + * join via @{method:queryData}) and then load from an array representation. * * @param dict Dictionary of properties, which should be equivalent to - * selecting a row from the table or calling getProperties(). + * selecting a row from the table or calling + * @{method:getProperties}. * @return this * * @task load @@ -654,9 +652,9 @@ abstract class LiskDAO { /** * Initialize a list of objects from a list of dictionaries. Usually you - * load lists of objects with loadAllWhere(), but sometimes that isn't - * flexible enough. One case is if you need to do joins to select the right - * objects: + * load lists of objects with @{method:loadAllWhere}, but sometimes that + * isn't flexible enough. One case is if you need to do joins to select the + * right objects: * * function loadAllWithOwner($owner) { * $data = $this->queryData( @@ -669,7 +667,7 @@ abstract class LiskDAO { * return $this->loadAllFromArray($data); * } * - * This is a lot messier than loadAllWhere(), but more flexible. + * This is a lot messier than @{method:loadAllWhere}, but more flexible. * * @param list List of property dictionaries. * @return dict List of constructed objects, keyed on ID. @@ -1044,9 +1042,9 @@ abstract class LiskDAO { /** * Convert this object into a property dictionary. This dictionary can be - * restored into an object by using loadFromArray() (unless you're using - * legacy features with CONFIG_CONVERT_CAMELCASE, but in that case you should - * just go ahead and die in a fire). + * restored into an object by using @{method:loadFromArray} (unless you're + * using legacy features with CONFIG_CONVERT_CAMELCASE, but in that case you + * should just go ahead and die in a fire). * * @return dict Dictionary of object properties. * @@ -1370,7 +1368,7 @@ abstract class LiskDAO { /** * Hook to apply serialization or validation to data before it is written to - * the database. See also willReadData(). + * the database. See also @{method:willReadData}. * * @task hook */ @@ -1411,7 +1409,7 @@ abstract class LiskDAO { /** * Hook to apply serialization or validation to data as it is read from the - * database. See also willWriteData(). + * database. See also @{method:willWriteData}. * * @task hook */ @@ -1442,7 +1440,7 @@ abstract class LiskDAO { /** * Reads the value from a field. Override this method for custom behavior - * of getField() instead of overriding getField directly. + * of @{method:getField} instead of overriding getField directly. * * @param string Canonical field name * @return mixed Value of the field @@ -1706,7 +1704,6 @@ abstract class LiskDAO { * @task util */ public function __call($method, $args) { - // NOTE: PHP has a bug that static variables defined in __call() are shared // across all children classes. Call a different method to work around this // bug. diff --git a/webroot/rsrc/externals/javelin/core/Event.js b/webroot/rsrc/externals/javelin/core/Event.js index b7b5a7b3b2..9ce02c5811 100644 --- a/webroot/rsrc/externals/javelin/core/Event.js +++ b/webroot/rsrc/externals/javelin/core/Event.js @@ -21,7 +21,6 @@ * * @task stop Stopping Event Behaviors * @task info Getting Event Information - * @group event */ JX.install('Event', { members : { @@ -211,7 +210,7 @@ JX.install('Event', { /** * Get the metadata associated with the node that corresponds to the key - * in this event's node map. This is a simple helper method that makes + * in this event's node map. This is a simple helper method that makes * the API for accessing metadata associated with specific nodes less ugly. * * JX.Stratcom.listen('click', 'tag:a', function(event) { diff --git a/webroot/rsrc/externals/javelin/core/Stratcom.js b/webroot/rsrc/externals/javelin/core/Stratcom.js index dc62c852de..28eff44c12 100644 --- a/webroot/rsrc/externals/javelin/core/Stratcom.js +++ b/webroot/rsrc/externals/javelin/core/Stratcom.js @@ -31,7 +31,6 @@ * @task sigil Managing Sigils * @task meta Managing Metadata * @task internal Internals - * @group event */ JX.install('Stratcom', { statics : { diff --git a/webroot/rsrc/externals/javelin/core/install.js b/webroot/rsrc/externals/javelin/core/install.js index 9f492569f8..284d529be4 100644 --- a/webroot/rsrc/externals/javelin/core/install.js +++ b/webroot/rsrc/externals/javelin/core/install.js @@ -77,8 +77,6 @@ * "namespace" (e.g., JX.Pancake). * @param map Map of properties, see method documentation. * @return void - * - * @group install */ JX.install = function(new_name, new_junk) { @@ -157,8 +155,6 @@ JX.install = function(new_name, new_junk) { * * @param junk Map of properties, see method documentation. * @return function Constructor of a class created - * - * @group install */ JX.createClass = function(junk) { var name = junk.name || ''; diff --git a/webroot/rsrc/externals/javelin/core/util.js b/webroot/rsrc/externals/javelin/core/util.js index efd4b7c39a..0d0d8f0b3e 100644 --- a/webroot/rsrc/externals/javelin/core/util.js +++ b/webroot/rsrc/externals/javelin/core/util.js @@ -22,8 +22,6 @@ * Throw an exception and attach the caller data in the exception. * * @param string Exception message. - * - * @group util */ JX.$E = function(message) { var e = new Error(message); @@ -45,8 +43,6 @@ JX.$E = function(message) { * * @param obj Array, or array-like object. * @return Array Actual array. - * - * @group util */ JX.$A = function(object) { // IE8 throws "JScript object expected" when trying to call @@ -77,8 +73,6 @@ JX.$A = function(object) { * @param wild Scalar or Array. * @return Array If the argument was a scalar, an Array with the argument as * its only element. Otherwise, the original Array. - * - * @group util */ JX.$AX = function(maybe_scalar) { return JX.isArray(maybe_scalar) ? maybe_scalar : [maybe_scalar]; @@ -93,8 +87,6 @@ JX.$AX = function(maybe_scalar) { * * @param wild Any value. * @return bool true if the argument is an array, false otherwise. - * - * @group util */ JX.isArray = Array.isArray || function(maybe_array) { return Object.prototype.toString.call(maybe_array) == '[object Array]'; @@ -132,8 +124,6 @@ JX.isArray = Array.isArray || function(maybe_array) { * @param obj Destination object, which properties should be copied to. * @param obj Source object, which properties should be copied from. * @return obj Modified destination object. - * - * @group util */ JX.copy = function(copy_dst, copy_src) { for (var k in copy_src) { @@ -227,8 +217,6 @@ JX.copy = function(copy_dst, copy_src) { * @param ... Zero or more arguments to bind. * @return function New function which invokes the original function with * bound context and arguments when called. - * - * @group util */ JX.bind = function(context, func, more) { if (__DEV__) { @@ -256,8 +244,6 @@ JX.bind = function(context, func, more) { * actually have an effect. * * @return void - * - * @group util */ JX.bag = function() { // \o\ \o/ /o/ woo dance party @@ -271,8 +257,6 @@ JX.bag = function() { * * @param obj Object to retrieve keys from. * @return list List of keys. - * - * @group util */ JX.keys = Object.keys || function(obj) { var r = []; @@ -289,8 +273,6 @@ JX.keys = Object.keys || function(obj) { * * @param wild Any value. * @return wild The passed argument. - * - * @group util */ JX.id = function(any) { return any; @@ -314,8 +296,6 @@ if (__DEV__) { * * @param string Message to print to the browser debugging console. * @return void - * - * @group util */ JX.log = function(message) { window.console.log(message); diff --git a/webroot/rsrc/externals/javelin/docs/Base.js b/webroot/rsrc/externals/javelin/docs/Base.js index d2352e9c99..0d32239608 100644 --- a/webroot/rsrc/externals/javelin/docs/Base.js +++ b/webroot/rsrc/externals/javelin/docs/Base.js @@ -8,7 +8,6 @@ * which exist on all Javelin classes. This class documents those methods. * * @task events Builtin Events - * @group install */ JX.install('Base', { members : { diff --git a/webroot/rsrc/externals/javelin/docs/onload.js b/webroot/rsrc/externals/javelin/docs/onload.js index 7c76c08598..61865b94de 100644 --- a/webroot/rsrc/externals/javelin/docs/onload.js +++ b/webroot/rsrc/externals/javelin/docs/onload.js @@ -13,7 +13,6 @@ * * @param function Callback function to invoke after DOMContentReady. * @return void - * @group util */ JX.onload = function(callback) { // This isn't the real function definition, it's only defined here to let the diff --git a/webroot/rsrc/externals/javelin/lib/DOM.js b/webroot/rsrc/externals/javelin/lib/DOM.js index dea3d880f6..60ac09603f 100644 --- a/webroot/rsrc/externals/javelin/lib/DOM.js +++ b/webroot/rsrc/externals/javelin/lib/DOM.js @@ -32,8 +32,6 @@ * * @param string "id" attribute to select from the document. * @return Node Node with the specified "id" attribute. - * - * @group dom */ JX.$ = function(id) { @@ -81,8 +79,6 @@ JX.$ = function(id) { * * @task build String into HTML * @task nodes HTML into Nodes - * - * @group dom */ JX.install('HTML', { @@ -193,8 +189,6 @@ JX.install('HTML', { * know it is from a trusted source and any data in it has been * properly escaped. * @return JX.HTML HTML object, suitable for use with @{JX.$N}. - * - * @group dom */ JX.$H = function(str) { return new JX.HTML(str); @@ -274,8 +268,6 @@ JX.$H = function(str) { * which may be dangerous). * @return Node New node with whatever attributes and * content were specified. - * - * @group dom */ JX.$N = function(tag, attr, content) { if (typeof content == 'undefined' && @@ -338,8 +330,6 @@ JX.$N = function(tag, attr, content) { * @task convenience Convenience Methods * @task query Finding Nodes in the DOM * @task view Changing View State - * - * @group dom */ JX.install('DOM', { statics : { diff --git a/webroot/rsrc/externals/javelin/lib/JSON.js b/webroot/rsrc/externals/javelin/lib/JSON.js index e490b19f46..acf86f8507 100644 --- a/webroot/rsrc/externals/javelin/lib/JSON.js +++ b/webroot/rsrc/externals/javelin/lib/JSON.js @@ -21,7 +21,6 @@ * * @task json JSON Manipulation * @task internal Internal - * @group util */ JX.install('JSON', { statics : { diff --git a/webroot/rsrc/externals/javelin/lib/Mask.js b/webroot/rsrc/externals/javelin/lib/Mask.js index 881c52fedc..f7b6cabe08 100644 --- a/webroot/rsrc/externals/javelin/lib/Mask.js +++ b/webroot/rsrc/externals/javelin/lib/Mask.js @@ -45,8 +45,6 @@ * * The mask has sigil `jx-mask`, which can be used to intercept events * targeting it, like clicks on the mask. - * - * @group control */ JX.install('Mask', { statics : { diff --git a/webroot/rsrc/externals/javelin/lib/Request.js b/webroot/rsrc/externals/javelin/lib/Request.js index c97ee7d5db..14d13905d0 100644 --- a/webroot/rsrc/externals/javelin/lib/Request.js +++ b/webroot/rsrc/externals/javelin/lib/Request.js @@ -13,8 +13,6 @@ /** * Make basic AJAX XMLHTTPRequests. - * - * @group workflow */ JX.install('Request', { construct : function(uri, handler) { diff --git a/webroot/rsrc/externals/javelin/lib/URI.js b/webroot/rsrc/externals/javelin/lib/URI.js index e22982cc6b..362bd92f25 100644 --- a/webroot/rsrc/externals/javelin/lib/URI.js +++ b/webroot/rsrc/externals/javelin/lib/URI.js @@ -17,8 +17,6 @@ * * @param string Unparsed URI. * @return @{class:JX.URI} JX.URI instance. - * - * @group uri */ JX.$U = function(uri) { return new JX.URI(uri); @@ -38,8 +36,6 @@ JX.$U = function(uri) { * * uri.setFragment('clowntown'); * uri.toString() // http://www.example.com/asdf.php?a=b&c=d#clowntown - * - * @group uri */ JX.install('URI', { statics : { diff --git a/webroot/rsrc/externals/javelin/lib/Vector.js b/webroot/rsrc/externals/javelin/lib/Vector.js index 0fa6cbcba3..4c155e18a8 100644 --- a/webroot/rsrc/externals/javelin/lib/Vector.js +++ b/webroot/rsrc/externals/javelin/lib/Vector.js @@ -20,8 +20,6 @@ * If numeric, the x-coordinate for the new vector. * @param number? The y-coordinate for the new vector. * @return @{class:JX.Vector} New vector. - * - * @group dom */ JX.$V = function(x, y) { return new JX.Vector(x, y); @@ -75,8 +73,6 @@ JX.$V = function(x, y) { * @task query Querying Positions and Dimensions * @task update Changing Positions and Dimensions * @task manip Manipulating Vectors - * - * @group dom */ JX.install('Vector', { diff --git a/webroot/rsrc/externals/javelin/lib/Workflow.js b/webroot/rsrc/externals/javelin/lib/Workflow.js index b6b432b0ac..da7e77e815 100644 --- a/webroot/rsrc/externals/javelin/lib/Workflow.js +++ b/webroot/rsrc/externals/javelin/lib/Workflow.js @@ -12,9 +12,6 @@ * @javelin */ -/** - * @group workflow - */ JX.install('Workflow', { construct : function(uri, data) { if (__DEV__) { diff --git a/webroot/rsrc/externals/javelin/lib/behavior.js b/webroot/rsrc/externals/javelin/lib/behavior.js index 8741b9c423..ebd63bb1ac 100644 --- a/webroot/rsrc/externals/javelin/lib/behavior.js +++ b/webroot/rsrc/externals/javelin/lib/behavior.js @@ -23,7 +23,6 @@ * @param string Behavior name. * @param function Behavior callback/definition. * @return void - * @group behavior */ JX.behavior = function(name, control_function) { if (__DEV__) { @@ -76,7 +75,6 @@ JX.behavior = function(name, control_function) { * are lists of configuration dictionaries. The behavior will be * invoked once for each configuration dictionary. * @return void - * @group behavior */ JX.initBehaviors = function(map) { var missing_behaviors = []; diff --git a/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js b/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js index 4465f7f91b..4c331e3d25 100644 --- a/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js +++ b/webroot/rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js @@ -30,8 +30,6 @@ * * When the tokenizer is focused, the CSS class `jx-tokenizer-container-focused` * is added to the container node. - * - * @group control */ JX.install('Tokenizer', { construct : function(containerNode) { diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js index d6d5fbd1ee..5d558efc2b 100644 --- a/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js +++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/Typeahead.js @@ -32,7 +32,6 @@ * @task start Activating a Typeahead * @task control Controlling Typeaheads from Javascript * @task internal Internal Methods - * @group control */ JX.install('Typeahead', { /** diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js index 0410f75840..5611ea6252 100644 --- a/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js +++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js @@ -4,9 +4,6 @@ * @javelin */ -/** - * @group control - */ JX.install('TypeaheadNormalizer', { statics : { /** diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js index aa5fb16d36..7f1d80e86e 100644 --- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js +++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js @@ -6,9 +6,6 @@ * @javelin */ -/** - * @group control - */ JX.install('TypeaheadCompositeSource', { extend : 'TypeaheadSource', diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js index 626d43378a..fd601478a0 100644 --- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js +++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js @@ -7,9 +7,6 @@ * @javelin */ -/** - * @group control - */ JX.install('TypeaheadOnDemandSource', { extend : 'TypeaheadSource', diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js index 6324bf8070..074d552892 100644 --- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js +++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js @@ -12,8 +12,6 @@ * URI. This is appropriate if the total data size is small (up to perhaps a * few thousand items). If you have more items so you can't ship them down to * the client in one repsonse, use @{JX.TypeaheadOnDemandSource}. - * - * @group control */ JX.install('TypeaheadPreloadedSource', { diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js index 5947ffef88..909a994e0c 100644 --- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js +++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js @@ -7,9 +7,6 @@ * @javelin */ -/** - * @group control - */ JX.install('TypeaheadSource', { construct : function() { this._raw = {}; @@ -60,7 +57,7 @@ JX.install('TypeaheadSource', { * - **display**: the text or nodes to show in the DOM. Usually just the * same as ##name##. * - **tokenizable**: if you want to tokenize something other than the - * ##name##, for the typeahead to complete on, specify it here. A + * ##name##, for the typeahead to complete on, specify it here. A * selected entry from the typeahead will still insert the ##name## * into the input, but the ##tokenizable## field lets you complete on * non-name things. diff --git a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js index 39705f4dcd..765074ff27 100644 --- a/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js +++ b/webroot/rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js @@ -9,8 +9,6 @@ * Typeahead source that uses static data passed to the constructor. For larger * datasets, use @{class:JX.TypeaheadPreloadedSource} or * @{class:JX.TypeaheadOnDemandSource} to improve performance. - * - * @group control */ JX.install('TypeaheadStaticSource', { diff --git a/webroot/rsrc/js/application/releeph/releeph-request-typeahead.js b/webroot/rsrc/js/application/releeph/releeph-request-typeahead.js index d8b8db7321..43f9366311 100644 --- a/webroot/rsrc/js/application/releeph/releeph-request-typeahead.js +++ b/webroot/rsrc/js/application/releeph/releeph-request-typeahead.js @@ -58,7 +58,7 @@ JX.behavior('releeph-request-typeahead', function(config) { /** * The default normalizer removes useful control characters that would help - * out search. For example, I was just trying to search for a commit with + * out search. For example, I was just trying to search for a commit with * the string "a_file" in the message, which was normalized to "afile". */ datasource.setNormalizer(function(query) { diff --git a/webroot/rsrc/js/core/behavior-toggle-class.js b/webroot/rsrc/js/core/behavior-toggle-class.js index ce55deb3dc..2e21ed9716 100644 --- a/webroot/rsrc/js/core/behavior-toggle-class.js +++ b/webroot/rsrc/js/core/behavior-toggle-class.js @@ -13,8 +13,6 @@ * * Optionally, you may provide a `state` key to set the default state of the * element. - * - * @group ui */ JX.behavior('toggle-class', function() { JX.Stratcom.listen(