Rename PHIDType classes

Summary: Ref T5655. Rename `PhabricatorPHIDType` subclasses for clarity (see discussion in D9839). I'm not too keen on some of the resulting class names, so feel free to suggest alternatives.

Test Plan: Ran unit tests.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin, hach-que

Maniphest Tasks: T5655

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

resources/sql/autopatches/20140211.dx.2.migcommenttext.php

@@ -27,12 +27,12 @@ foreach ($rows as $row) {
   $dst_table = 'differential_inline_comment';
 
   $xaction_phid = PhabricatorPHID::generateNewPHID(
-    PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
+    PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
-    DifferentialPHIDTypeRevision::TYPECONST);
+    DifferentialRevisionPHIDType::TYPECONST);
 
   $comment_phid = PhabricatorPHID::generateNewPHID(
     PhabricatorPHIDConstants::PHID_TYPE_XCMT,
-    DifferentialPHIDTypeRevision::TYPECONST);
+    DifferentialRevisionPHIDType::TYPECONST);
 
   queryfx(
     $conn_w,

resources/sql/autopatches/20140212.dx.1.armageddon.php

@@ -171,8 +171,8 @@ foreach ($rows as $row) {
     $xaction_phid = idx($xaction, 'phid');
     if (!$xaction_phid) {
       $xaction_phid = PhabricatorPHID::generateNewPHID(
-        PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
+        PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
-        DifferentialPHIDTypeRevision::TYPECONST);
+        DifferentialRevisionPHIDType::TYPECONST);
     }
     unset($xaction['phid']);
 

resources/sql/patches/20130715.votecomments.php

@@ -43,8 +43,8 @@ foreach ($comments as $comment) {
   $comment_phid = PhabricatorPHID::generateNewPHID(
     PhabricatorPHIDConstants::PHID_TYPE_XCMT);
   $xaction_phid = PhabricatorPHID::generateNewPHID(
-    PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
+    PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
-    PhabricatorSlowvotePHIDTypePoll::TYPECONST);
+    PhabricatorSlowvotePollPHIDType::TYPECONST);
 
   $source = PhabricatorContentSource::newForSource(
     PhabricatorContentSource::SOURCE_LEGACY,

resources/sql/patches/20130728.ponderxcomment.php

@@ -16,22 +16,22 @@ foreach ($rows as $row) {
 
   $type = phid_get_type($row['targetPHID']);
   switch ($type) {
-    case PonderPHIDTypeQuestion::TYPECONST:
+    case PonderQuestionPHIDType::TYPECONST:
       $table_obj = $qtable;
       $comment_obj = new PonderQuestionTransactionComment();
       break;
-    case PonderPHIDTypeAnswer::TYPECONST:
+    case PonderAnswerPHIDType::TYPECONST:
       $table_obj = $atable;
       $comment_obj = new PonderAnswerTransactionComment();
       break;
   }
 
   $comment_phid = PhabricatorPHID::generateNewPHID(
-    PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
+    PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
     $type);
 
   $xaction_phid = PhabricatorPHID::generateNewPHID(
-    PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
+    PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
     $type);
 
   queryfx(

resources/sql/patches/20130801.pastexactions.php

@@ -15,7 +15,7 @@ foreach ($rows as $row) {
   echo "Adding transactions for paste id {$id}...\n";
 
   $xaction_phid = PhabricatorPHID::generateNewPHID(
-    PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST);
+    PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST);
 
   queryfx(
     $conn_w,

resources/sql/patches/20130802.heraldphids.php

@@ -17,7 +17,7 @@ foreach (new LiskMigrationIterator(new HeraldRule()) as $rule) {
     $conn_w,
     'UPDATE %T SET phid = %s WHERE id = %d',
     $table->getTableName(),
-    PhabricatorPHID::generateNewPHID(HeraldPHIDTypeRule::TYPECONST),
+    PhabricatorPHID::generateNewPHID(HeraldRulePHIDType::TYPECONST),
     $rule->getID());
 }
 

resources/sql/patches/20130921.xmigratemaniphest.php

@@ -62,8 +62,8 @@ foreach ($rows as $row) {
   // a comment in addition to an action) we'll insert that below.
   if ($row['transactionType'] != 'comment') {
     $xaction_phid = PhabricatorPHID::generateNewPHID(
-      PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
+      PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
-      ManiphestPHIDTypeTask::TYPECONST);
+      ManiphestTaskPHIDType::TYPECONST);
 
     queryfx(
       $conn_w,
@@ -93,12 +93,12 @@ foreach ($rows as $row) {
   if ($has_comment) {
     $comment_phid = PhabricatorPHID::generateNewPHID(
       PhabricatorPHIDConstants::PHID_TYPE_XCMT,
-      ManiphestPHIDTypeTask::TYPECONST);
+      ManiphestTaskPHIDType::TYPECONST);
     $comment_version = 1;
 
     $comment_xaction_phid = PhabricatorPHID::generateNewPHID(
-      PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
+      PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
-      ManiphestPHIDTypeTask::TYPECONST);
+      ManiphestTaskPHIDType::TYPECONST);
 
     // Insert the comment data.
     queryfx(

resources/sql/patches/20130926.dinline.php

@@ -34,15 +34,15 @@ foreach ($rows as $row) {
 
   if ($row['commentID']) {
     $xaction_phid = PhabricatorPHID::generateNewPHID(
-      PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
+      PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
-      DifferentialPHIDTypeRevision::TYPECONST);
+      DifferentialRevisionPHIDType::TYPECONST);
   } else {
     $xaction_phid = null;
   }
 
   $comment_phid = PhabricatorPHID::generateNewPHID(
     PhabricatorPHIDConstants::PHID_TYPE_XCMT,
-    DifferentialPHIDTypeRevision::TYPECONST);
+    DifferentialRevisionPHIDType::TYPECONST);
 
   queryfx(
     $conn_w,

resources/sql/patches/20131020.pxactionmig.php

@@ -47,7 +47,7 @@ foreach ($rows as $row) {
   }
 
   $xaction_phid = PhabricatorPHID::generateNewPHID(
-    PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
+    PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
     PhabricatorProjectPHIDTypeProject::TYPECONST);
 
   queryfx(

resources/sql/patches/20131106.diffphid.2.mig.php

@@ -20,7 +20,7 @@ foreach ($chunk_iter as $chunk) {
       continue;
     }
 
-    $type_diff = DifferentialPHIDTypeDiff::TYPECONST;
+    $type_diff = DifferentialDiffPHIDType::TYPECONST;
     $new_phid = PhabricatorPHID::generateNewPHID($type_diff);
 
     $sql[] = qsprintf(

resources/sql/patches/migrate-differential-dependencies.php

@@ -8,7 +8,7 @@ foreach (new LiskMigrationIterator($table) as $rev) {
   $id = $rev->getID();
   echo "Revision {$id}: ";
 
-  $deps = $rev->getAttachedPHIDs(DifferentialPHIDTypeRevision::TYPECONST);
+  $deps = $rev->getAttachedPHIDs(DifferentialRevisionPHIDType::TYPECONST);
   if (!$deps) {
     echo "-\n";
     continue;

resources/sql/patches/migrate-maniphest-dependencies.php

@@ -8,7 +8,7 @@ foreach (new LiskMigrationIterator($table) as $task) {
   $id = $task->getID();
   echo "Task {$id}: ";
 
-  $deps = $task->getAttachedPHIDs(ManiphestPHIDTypeTask::TYPECONST);
+  $deps = $task->getAttachedPHIDs(ManiphestTaskPHIDType::TYPECONST);
   if (!$deps) {
     echo "-\n";
     continue;

resources/sql/patches/migrate-maniphest-revisions.php

@@ -8,7 +8,7 @@ foreach (new LiskMigrationIterator($table) as $task) {
   $id = $task->getID();
   echo "Task {$id}: ";
 
-  $revs = $task->getAttachedPHIDs(DifferentialPHIDTypeRevision::TYPECONST);
+  $revs = $task->getAttachedPHIDs(DifferentialRevisionPHIDType::TYPECONST);
   if (!$revs) {
     echo "-\n";
     continue;

src/applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorAuthPHIDTypeAuthFactor extends PhabricatorPHIDType {
+final class PhabricatorAuthAuthFactorPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'AFTR';
 

src/applications/auth/storage/PhabricatorAuthFactorConfig.php

@@ -19,7 +19,7 @@ final class PhabricatorAuthFactorConfig extends PhabricatorAuthDAO {
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorAuthPHIDTypeAuthFactor::TYPECONST);
+      PhabricatorAuthAuthFactorPHIDType::TYPECONST);
   }
 
   public function getImplementation() {

src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorCalendarPHIDTypeEvent extends PhabricatorPHIDType {
+final class PhabricatorCalendarEventPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'CEVT';
 

src/applications/calendar/storage/PhabricatorCalendarEvent.php

@@ -42,7 +42,7 @@ final class PhabricatorCalendarEvent
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorCalendarPHIDTypeEvent::TYPECONST);
+      PhabricatorCalendarEventPHIDType::TYPECONST);
   }
 
   public function getTerseSummary(PhabricatorUser $viewer) {

src/applications/config/phid/PhabricatorConfigConfigPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorConfigPHIDTypeConfig extends PhabricatorPHIDType {
+final class PhabricatorConfigConfigPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'CONF';
 

src/applications/config/storage/PhabricatorConfigEntry.php

@@ -19,7 +19,7 @@ final class PhabricatorConfigEntry extends PhabricatorConfigEntryDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorConfigPHIDTypeConfig::TYPECONST);
+      PhabricatorConfigConfigPHIDType::TYPECONST);
   }
 
   public static function loadConfigEntry($key) {

src/applications/config/storage/PhabricatorConfigTransaction.php

@@ -10,7 +10,7 @@ final class PhabricatorConfigTransaction
   }
 
   public function getApplicationTransactionType() {
-    return PhabricatorConfigPHIDTypeConfig::TYPECONST;
+    return PhabricatorConfigConfigPHIDType::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {

src/applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorConpherencePHIDTypeThread extends PhabricatorPHIDType {
+final class PhabricatorConpherenceThreadPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'CONP';
 

src/applications/conpherence/storage/ConpherenceThread.php

@@ -32,7 +32,7 @@ final class ConpherenceThread extends ConpherenceDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorConpherencePHIDTypeThread::TYPECONST);
+      PhabricatorConpherenceThreadPHIDType::TYPECONST);
   }
 
   public function save() {

src/applications/conpherence/storage/ConpherenceTransaction.php

@@ -7,7 +7,7 @@ final class ConpherenceTransaction extends PhabricatorApplicationTransaction {
   }
 
   public function getApplicationTransactionType() {
-    return PhabricatorConpherencePHIDTypeThread::TYPECONST;
+    return PhabricatorConpherenceThreadPHIDType::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {

src/applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorCountdownPHIDTypeCountdown extends PhabricatorPHIDType {
+final class PhabricatorCountdownCountdownPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'CDWN';
 

src/applications/countdown/storage/PhabricatorCountdown.php

@@ -32,7 +32,7 @@ final class PhabricatorCountdown
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorCountdownPHIDTypeCountdown::TYPECONST);
+      PhabricatorCountdownCountdownPHIDType::TYPECONST);
   }
 
 

src/applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorDashboardPHIDTypeDashboard extends PhabricatorPHIDType {
+final class PhabricatorDashboardDashboardPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DSHB';
 

src/applications/dashboard/phid/PhabricatorDashboardPanelPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorDashboardPHIDTypePanel extends PhabricatorPHIDType {
+final class PhabricatorDashboardPanelPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DSHP';
 

src/applications/dashboard/storage/PhabricatorDashboard.php

@@ -43,7 +43,7 @@ final class PhabricatorDashboard extends PhabricatorDashboardDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorDashboardPHIDTypeDashboard::TYPECONST);
+      PhabricatorDashboardDashboardPHIDType::TYPECONST);
   }
 
   public function getLayoutConfigObject() {

src/applications/dashboard/storage/PhabricatorDashboardPanel.php

@@ -47,7 +47,7 @@ final class PhabricatorDashboardPanel
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorDashboardPHIDTypePanel::TYPECONST);
+      PhabricatorDashboardPanelPHIDType::TYPECONST);
   }
 
   public function getProperty($key, $default = null) {

src/applications/dashboard/storage/PhabricatorDashboardPanelTransaction.php

@@ -11,7 +11,7 @@ final class PhabricatorDashboardPanelTransaction
   }
 
   public function getApplicationTransactionType() {
-    return PhabricatorDashboardPHIDTypePanel::TYPECONST;
+    return PhabricatorDashboardPanelPHIDType::TYPECONST;
   }
 
   public function getTitle() {

src/applications/dashboard/storage/PhabricatorDashboardTransaction.php

@@ -11,7 +11,7 @@ final class PhabricatorDashboardTransaction
   }
 
   public function getApplicationTransactionType() {
-    return PhabricatorDashboardPHIDTypeDashboard::TYPECONST;
+    return PhabricatorDashboardDashboardPHIDType::TYPECONST;
   }
 
   public function getTitle() {

src/applications/differential/customfield/DifferentialAuditorsField.php

@@ -48,8 +48,8 @@ final class DifferentialAuditorsField
     return $this->parseObjectList(
       $value,
       array(
-        PhabricatorPeoplePHIDTypeUser::TYPECONST,
+        PhabricatorPeopleUserPHIDType::TYPECONST,
-        PhabricatorProjectPHIDTypeProject::TYPECONST,
+        PhabricatorProjectProjectPHIDType::TYPECONST,
       ));
   }
 
@@ -57,5 +57,4 @@ final class DifferentialAuditorsField
     return $this->renderObjectList($handles);
   }
 
-
 }

src/applications/differential/customfield/DifferentialManiphestTasksField.php

@@ -91,7 +91,7 @@ final class DifferentialManiphestTasksField
     return $this->parseObjectList(
       $value,
       array(
-        ManiphestPHIDTypeTask::TYPECONST,
+        ManiphestTaskPHIDType::TYPECONST,
       ));
   }
 

src/applications/differential/customfield/DifferentialProjectsField.php

@@ -106,7 +106,7 @@ final class DifferentialProjectsField
     return $this->parseObjectList(
       $value,
       array(
-        PhabricatorProjectPHIDTypeProject::TYPECONST,
+        PhabricatorProjectProjectPHIDType::TYPECONST,
       ));
   }
 

src/applications/differential/customfield/DifferentialReviewedByField.php

@@ -55,8 +55,8 @@ final class DifferentialReviewedByField
     return $this->parseObjectList(
       $value,
       array(
-        PhabricatorPeoplePHIDTypeUser::TYPECONST,
+        PhabricatorPeopleUserPHIDType::TYPECONST,
-        PhabricatorProjectPHIDTypeProject::TYPECONST,
+        PhabricatorProjectProjectPHIDType::TYPECONST,
       ),
       $allow_partial = true);
   }

src/applications/differential/customfield/DifferentialReviewersField.php

@@ -142,8 +142,8 @@ final class DifferentialReviewersField
     return $this->parseObjectList(
       $value,
       array(
-        PhabricatorPeoplePHIDTypeUser::TYPECONST,
+        PhabricatorPeopleUserPHIDType::TYPECONST,
-        PhabricatorProjectPHIDTypeProject::TYPECONST,
+        PhabricatorProjectProjectPHIDType::TYPECONST,
       ));
   }
 

src/applications/differential/customfield/DifferentialSubscribersField.php

@@ -79,9 +79,9 @@ final class DifferentialSubscribersField
     return $this->parseObjectList(
       $value,
       array(
-        PhabricatorPeoplePHIDTypeUser::TYPECONST,
+        PhabricatorPeopleUserPHIDType::TYPECONST,
-        PhabricatorProjectPHIDTypeProject::TYPECONST,
+        PhabricatorProjectProjectPHIDType::TYPECONST,
-        PhabricatorMailingListPHIDTypeList::TYPECONST,
+        PhabricatorMailingListListPHIDType::TYPECONST,
       ));
   }
 

src/applications/differential/phid/DifferentialDiffPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DifferentialPHIDTypeDiff extends PhabricatorPHIDType {
+final class DifferentialDiffPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DIFF';
 

src/applications/differential/phid/DifferentialRevisionPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DifferentialPHIDTypeRevision extends PhabricatorPHIDType {
+final class DifferentialRevisionPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DREV';
 

src/applications/differential/query/DifferentialRevisionQuery.php

@@ -1124,7 +1124,7 @@ final class DifferentialRevisionQuery
 
     // Find all the project reviewers which the user may have authority over.
     $project_phids = array();
-    $project_type = PhabricatorProjectPHIDTypeProject::TYPECONST;
+    $project_type = PhabricatorProjectProjectPHIDType::TYPECONST;
     $edge_type = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;
     foreach ($edges as $src => $types) {
       if (!$allow_self) {

src/applications/differential/query/DifferentialRevisionSearchEngine.php

@@ -35,7 +35,7 @@ final class DifferentialRevisionSearchEngine
         $request,
         'reviewers',
         array(
-          PhabricatorProjectPHIDTypeProject::TYPECONST,
+          PhabricatorProjectProjectPHIDType::TYPECONST,
         )));
 
     $saved->setParameter(

src/applications/differential/search/DifferentialSearchIndexer.php

@@ -24,7 +24,7 @@ final class DifferentialSearchIndexer
 
     $doc = new PhabricatorSearchAbstractDocument();
     $doc->setPHID($rev->getPHID());
-    $doc->setDocumentType(DifferentialPHIDTypeRevision::TYPECONST);
+    $doc->setDocumentType(DifferentialRevisionPHIDType::TYPECONST);
     $doc->setDocumentTitle($rev->getTitle());
     $doc->setDocumentCreated($rev->getDateCreated());
     $doc->setDocumentModified($rev->getDateModified());
@@ -32,7 +32,7 @@ final class DifferentialSearchIndexer
     $doc->addRelationship(
       PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
       $rev->getAuthorPHID(),
-      PhabricatorPeoplePHIDTypeUser::TYPECONST,
+      PhabricatorPeopleUserPHIDType::TYPECONST,
       $rev->getDateCreated());
 
     $doc->addRelationship(
@@ -40,7 +40,7 @@ final class DifferentialSearchIndexer
         ? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
         : PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
       $rev->getPHID(),
-      DifferentialPHIDTypeRevision::TYPECONST,
+      DifferentialRevisionPHIDType::TYPECONST,
       time());
 
     $this->indexTransactions(
@@ -58,14 +58,14 @@ final class DifferentialSearchIndexer
           $doc->addRelationship(
             PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
             $phid,
-            PhabricatorPeoplePHIDTypeUser::TYPECONST,
+            PhabricatorPeopleUserPHIDType::TYPECONST,
             $rev->getDateModified()); // Bogus timestamp.
         }
       } else {
         $doc->addRelationship(
           PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED,
           $rev->getPHID(),
-          PhabricatorPeoplePHIDTypeUser::TYPECONST,
+          PhabricatorPeopleUserPHIDType::TYPECONST,
           $rev->getDateModified()); // Bogus timestamp.
       }
     } else {

src/applications/differential/storage/DifferentialDiff.php

@@ -47,7 +47,7 @@ final class DifferentialDiff
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      DifferentialPHIDTypeDiff::TYPECONST);
+      DifferentialDiffPHIDType::TYPECONST);
   }
 
   public function addUnsavedChangeset(DifferentialChangeset $changeset) {

src/applications/differential/storage/DifferentialInlineComment.php

@@ -184,8 +184,8 @@ final class DifferentialInlineComment
   public function setCommentID($id) {
     $this->proxy->setTransactionPHID(
       PhabricatorPHID::generateNewPHID(
-        PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
+        PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
-        DifferentialPHIDTypeRevision::TYPECONST));
+        DifferentialRevisionPHIDType::TYPECONST));
     return $this;
   }
 

src/applications/differential/storage/DifferentialReviewer.php

@@ -26,7 +26,7 @@ final class DifferentialReviewer {
   }
 
   public function isUser() {
-    $user_type = PhabricatorPeoplePHIDTypeUser::TYPECONST;
+    $user_type = PhabricatorPeopleUserPHIDType::TYPECONST;
     return (phid_get_type($this->getReviewerPHID()) == $user_type);
   }
 

src/applications/differential/storage/DifferentialRevision.php

@@ -160,7 +160,7 @@ final class DifferentialRevision extends DifferentialDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      DifferentialPHIDTypeRevision::TYPECONST);
+      DifferentialRevisionPHIDType::TYPECONST);
   }
 
   public function loadActiveDiff() {

src/applications/differential/storage/DifferentialTransaction.php

@@ -24,7 +24,7 @@ final class DifferentialTransaction extends PhabricatorApplicationTransaction {
   }
 
   public function getApplicationTransactionType() {
-    return DifferentialPHIDTypeRevision::TYPECONST;
+    return DifferentialRevisionPHIDType::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {
@@ -42,7 +42,7 @@ final class DifferentialTransaction extends PhabricatorApplicationTransaction {
         // the new value is a PHID, indicating that this is a newer style
         // transaction.
         if ($old === null) {
-          if (phid_get_type($new) == DifferentialPHIDTypeDiff::TYPECONST) {
+          if (phid_get_type($new) == DifferentialDiffPHIDType::TYPECONST) {
             return true;
           }
         }
@@ -218,7 +218,7 @@ final class DifferentialTransaction extends PhabricatorApplicationTransaction {
       case self::TYPE_UPDATE:
         if ($new) {
           // TODO: Migrate to PHIDs and use handles here?
-          if (phid_get_type($new) == DifferentialPHIDTypeDiff::TYPECONST) {
+          if (phid_get_type($new) == DifferentialDiffPHIDType::TYPECONST) {
             return pht(
               '%s updated this revision to %s.',
               $author_handle,

src/applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php

@@ -1,7 +1,6 @@
 <?php
 
-final class DiffusionCommitRemarkupRule
+final class DiffusionCommitRemarkupRule extends PhabricatorRemarkupRuleObject {
-  extends PhabricatorRemarkupRuleObject {
 
   protected function getObjectNamePrefix() {
     return '';
@@ -12,7 +11,7 @@ final class DiffusionCommitRemarkupRule
   }
 
   protected function getObjectIDPattern() {
-    return PhabricatorRepositoryPHIDTypeCommit::getCommitObjectNamePattern();
+    return PhabricatorRepositoryCommitPHIDType::getCommitObjectNamePattern();
   }
 
   protected function loadObjects(array $ids) {

src/applications/diviner/phid/DivinerAtomPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DivinerPHIDTypeAtom extends PhabricatorPHIDType {
+final class DivinerAtomPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'ATOM';
 

src/applications/diviner/phid/DivinerBookPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DivinerPHIDTypeBook extends PhabricatorPHIDType {
+final class DivinerBookPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'BOOK';
 

src/applications/diviner/storage/DivinerLiveBook.php

@@ -27,7 +27,7 @@ final class DivinerLiveBook extends DivinerDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      DivinerPHIDTypeBook::TYPECONST);
+      DivinerBookPHIDType::TYPECONST);
   }
 
   public function getTitle() {

src/applications/diviner/storage/DivinerLiveSymbol.php

@@ -31,8 +31,7 @@ final class DivinerLiveSymbol extends DivinerDAO
   }
 
   public function generatePHID() {
-    return PhabricatorPHID::generateNewPHID(
+    return PhabricatorPHID::generateNewPHID(DivinerAtomPHIDType::TYPECONST);
-      DivinerPHIDTypeAtom::TYPECONST);
   }
 
   public function getBook() {

src/applications/drydock/phid/DrydockBlueprintPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DrydockPHIDTypeBlueprint extends PhabricatorPHIDType {
+final class DrydockBlueprintPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DRYB';
 

src/applications/drydock/phid/DrydockLeasePHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DrydockPHIDTypeLease extends PhabricatorPHIDType {
+final class DrydockLeasePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DRYL';
 

src/applications/drydock/phid/DrydockResourcePHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DrydockPHIDTypeResource extends PhabricatorPHIDType {
+final class DrydockResourcePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DRYR';
 

src/applications/drydock/storage/DrydockBlueprint.php

@@ -39,7 +39,7 @@ final class DrydockBlueprint extends DrydockDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      DrydockPHIDTypeBlueprint::TYPECONST);
+      DrydockBlueprintPHIDType::TYPECONST);
   }
 
   public function getImplementation() {

src/applications/drydock/storage/DrydockBlueprintTransaction.php

@@ -10,7 +10,7 @@ final class DrydockBlueprintTransaction
   }
 
   public function getApplicationTransactionType() {
-    return DrydockPHIDTypeBlueprint::TYPECONST;
+    return DrydockBlueprintPHIDType::TYPECONST;
   }
 
   public function getTitle() {

src/applications/drydock/storage/DrydockLease.php

@@ -56,7 +56,7 @@ final class DrydockLease extends DrydockDAO
   }
 
   public function generatePHID() {
-    return PhabricatorPHID::generateNewPHID(DrydockPHIDTypeLease::TYPECONST);
+    return PhabricatorPHID::generateNewPHID(DrydockLeasePHIDType::TYPECONST);
   }
 
   public function getInterface($type) {

src/applications/drydock/storage/DrydockResource.php

@@ -27,7 +27,7 @@ final class DrydockResource extends DrydockDAO
   }
 
   public function generatePHID() {
-    return PhabricatorPHID::generateNewPHID(DrydockPHIDTypeResource::TYPECONST);
+    return PhabricatorPHID::generateNewPHID(DrydockResourcePHIDType::TYPECONST);
   }
 
   public function getAttribute($key, $default = null) {

src/applications/feed/story/PhabricatorFeedStory.php

@@ -277,7 +277,7 @@ abstract class PhabricatorFeedStory implements PhabricatorPolicyInterface {
     // the '_top' target for framed feeds.
 
     $class = null;
-    if ($handle->getType() == PhabricatorPeoplePHIDTypeUser::TYPECONST) {
+    if ($handle->getType() == PhabricatorPeopleUserPHIDType::TYPECONST) {
       $class = 'phui-link-person';
     }
 

src/applications/files/management/PhabricatorFilesManagementWorkflow.php

@@ -18,7 +18,7 @@ abstract class PhabricatorFilesManagementWorkflow
       $query = id(new PhabricatorObjectQuery())
         ->setViewer($this->getViewer())
         ->withNames($names)
-        ->withTypes(array(PhabricatorFilePHIDTypeFile::TYPECONST));
+        ->withTypes(array(PhabricatorFileFilePHIDType::TYPECONST));
 
       $query->execute();
       $files = $query->getNamedResults();

src/applications/files/phid/PhabricatorFileFilePHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorFilePHIDTypeFile extends PhabricatorPHIDType {
+final class PhabricatorFileFilePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'FILE';
 

src/applications/files/storage/PhabricatorFile.php

@@ -43,7 +43,7 @@ final class PhabricatorFile extends PhabricatorFileDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorFilePHIDTypeFile::TYPECONST);
+      PhabricatorFileFilePHIDType::TYPECONST);
   }
 
   public function save() {

src/applications/files/storage/PhabricatorFileTransaction.php

@@ -8,7 +8,7 @@ final class PhabricatorFileTransaction
   }
 
   public function getApplicationTransactionType() {
-    return PhabricatorFilePHIDTypeFile::TYPECONST;
+    return PhabricatorFileFilePHIDType::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {

src/applications/harbormaster/phid/HarbormasterBuildItemPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class HarbormasterPHIDTypeBuildItem extends PhabricatorPHIDType {
+final class HarbormasterBuildItemPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMBI';
 

src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class HarbormasterPHIDTypeBuildLog extends PhabricatorPHIDType {
+final class HarbormasterBuildLogPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMCL';
 

src/applications/harbormaster/phid/HarbormasterBuildPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class HarbormasterPHIDTypeBuild extends PhabricatorPHIDType {
+final class HarbormasterBuildPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMBD';
 

src/applications/harbormaster/phid/HarbormasterBuildPlanPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class HarbormasterPHIDTypeBuildPlan extends PhabricatorPHIDType {
+final class HarbormasterBuildPlanPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMCP';
 

src/applications/harbormaster/phid/HarbormasterBuildStepPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class HarbormasterPHIDTypeBuildStep extends PhabricatorPHIDType {
+final class HarbormasterBuildStepPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMCS';
 

src/applications/harbormaster/phid/HarbormasterBuildTargetPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class HarbormasterPHIDTypeBuildTarget extends PhabricatorPHIDType {
+final class HarbormasterBuildTargetPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMBT';
 

src/applications/harbormaster/phid/HarbormasterBuildablePHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class HarbormasterPHIDTypeBuildable extends PhabricatorPHIDType {
+final class HarbormasterBuildablePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMBB';
 

src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php

@@ -18,14 +18,14 @@ final class HarbormasterBuildableSearchEngine
       $request,
       'revisions',
       array(
-        DifferentialPHIDTypeRevision::TYPECONST,
+        DifferentialRevisionPHIDType::TYPECONST,
       ));
 
     $repositories = $this->readPHIDsFromRequest(
       $request,
       'repositories',
       array(
-        PhabricatorRepositoryPHIDTypeRepository::TYPECONST,
+        PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
       ));
 
     $container_phids = array_merge($revisions, $repositories);
@@ -35,7 +35,7 @@ final class HarbormasterBuildableSearchEngine
       $request,
       'commits',
       array(
-        PhabricatorRepositoryPHIDTypeCommit::TYPECONST,
+        PhabricatorRepositoryCommitPHIDType::TYPECONST,
       ));
 
     $diffs = $this->readListFromRequest($request, 'diffs');

src/applications/harbormaster/storage/HarbormasterBuildTransaction.php

@@ -11,7 +11,7 @@ final class HarbormasterBuildTransaction
   }
 
   public function getApplicationTransactionType() {
-    return HarbormasterPHIDTypeBuild::TYPECONST;
+    return HarbormasterBuildPHIDType::TYPECONST;
   }
 
   public function getTitle() {

src/applications/harbormaster/storage/HarbormasterBuildable.php

@@ -160,7 +160,7 @@ final class HarbormasterBuildable extends HarbormasterDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      HarbormasterPHIDTypeBuildable::TYPECONST);
+      HarbormasterBuildablePHIDType::TYPECONST);
   }
 
   public function attachBuildableObject($buildable_object) {

src/applications/harbormaster/storage/HarbormasterBuildableTransaction.php

@@ -11,7 +11,7 @@ final class HarbormasterBuildableTransaction
   }
 
   public function getApplicationTransactionType() {
-    return HarbormasterPHIDTypeBuildable::TYPECONST;
+    return HarbormasterBuildablePHIDType::TYPECONST;
   }
 
   public function getTitle() {

src/applications/harbormaster/storage/build/HarbormasterBuild.php

@@ -136,7 +136,7 @@ final class HarbormasterBuild extends HarbormasterDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      HarbormasterPHIDTypeBuild::TYPECONST);
+      HarbormasterBuildPHIDType::TYPECONST);
   }
 
   public function attachBuildable(HarbormasterBuildable $buildable) {

src/applications/harbormaster/storage/build/HarbormasterBuildItem.php

@@ -12,7 +12,7 @@ final class HarbormasterBuildItem extends HarbormasterDAO {
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      HarbormasterPHIDTypeBuildItem::TYPECONST);
+      HarbormasterBuildItemPHIDType::TYPECONST);
   }
 
 }

src/applications/harbormaster/storage/build/HarbormasterBuildLog.php

@@ -35,7 +35,7 @@ final class HarbormasterBuildLog extends HarbormasterDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      HarbormasterPHIDTypeBuildLog::TYPECONST);
+      HarbormasterBuildLogPHIDType::TYPECONST);
   }
 
   public function attachBuildTarget(HarbormasterBuildTarget $build_target) {

src/applications/harbormaster/storage/build/HarbormasterBuildTarget.php

@@ -47,7 +47,7 @@ final class HarbormasterBuildTarget extends HarbormasterDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      HarbormasterPHIDTypeBuildTarget::TYPECONST);
+      HarbormasterBuildTargetPHIDType::TYPECONST);
   }
 
   public function attachBuild(HarbormasterBuild $build) {

src/applications/harbormaster/storage/configuration/HarbormasterBuildPlan.php

@@ -26,7 +26,7 @@ final class HarbormasterBuildPlan extends HarbormasterDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      HarbormasterPHIDTypeBuildPlan::TYPECONST);
+      HarbormasterBuildPlanPHIDType::TYPECONST);
   }
 
   public function attachBuildSteps(array $steps) {

src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php

@@ -11,7 +11,7 @@ final class HarbormasterBuildPlanTransaction
   }
 
   public function getApplicationTransactionType() {
-    return HarbormasterPHIDTypeBuildPlan::TYPECONST;
+    return HarbormasterBuildPlanPHIDType::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {

src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php

@@ -30,7 +30,7 @@ final class HarbormasterBuildStep extends HarbormasterDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      HarbormasterPHIDTypeBuildStep::TYPECONST);
+      HarbormasterBuildStepPHIDType::TYPECONST);
   }
 
   public function attachBuildPlan(HarbormasterBuildPlan $plan) {

src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php

@@ -11,7 +11,7 @@ final class HarbormasterBuildStepTransaction
   }
 
   public function getApplicationTransactionType() {
-    return HarbormasterPHIDTypeBuildStep::TYPECONST;
+    return HarbormasterBuildStepPHIDType::TYPECONST;
   }
 
   public function getTitle() {

src/applications/herald/controller/HeraldTranscriptController.php

@@ -297,7 +297,7 @@ final class HeraldTranscriptController extends HeraldController {
       $object_xscript = $xscript->getObjectTranscript();
       $handle = $handles[$object_xscript->getPHID()];
       if ($handle->getType() ==
-          PhabricatorRepositoryPHIDTypeCommit::TYPECONST) {
+          PhabricatorRepositoryCommitPHIDType::TYPECONST) {
         $commit = id(new DiffusionCommitQuery())
           ->setViewer($request->getUser())
           ->withPHIDs(array($handle->getPHID()))

src/applications/herald/phid/HeraldRulePHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class HeraldPHIDTypeRule extends PhabricatorPHIDType {
+final class HeraldRulePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HRUL';
 

src/applications/herald/storage/HeraldRule.php

@@ -35,7 +35,7 @@ final class HeraldRule extends HeraldDAO
   }
 
   public function generatePHID() {
-    return PhabricatorPHID::generateNewPHID(HeraldPHIDTypeRule::TYPECONST);
+    return PhabricatorPHID::generateNewPHID(HeraldRulePHIDType::TYPECONST);
   }
 
   public function getRuleApplied($phid) {

src/applications/herald/storage/HeraldRuleTransaction.php

@@ -11,7 +11,7 @@ final class HeraldRuleTransaction
   }
 
   public function getApplicationTransactionType() {
-    return HeraldPHIDTypeRule::TYPECONST;
+    return HeraldRulePHIDType::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {

src/applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorLegalpadPHIDTypeDocument extends PhabricatorPHIDType {
+final class PhabricatorLegalpadDocumentPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'LEGD';
 

src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php

@@ -31,7 +31,7 @@ final class LegalpadDocumentSignatureSearchEngine
         $request,
         'documents',
         array(
-          PhabricatorLegalpadPHIDTypeDocument::TYPECONST,
+          PhabricatorLegalpadDocumentPHIDType::TYPECONST,
         )));
 
     $saved->setParameter('nameContains', $request->getStr('nameContains'));

src/applications/legalpad/storage/LegalpadDocument.php

@@ -59,7 +59,7 @@ final class LegalpadDocument extends LegalpadDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorLegalpadPHIDTypeDocument::TYPECONST);
+      PhabricatorLegalpadDocumentPHIDType::TYPECONST);
   }
 
   public function getDocumentBody() {

src/applications/legalpad/storage/LegalpadTransaction.php

@@ -7,7 +7,7 @@ final class LegalpadTransaction extends PhabricatorApplicationTransaction {
   }
 
   public function getApplicationTransactionType() {
-    return PhabricatorLegalpadPHIDTypeDocument::TYPECONST;
+    return PhabricatorLegalpadDocumentPHIDType::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {

src/applications/macro/phid/PhabricatorMacroMacroPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorMacroPHIDTypeMacro extends PhabricatorPHIDType {
+final class PhabricatorMacroMacroPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'MCRO';
 

src/applications/macro/query/PhabricatorMacroQuery.php

@@ -175,7 +175,7 @@ final class PhabricatorMacroQuery
       }
       $flags = id(new PhabricatorFlagQuery())
         ->withOwnerPHIDs(array($this->getViewer()->getPHID()))
-        ->withTypes(array(PhabricatorMacroPHIDTypeMacro::TYPECONST))
+        ->withTypes(array(PhabricatorMacroMacroPHIDType::TYPECONST))
         ->withColors($flag_colors)
         ->setViewer($this->getViewer())
         ->execute();

src/applications/macro/storage/PhabricatorFileImageMacro.php

@@ -48,7 +48,7 @@ final class PhabricatorFileImageMacro extends PhabricatorFileDAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorMacroPHIDTypeMacro::TYPECONST);
+      PhabricatorMacroMacroPHIDType::TYPECONST);
   }
 
 

src/applications/macro/storage/PhabricatorMacroTransaction.php

@@ -12,7 +12,7 @@ final class PhabricatorMacroTransaction
   }
 
   public function getApplicationTransactionType() {
-    return PhabricatorMacroPHIDTypeMacro::TYPECONST;
+    return PhabricatorMacroMacroPHIDType::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {

src/applications/mailinglists/phid/PhabricatorMailingListListPHIDType.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorMailingListPHIDTypeList extends PhabricatorPHIDType {
+final class PhabricatorMailingListListPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'MLST';
 

src/applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php

@@ -11,7 +11,7 @@ final class PhabricatorMetaMTAMailingList extends PhabricatorMetaMTADAO
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
-      PhabricatorMailingListPHIDTypeList::TYPECONST);
+      PhabricatorMailingListListPHIDType::TYPECONST);
   }
 
   public function getConfiguration() {

src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php

@@ -102,7 +102,7 @@ abstract class ConduitAPI_maniphest_Method extends ConduitAPIMethod {
     if ($owner_phid !== null) {
       $this->validatePHIDList(
         array($owner_phid),
-        PhabricatorPeoplePHIDTypeUser::TYPECONST,
+        PhabricatorPeopleUserPHIDType::TYPECONST,
         'ownerPHID');
       $changes[ManiphestTransaction::TYPE_OWNER] = $owner_phid;
     }
@@ -111,7 +111,7 @@ abstract class ConduitAPI_maniphest_Method extends ConduitAPIMethod {
     if ($ccs !== null) {
       $this->validatePHIDList(
         $ccs,
-        PhabricatorPeoplePHIDTypeUser::TYPECONST,
+        PhabricatorPeopleUserPHIDType::TYPECONST,
         'ccPHIDS');
       $changes[ManiphestTransaction::TYPE_CCS] = $ccs;
     }
@@ -122,7 +122,7 @@ abstract class ConduitAPI_maniphest_Method extends ConduitAPIMethod {
     if ($project_phids !== null) {
       $this->validatePHIDList(
         $project_phids,
-        PhabricatorProjectPHIDTypeProject::TYPECONST,
+        PhabricatorProjectProjectPHIDType::TYPECONST,
         'projectPHIDS');
 
       $project_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;

src/applications/maniphest/controller/ManiphestTaskDetailController.php

@@ -647,7 +647,7 @@ final class ManiphestTaskDetailController extends ManiphestController {
       $attached = array();
     }
 
-    $file_infos = idx($attached, PhabricatorFilePHIDTypeFile::TYPECONST);
+    $file_infos = idx($attached, PhabricatorFileFilePHIDType::TYPECONST);
     if ($file_infos) {
       $file_phids = array_keys($file_infos);