Remove @group annotations

Summary: I'm pretty sure that `@group` annotations are useless now... see D9855. Also fixed various other minor issues.

Test Plan: Eye-ball it.

Reviewers: #blessed_reviewers, epriestley, chad

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin, hach-que

Differential Revision: https://secure.phabricator.com/D9859

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,
 

externals/balanced-php/tests/Balanced/SuiteTest.php

@@ -27,8 +27,6 @@ use Balanced\Card;
  *     <li>$BALANCED_URL_ROOT If set applies to \Balanced\Settings::$url_root.
  *     <li>$BALANCED_API_KEY If set applies to \Balanced\Settings::$api_key.
  * </ul>
- *
- * @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();
+        $prev_num_events = Marketplace::mine()->events->total();
-        $account = self::_createBuyer();
+        $account = self::_createBuyer();
-        $account->debit(123);
+        $account->debit(123);
-        $cur_num_events = Marketplace::mine()->events->total();
+        $cur_num_events = Marketplace::mine()->events->total();
-        $count = 0;
+        $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();
+            $cur_num_events = Marketplace::mine()->events->total();
-            $count += 1;
+            $count += 1;
-        }
+        }
         $this->assertTrue($cur_num_events > $prev_num_events);
     }
 }

src/aphront/AphrontController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 abstract class AphrontController extends Phobject {
 
   private $request;

src/aphront/AphrontURIMapper.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontURIMapper {
 
   private $map;
@@ -49,4 +46,5 @@ final class AphrontURIMapper {
 
     return array(null, null);
   }
+
 }

src/aphront/configuration/AphrontApplicationConfiguration.php

@@ -2,7 +2,6 @@
 
 /**
  * @task  routing URI Routing
- * @group aphront
  */
 abstract class AphrontApplicationConfiguration {
 
@@ -228,4 +227,5 @@ abstract class AphrontApplicationConfiguration {
 
     return array($controller, $uri_data);
   }
+
 }

src/aphront/configuration/AphrontDefaultApplicationConfiguration.php

@@ -4,7 +4,6 @@
  * NOTE: Do not extend this!
  *
  * @concrete-extensible
- * @group aphront
  */
 class AphrontDefaultApplicationConfiguration
   extends AphrontApplicationConfiguration {

src/aphront/console/DarkConsoleController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleController extends PhabricatorController {
 
   protected $op;

src/aphront/console/DarkConsoleCore.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleCore {
 
   private $plugins = array();

src/aphront/console/DarkConsoleDataController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleDataController extends PhabricatorController {
 
   private $key;

src/aphront/console/plugin/DarkConsoleErrorLogPlugin.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleErrorLogPlugin extends DarkConsolePlugin {
 
   public function getName() {
@@ -98,4 +95,5 @@ final class DarkConsoleErrorLogPlugin extends DarkConsolePlugin {
         phutil_tag('pre', array('class' => 'PhabricatorMonospaced'), $details),
       ));
   }
+
 }

src/aphront/console/plugin/DarkConsoleEventPlugin.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleEventPlugin extends DarkConsolePlugin {
 
   public function getName() {
@@ -14,7 +11,6 @@ final class DarkConsoleEventPlugin extends DarkConsolePlugin {
   }
 
   public function generateData() {
-
     $listeners = PhutilEventEngine::getInstance()->getAllListeners();
     foreach ($listeners as $key => $listener) {
       $listeners[$key] = array(
@@ -95,4 +91,5 @@ final class DarkConsoleEventPlugin extends DarkConsolePlugin {
 
     return phutil_implode_html("\n", $out);
   }
+
 }

src/aphront/console/plugin/DarkConsolePlugin.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 abstract class DarkConsolePlugin {
 
   private $data;
@@ -13,9 +10,7 @@ abstract class DarkConsolePlugin {
   abstract public function getDescription();
   abstract public function renderPanel();
 
-  public function __construct() {
+  public function __construct() {}
-
-  }
 
   public function getColor() {
     return null;

src/aphront/console/plugin/DarkConsoleRequestPlugin.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleRequestPlugin extends DarkConsolePlugin {
 
   public function getName() {

src/aphront/console/plugin/DarkConsoleServicesPlugin.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleServicesPlugin extends DarkConsolePlugin {
 
   protected $observations;
@@ -36,7 +33,6 @@ final class DarkConsoleServicesPlugin extends DarkConsolePlugin {
    * @phutil-external-symbol class PhabricatorStartup
    */
   public function generateData() {
-
     $should_analyze = self::isQueryAnalyzerRequested();
 
     $log = PhutilServiceProfiler::getInstance()->getServiceCallLog();

src/aphront/console/plugin/DarkConsoleXHProfPlugin.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleXHProfPlugin extends DarkConsolePlugin {
 
   protected $profileFilePHID;

src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleErrorLogPluginAPI {
 
   private static $errors = array();

src/aphront/console/plugin/event/DarkConsoleEventPluginAPI.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group console
- */
 final class DarkConsoleEventPluginAPI extends PhabricatorEventListener {
 
   private static $events = array();

src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php

@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @group console
  * @phutil-external-symbol function xhprof_enable
  * @phutil-external-symbol function xhprof_disable
  */

src/aphront/response/Aphront304Response.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class Aphront304Response extends AphrontResponse {
 
   public function getHTTPResponseCode() {

src/aphront/response/Aphront400Response.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class Aphront400Response extends AphrontResponse {
 
   public function getHTTPResponseCode() {

src/aphront/response/Aphront403Response.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class Aphront403Response extends AphrontHTMLResponse {
 
   private $forbiddenText;

src/aphront/response/Aphront404Response.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class Aphront404Response extends AphrontHTMLResponse {
 
   public function getHTTPResponseCode() {

src/aphront/response/AphrontAjaxResponse.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontAjaxResponse extends AphrontResponse {
 
   private $content;

src/aphront/response/AphrontDialogResponse.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontDialogResponse extends AphrontResponse {
 
   private $dialog;

src/aphront/response/AphrontFileResponse.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontFileResponse extends AphrontResponse {
 
   private $content;

src/aphront/response/AphrontHTMLResponse.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 abstract class AphrontHTMLResponse extends AphrontResponse {
 
   public function getHeaders() {

src/aphront/response/AphrontJSONResponse.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontJSONResponse extends AphrontResponse {
 
   private $content;
@@ -40,4 +37,5 @@ final class AphrontJSONResponse extends AphrontResponse {
     $headers = array_merge(parent::getHeaders(), $headers);
     return $headers;
   }
+
 }

src/aphront/response/AphrontPlainTextResponse.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontPlainTextResponse extends AphrontResponse {
 
   public function setContent($content) {

src/aphront/response/AphrontProxyResponse.php

@@ -7,8 +7,6 @@
  * instantiating an @{class:AphrontAjaxResponse} in @{method:buildProxy}, and
  * then constructing a real @{class:AphrontAjaxResponse} in
  * @{method:reduceProxyResponse}.
- *
- * @group aphront
  */
 abstract class AphrontProxyResponse extends AphrontResponse {
 
@@ -70,5 +68,4 @@ abstract class AphrontProxyResponse extends AphrontResponse {
       'AphrontProxyResponse must implement reduceProxyResponse().');
   }
 
-
 }

src/aphront/response/AphrontRedirectResponse.php

@@ -2,8 +2,6 @@
 
 /**
  * TODO: Should be final but isn't because of AphrontReloadResponse.
- *
- * @group aphront
  */
 class AphrontRedirectResponse extends AphrontResponse {
 

src/aphront/response/AphrontReloadResponse.php

@@ -5,8 +5,6 @@
  * if the action is javascript-driven but redirect if it isn't. This preserves
  * query parameters in the javascript case. A reload response behaves like
  * a redirect response but causes a page reload when received via workflow.
- *
- * @group aphront
  */
 final class AphrontReloadResponse extends AphrontRedirectResponse {
 

src/aphront/response/AphrontResponse.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 abstract class AphrontResponse {
 
   private $request;
@@ -94,7 +91,6 @@ abstract class AphrontResponse {
   }
 
   protected function addJSONShield($json_response) {
-
     // Add a shield to prevent "JSON Hijacking" attacks where an attacker
     // requests a JSON response using a normal <script /> tag and then uses
     // Object.prototype.__defineSetter__() or similar to read response data.

src/aphront/response/AphrontWebpageResponse.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group aphront
- */
 final class AphrontWebpageResponse extends AphrontHTMLResponse {
 
   private $content;

src/aphront/sink/AphrontHTTPSink.php

@@ -10,8 +10,6 @@
  *
  * @task write  Writing Response Components
  * @task emit   Emitting the Response
- *
- * @group aphront
  */
 abstract class AphrontHTTPSink {
 
@@ -117,4 +115,5 @@ abstract class AphrontHTTPSink {
   abstract protected function emitHTTPStatus($code, $message = '');
   abstract protected function emitHeader($name, $value);
   abstract protected function emitData($data);
+
 }

src/aphront/sink/AphrontIsolatedHTTPSink.php

@@ -2,8 +2,6 @@
 
 /**
  * Isolated HTTP sink for testing.
- *
- * @group aphront
  */
 final class AphrontIsolatedHTTPSink extends AphrontHTTPSink {
 

src/aphront/sink/AphrontPHPHTTPSink.php

@@ -2,8 +2,6 @@
 
 /**
  * Concrete HTTP sink which uses "echo" and "header()" to emit data.
- *
- * @group aphront
  */
 final class AphrontPHPHTTPSink extends AphrontHTTPSink {
 

src/applications/arcanist/conduit/ConduitAPI_arcanist_Method.php

@@ -1,8 +1,3 @@
 <?php
 
-/**
+abstract class ConduitAPI_arcanist_Method extends ConduitAPIMethod {}
- * @group conduit
- */
-abstract class ConduitAPI_arcanist_Method extends ConduitAPIMethod {
-
-}

src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_arcanist_projectinfo_Method
   extends ConduitAPI_arcanist_Method {
 

src/applications/audit/conduit/ConduitAPI_audit_Method.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_audit_Method extends ConduitAPIMethod {
 
   public function getApplication() {

src/applications/audit/conduit/ConduitAPI_audit_query_Method.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_audit_query_Method extends ConduitAPI_audit_Method {
 
   public function getMethodDescription() {
@@ -76,5 +73,4 @@ final class ConduitAPI_audit_query_Method extends ConduitAPI_audit_Method {
     return $results;
   }
 
-
 }

src/applications/base/PhabricatorApplication.php

@@ -6,10 +6,8 @@
  * @task  uri   URI Routing
  * @task  fact  Fact Integration
  * @task  meta  Application Management
- * @group apps
  */
-abstract class PhabricatorApplication
+abstract class PhabricatorApplication implements PhabricatorPolicyInterface {
-  implements PhabricatorPolicyInterface {
 
   const GROUP_CORE            = 'core';
   const GROUP_UTILITIES       = 'util';

src/applications/calendar/constants/CalendarColors.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group calendar
- */
 final class CalendarColors extends CalendarConstants {
 
   const COLOR_RED = 'red';

src/applications/calendar/constants/CalendarConstants.php

@@ -1,8 +1,3 @@
 <?php
 
-/**
+abstract class CalendarConstants {}
- * @group calendar
- */
-abstract class CalendarConstants {
-
-}

src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class ConduitAPI_chatlog_Method extends ConduitAPIMethod {
 
   public function getApplication() {

src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php

@@ -1,10 +1,6 @@
 <?php
 
-/**
+final class ConduitAPI_chatlog_query_Method extends ConduitAPI_chatlog_Method {
- * @group conduit
- */
-final class ConduitAPI_chatlog_query_Method
-  extends ConduitAPI_chatlog_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
@@ -30,7 +26,6 @@ final class ConduitAPI_chatlog_query_Method
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $query = new PhabricatorChatLogQuery();
 
     $channel_ids = $request->getValue('channelIDs');

src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php

@@ -1,10 +1,6 @@
 <?php
 
-/**
+final class ConduitAPI_chatlog_record_Method extends ConduitAPI_chatlog_Method {
- * @group conduit
- */
-final class ConduitAPI_chatlog_record_Method
-  extends ConduitAPI_chatlog_Method {
 
   public function getMethodStatus() {
     return self::METHOD_STATUS_UNSTABLE;
@@ -25,8 +21,7 @@ final class ConduitAPI_chatlog_record_Method
   }
 
   public function defineErrorTypes() {
-    return array(
+    return array();
-    );
   }
 
   protected function execute(ConduitAPIRequest $request) {

src/applications/conduit/controller/PhabricatorConduitAPIController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitAPIController
   extends PhabricatorConduitController {
 
@@ -467,4 +464,5 @@ final class PhabricatorConduitAPIController
 
     return $params;
   }
+
 }

src/applications/conduit/controller/PhabricatorConduitController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class PhabricatorConduitController extends PhabricatorController {
 
   protected function buildSideNavView() {
@@ -27,5 +24,4 @@ abstract class PhabricatorConduitController extends PhabricatorController {
     return $this->buildSideNavView()->getMenu();
   }
 
-
 }

src/applications/conduit/controller/PhabricatorConduitLogController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitLogController
   extends PhabricatorConduitController {
 

src/applications/conduit/controller/PhabricatorConduitTokenController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitTokenController
   extends PhabricatorConduitController {
 
@@ -72,4 +69,5 @@ final class PhabricatorConduitTokenController
         'title' => pht('Certificate Install Token'),
       ));
   }
+
 }

src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conduit_connect_Method extends ConduitAPIMethod {
 
   public function shouldRequireAuthentication() {
@@ -55,7 +52,6 @@ final class ConduitAPI_conduit_connect_Method extends ConduitAPIMethod {
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $client = $request->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(
+    $user = id(new PhabricatorUser())->loadOneWhere('username = %s', $username);
-      'username = %s',
-      $username);
     if (!$user) {
       throw new ConduitException('ERR-INVALID-USER');
     }

src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conduit_getcertificate_Method extends ConduitAPIMethod {
 
   public function shouldRequireAuthentication() {
@@ -78,8 +75,8 @@ final class ConduitAPI_conduit_getcertificate_Method extends ConduitAPIMethod {
   }
 
   private function logFailure(
-      ConduitAPIRequest $request,
+    ConduitAPIRequest $request,
-      PhabricatorConduitCertificateToken $info = null) {
+    PhabricatorConduitCertificateToken $info = null) {
 
     $log = PhabricatorUserLog::initializeNewLog(
         $request->getUser(),

src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conduit_ping_Method extends ConduitAPIMethod {
 
   public function shouldRequireAuthentication() {
@@ -28,4 +25,5 @@ final class ConduitAPI_conduit_ping_Method extends ConduitAPIMethod {
   protected function execute(ConduitAPIRequest $request) {
     return php_uname('n');
   }
+
 }

src/applications/conduit/method/ConduitAPI_conduit_query_Method.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conduit_query_Method extends ConduitAPIMethod {
 
   public function getMethodDescription() {

src/applications/conduit/protocol/ConduitAPIRequest.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPIRequest {
 
   protected $params;

src/applications/conduit/protocol/ConduitAPIResponse.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPIResponse {
 
   private $result;
@@ -13,6 +10,7 @@ final class ConduitAPIResponse {
     $this->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(),
     );
   }
+
 }

src/applications/conduit/protocol/ConduitException.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitException extends Exception {
 
   private $errorDescription;

src/applications/conduit/storage/PhabricatorConduitCertificateToken.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitCertificateToken extends PhabricatorConduitDAO {
 
   protected $userPHID;

src/applications/conduit/storage/PhabricatorConduitConnectionLog.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class PhabricatorConduitConnectionLog extends PhabricatorConduitDAO {
 
   protected $client;

src/applications/conduit/storage/PhabricatorConduitDAO.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 abstract class PhabricatorConduitDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {

src/applications/conduit/storage/PhabricatorConduitMethodCallLog.php

@@ -1,9 +1,7 @@
 <?php
 
-/**
+final class PhabricatorConduitMethodCallLog
- * @group conduit
+  extends PhabricatorConduitDAO
- */
-final class PhabricatorConduitMethodCallLog extends PhabricatorConduitDAO
   implements PhabricatorPolicyInterface {
 
   protected $callerPHID;

src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php

@@ -1,10 +1,6 @@
 <?php
 
-/**
+abstract class ConduitAPI_conpherence_Method extends ConduitAPIMethod {
- * @group conduit
- */
-abstract class ConduitAPI_conpherence_Method
-  extends ConduitAPIMethod {
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(

src/applications/conpherence/conduit/ConduitAPI_conpherence_createthread_Method.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conpherence_createthread_Method
   extends ConduitAPI_conpherence_Method {
 
@@ -32,7 +29,6 @@ final class ConduitAPI_conpherence_createthread_Method
   }
 
   protected function execute(ConduitAPIRequest $request) {
-
     $participant_phids = $request->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),
+    );
   }
+
 }

src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php

@@ -1,12 +1,8 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conpherence_querythread_Method
   extends ConduitAPI_conpherence_Method {
 
-
   public function getMethodDescription() {
     return pht(
       'Query for conpherence threads for the logged in user. '.
@@ -82,4 +78,5 @@ final class ConduitAPI_conpherence_querythread_Method
     }
     return $data;
   }
+
 }

src/applications/conpherence/conduit/ConduitAPI_conpherence_querytransaction_Method.php

@@ -1,12 +1,8 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conpherence_querytransaction_Method
   extends ConduitAPI_conpherence_Method {
 
-
   public function getMethodDescription() {
     return pht(
       'Query for transactions for the logged in user within a specific '.
@@ -92,4 +88,5 @@ final class ConduitAPI_conpherence_querytransaction_Method
     }
     return $data;
   }
+
 }

src/applications/conpherence/conduit/ConduitAPI_conpherence_updatethread_Method.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conduit
- */
 final class ConduitAPI_conpherence_updatethread_Method
   extends ConduitAPI_conpherence_Method {
 
@@ -104,4 +101,5 @@ final class ConduitAPI_conpherence_updatethread_Method
 
     return true;
   }
+
 }

src/applications/conpherence/constants/ConpherenceConstants.php

@@ -1,8 +1,3 @@
 <?php
 
-/**
+abstract class ConpherenceConstants {}
- * @group conpherence
- */
-abstract class ConpherenceConstants {
-
-}

src/applications/conpherence/constants/ConpherenceTransactionType.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceTransactionType extends ConpherenceConstants {
 
   const TYPE_FILES           = 'files';

src/applications/conpherence/controller/ConpherenceController.php

@@ -1,9 +1,7 @@
 <?php
 
-/**
- * @group conpherence
- */
 abstract class ConpherenceController extends PhabricatorController {
+
   private $conpherences;
 
   public function buildApplicationMenu() {
@@ -149,8 +147,8 @@ abstract class ConpherenceController extends PhabricatorController {
     return array(
       'transactions' => $rendered_transactions,
       'latest_transaction_id' => $latest_transaction_id,
-      'oldest_transaction_id' => $oldest_transaction_id
+      'oldest_transaction_id' => $oldest_transaction_id,
     );
-
   }
+
 }

src/applications/conpherence/controller/ConpherenceListController.php

@@ -1,10 +1,6 @@
 <?php
 
-/**
+final class ConpherenceListController extends ConpherenceController {
- * @group conpherence
- */
-final class ConpherenceListController
-  extends ConpherenceController {
 
   const SELECTED_MODE = 'selected';
   const UNSELECTED_MODE = 'unselected';
@@ -227,7 +223,8 @@ final class ConpherenceListController
     return array(
       'scroll_up_participant' => $scroll_up_participant,
       'scroll_down_participant' => $scroll_down_participant,
-      'participation' => $participation);
+      'participation' => $participation,
+    );
   }
 
   private function loadConpherenceThreadData($participation) {

src/applications/conpherence/controller/ConpherenceNewController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceNewController extends ConpherenceController {
 
   public function processRequest() {
@@ -99,4 +96,5 @@ final class ConpherenceNewController extends ConpherenceController {
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
+
 }

src/applications/conpherence/controller/ConpherenceNotificationPanelController.php

@@ -1,13 +1,9 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceNotificationPanelController
   extends ConpherenceController {
 
   public function processRequest() {
-
     $request = $this->getRequest();
     $user = $request->getUser();
     $conpherences = array();
@@ -108,4 +104,5 @@ final class ConpherenceNotificationPanelController
 
     return id(new AphrontAjaxResponse())->setContent($json);
   }
+
 }

src/applications/conpherence/controller/ConpherenceWidgetController.php

@@ -1,10 +1,6 @@
 <?php
 
-/**
+final class ConpherenceWidgetController extends ConpherenceController {
- * @group conpherence
- */
-final class ConpherenceWidgetController extends
-  ConpherenceController {
 
   private $conpherenceID;
   private $conpherence;
@@ -14,6 +10,7 @@ final class ConpherenceWidgetController extends
     $this->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;
   }

src/applications/conpherence/editor/ConpherenceEditor.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceEditor extends PhabricatorApplicationTransactionEditor {
 
   const ERROR_EMPTY_PARTICIPANTS = 'error-empty-participants';
@@ -421,4 +418,5 @@ final class ConpherenceEditor extends PhabricatorApplicationTransactionEditor {
   protected function supportsSearch() {
     return false;
   }
+
 }

src/applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class PhabricatorConpherencePHIDTypeThread extends PhabricatorPHIDType {
 
   const TYPECONST = 'CONP';

src/applications/conpherence/query/ConpherenceParticipantCountQuery.php

@@ -9,8 +9,6 @@
  *     ->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');

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
+final class ConpherenceParticipantQuery extends PhabricatorOffsetPagedQuery {
-  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

src/applications/conpherence/query/ConpherenceThreadQuery.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceThreadQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 

src/applications/conpherence/query/ConpherenceTransactionQuery.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceTransactionQuery
   extends PhabricatorApplicationTransactionQuery {
 
@@ -14,5 +11,4 @@ final class ConpherenceTransactionQuery
     return false;
   }
 
-
 }

src/applications/conpherence/storage/ConpherenceDAO.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 abstract class ConpherenceDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {

src/applications/conpherence/storage/ConpherenceParticipant.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceParticipant extends ConpherenceDAO {
 
   protected $participantPHID;

src/applications/conpherence/storage/ConpherenceThread.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceThread extends ConpherenceDAO
   implements PhabricatorPolicyInterface {
 

src/applications/conpherence/storage/ConpherenceTransaction.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceTransaction extends PhabricatorApplicationTransaction {
 
   public function getApplicationName() {

src/applications/conpherence/storage/ConpherenceTransactionComment.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceTransactionComment
   extends PhabricatorApplicationTransactionComment {
 

src/applications/conpherence/view/ConpherenceFileWidgetView.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceFileWidgetView extends ConpherenceWidgetView {
 
   public function render() {

src/applications/conpherence/view/ConpherenceMenuItemView.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceMenuItemView extends AphrontTagView {
 
   private $title;
@@ -119,4 +116,5 @@ final class ConpherenceMenuItemView extends AphrontTagView {
       $unread_count,
     );
   }
+
 }

src/applications/conpherence/view/ConpherencePeopleWidgetView.php

@@ -1,7 +1,5 @@
 <?php
-/**
+
- * @group conpherence
- */
 final class ConpherencePeopleWidgetView extends ConpherenceWidgetView {
 
   public function render() {
@@ -54,4 +52,5 @@ final class ConpherencePeopleWidgetView extends ConpherenceWidgetView {
 
     return $body;
   }
+
 }

src/applications/conpherence/view/ConpherenceTransactionView.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class ConpherenceTransactionView extends AphrontView {
 
   private $conpherenceTransaction;
@@ -19,6 +16,7 @@ final class ConpherenceTransactionView extends AphrontView {
     $this->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();
   }
+
 }

src/applications/conpherence/view/ConpherenceWidgetView.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 abstract class ConpherenceWidgetView extends AphrontView {
 
   private $conpherence;
@@ -23,4 +20,5 @@ abstract class ConpherenceWidgetView extends AphrontView {
   public function getConpherence() {
     return $this->conpherence;
   }
+
 }

src/applications/countdown/controller/PhabricatorCountdownController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group countdown
- */
 abstract class PhabricatorCountdownController extends PhabricatorController {
 
   public function buildSideNavView($for_app = false) {
@@ -39,4 +36,5 @@ abstract class PhabricatorCountdownController extends PhabricatorController {
 
     return $crumbs;
   }
+
 }

src/applications/countdown/controller/PhabricatorCountdownDeleteController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group countdown
- */
 final class PhabricatorCountdownDeleteController
   extends PhabricatorCountdownController {
 
@@ -13,7 +10,6 @@ final class PhabricatorCountdownDeleteController
   }
 
   public function processRequest() {
-
     $request = $this->getRequest();
     $user = $request->getUser();
 

src/applications/countdown/controller/PhabricatorCountdownEditController.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group countdown
- */
 final class PhabricatorCountdownEditController
   extends PhabricatorCountdownController {
 
@@ -127,4 +124,5 @@ final class PhabricatorCountdownEditController
         'title' => $page_title,
       ));
   }
+
 }

src/applications/countdown/query/PhabricatorCountdownQuery.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group countdown
- */
 final class PhabricatorCountdownQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
@@ -45,7 +42,6 @@ final class PhabricatorCountdownQuery
 
     $countdowns = $table->loadAllFromArray($data);
 
-
     return $countdowns;
   }
 

src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group countdown
- */
 final class PhabricatorCountdownRemarkupRule
   extends PhabricatorRemarkupRuleObject {
 

src/applications/countdown/storage/PhabricatorCountdownDAO.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group countdown
- */
 abstract class PhabricatorCountdownDAO extends PhabricatorLiskDAO {
 
   public function getApplicationName() {

src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php

@@ -71,7 +71,7 @@ final class ConduitAPI_differential_finishpostponedlinters_Method
       }
     }
 
-    // Load the lint messages currenty attached to the diff.  If this
+    // Load the lint messages currenty attached to the diff. If this
     // diff property doesn't exist, create it.
     $messages_property = id(new DifferentialDiffProperty())->loadOneWhere(
       'diffID = %d AND name = %s',

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(

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;
     }

src/applications/differential/remarkup/DifferentialRemarkupRule.php

@@ -1,10 +1,6 @@
 <?php
 
-/**
+final class DifferentialRemarkupRule extends PhabricatorRemarkupRuleObject {
- * @group differential
- */
-final class DifferentialRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
 
   protected function getObjectNamePrefix() {
     return 'D';

src/applications/differential/storage/DifferentialAffectedPath.php

@@ -3,8 +3,6 @@
 /**
  * Denormalized index table which stores relationships between revisions in
  * Differential and paths in Diffusion.
- *
- * @group differential
  */
 final class DifferentialAffectedPath extends DifferentialDAO {
 
@@ -18,4 +16,5 @@ final class DifferentialAffectedPath extends DifferentialDAO {
       self::CONFIG_TIMESTAMPS => false,
     ) + parent::getConfiguration();
   }
+
 }