Remove "organization", "communication" and "miscellaneous" app groups

Summary:
Merge "Organization" and "Communication" into "Core". The split between these three was always tenuous, and this is easier to use and nicer looking on the new launcher.

Merge "Miscellaneous" into "Utilities" since they're basically the same thing.

Test Plan: Looked at app launcher.

Reviewers: chad

Reviewed By: chad

Subscribers: epriestley

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

src/applications/base/PhabricatorApplication.php

@@ -12,12 +12,9 @@ abstract class PhabricatorApplication
   implements PhabricatorPolicyInterface {
 
   const GROUP_CORE            = 'core';
-  const GROUP_COMMUNICATION   = 'communication';
-  const GROUP_ORGANIZATION    = 'organization';
   const GROUP_UTILITIES       = 'util';
   const GROUP_ADMIN           = 'admin';
   const GROUP_DEVELOPER       = 'developer';
-  const GROUP_MISC            = 'misc';
 
   const TILE_INVISIBLE        = 'invisible';
   const TILE_HIDE             = 'hide';
@@ -27,12 +24,9 @@ abstract class PhabricatorApplication
   public static function getApplicationGroups() {
     return array(
       self::GROUP_CORE          => pht('Core Applications'),
-      self::GROUP_COMMUNICATION => pht('Communication'),
-      self::GROUP_ORGANIZATION  => pht('Organization'),
       self::GROUP_UTILITIES     => pht('Utilities'),
       self::GROUP_ADMIN         => pht('Administration'),
       self::GROUP_DEVELOPER     => pht('Developer Tools'),
-      self::GROUP_MISC          => pht('Miscellaneous Applications'),
     );
   }
 
@@ -147,7 +141,7 @@ abstract class PhabricatorApplication
   }
 
   public function getApplicationGroup() {
-    return self::GROUP_MISC;
+    return self::GROUP_CORE;
   }
 
   public function getTitleGlyph() {

src/applications/calendar/application/PhabricatorApplicationCalendar.php

@@ -24,10 +24,6 @@ final class PhabricatorApplicationCalendar extends PhabricatorApplication {
     return "\xE2\x8C\xA8";
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function isBeta() {
     return true;
   }

src/applications/chatlog/applications/PhabricatorApplicationChatLog.php

@@ -23,7 +23,7 @@ final class PhabricatorApplicationChatLog extends PhabricatorApplication {
   }
 
   public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
+    return self::GROUP_UTILITIES;
   }
 
  public function getRoutes() {

src/applications/conpherence/application/PhabricatorApplicationConpherence.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group conpherence
- */
 final class PhabricatorApplicationConpherence extends PhabricatorApplication {
 
   public function getBaseURI() {
@@ -21,10 +18,6 @@ final class PhabricatorApplicationConpherence extends PhabricatorApplication {
     return "\xE2\x9C\x86";
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function getEventListeners() {
     return array(
       new ConpherenceActionMenuEventListener(),

src/applications/feed/application/PhabricatorApplicationFeed.php

@@ -28,8 +28,4 @@ final class PhabricatorApplicationFeed extends PhabricatorApplication {
     );
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
 }

src/applications/herald/application/PhabricatorApplicationHerald.php

@@ -27,7 +27,7 @@ final class PhabricatorApplicationHerald extends PhabricatorApplication {
   }
 
   public function getApplicationGroup() {
-    return self::GROUP_ORGANIZATION;
+    return self::GROUP_UTILITIES;
   }
 
   public function getRemarkupRules() {

src/applications/legalpad/application/PhabricatorApplicationLegalpad.php

@@ -23,7 +23,7 @@ final class PhabricatorApplicationLegalpad extends PhabricatorApplication {
   }
 
   public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
+    return self::GROUP_UTILITIES;
   }
 
   public function isBeta() {

src/applications/meta/application/PhabricatorApplicationApplications.php

@@ -22,10 +22,6 @@ final class PhabricatorApplicationApplications extends PhabricatorApplication {
     return "\xE0\xBC\x84";
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_ADMIN;
-  }
-
   public function getRoutes() {
     return array(
       '/applications/' => array(

src/applications/people/application/PhabricatorApplicationPeople.php

@@ -22,10 +22,6 @@ final class PhabricatorApplicationPeople extends PhabricatorApplication {
     return pht('Sort of a social utility.');
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_ORGANIZATION;
-  }
-
   public function canUninstall() {
     return false;
   }

src/applications/phame/application/PhabricatorApplicationPhame.php

@@ -22,10 +22,6 @@ final class PhabricatorApplicationPhame extends PhabricatorApplication {
     return PhabricatorEnv::getDoclink('Phame User Guide');
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function isBeta() {
     return true;
   }

src/applications/pholio/application/PhabricatorApplicationPholio.php

@@ -22,11 +22,6 @@ final class PhabricatorApplicationPholio extends PhabricatorApplication {
     return pht('Things before they were cool.');
   }
 
-  public function getApplicationGroup() {
-    // TODO: Move to CORE, this just keeps it out of the side menu.
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function isBeta() {
     return true;
   }

src/applications/phriction/application/PhabricatorApplicationPhriction.php

@@ -58,10 +58,6 @@ final class PhabricatorApplicationPhriction extends PhabricatorApplication {
     );
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function getApplicationOrder() {
     return 0.140;
   }

src/applications/ponder/application/PhabricatorApplicationPonder.php

@@ -37,10 +37,6 @@ final class PhabricatorApplicationPonder extends PhabricatorApplication {
     );
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_COMMUNICATION;
-  }
-
   public function isBeta() {
     return true;
   }

src/applications/project/application/PhabricatorApplicationProject.php

@@ -22,10 +22,6 @@ final class PhabricatorApplicationProject extends PhabricatorApplication {
     return pht('Group stuff into big piles.');
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_ORGANIZATION;
-  }
-
   public function getRemarkupRules() {
     return array(
       new ProjectRemarkupRule(),

src/applications/releeph/application/PhabricatorApplicationReleeph.php

@@ -18,10 +18,6 @@ final class PhabricatorApplicationReleeph extends PhabricatorApplication {
     return 'releeph';
   }
 
-  public function getApplicationGroup() {
-    return self::GROUP_ORGANIZATION;
-  }
-
   public function isInstalled() {
     if (PhabricatorEnv::getEnvConfig('releeph.installed')) {
       return parent::isInstalled();