Rename PhutilRemarkupRule subclasses

Summary: Ref T5655. Depends on D9993.

Test Plan: See D9993.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T5655

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

Author: joshuaspence

src/__phutil_library_map__.php

@@ -1,7 +1,7 @@
 <?php
 
 final class PhabricatorCountdownRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+  extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'C';

src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php

@@ -1,7 +1,7 @@
 <?php
 
 final class PhabricatorDashboardRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+  extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'W';

src/applications/dashboard/remarkup/PhabricatorDashboardRemarkupRule.php

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

src/applications/differential/remarkup/DifferentialRemarkupRule.php

@@ -125,8 +125,7 @@ protected function getResult(ConduitAPIRequest $request) {
         ->getOutput($markup_object, $markup_field);
 
       $engine = $markup_object->newMarkupEngine($markup_field);
-      $toc = PhutilRemarkupEngineRemarkupHeaderBlockRule::renderTableOfContents(
-        $engine);
+      $toc = PhutilRemarkupHeaderBlockRule::renderTableOfContents($engine);
       if ($toc) {
         $toc = phutil_tag_div(
           'phabricator-remarkup-toc',

src/applications/diffusion/conduit/DiffusionReadmeQueryConduitAPIMethod.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DiffusionCommitRemarkupRule extends PhabricatorRemarkupRuleObject {
+final class DiffusionCommitRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return '';

src/applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php

@@ -1,7 +1,7 @@
 <?php
 
 final class DiffusionRepositoryRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+  extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'r';

src/applications/diffusion/remarkup/DiffusionRepositoryRemarkupRule.php

@@ -45,7 +45,7 @@ public function getApplicationGroup() {
 
   public function getRemarkupRules() {
     return array(
-      new DivinerRemarkupRuleSymbol(),
+      new DivinerSymbolRemarkupRule(),
     );
   }
 

src/applications/diviner/application/PhabricatorDivinerApplication.php

@@ -115,7 +115,7 @@ public function processRequest() {
     $toc = $engine->getEngineMetadata(
       $symbol,
       $field,
-      PhutilRemarkupEngineRemarkupHeaderBlockRule::KEY_HEADER_TOC,
+      PhutilRemarkupHeaderBlockRule::KEY_HEADER_TOC,
       array());
 
     $document = id(new PHUIDocumentView())

src/applications/diviner/controller/DivinerAtomController.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DivinerRemarkupRuleSymbol extends PhutilRemarkupRule {
+final class DivinerSymbolRemarkupRule extends PhutilRemarkupRule {
 
   const KEY_RULE_ATOM_REF = 'rule.diviner.atomref';
 

src/applications/diviner/markup/DivinerRemarkupRuleSymbol.php renamed to src/applications/diviner/markup/DivinerSymbolRemarkupRule.php

@@ -1,7 +1,6 @@
 <?php
 
-abstract class DoorkeeperRemarkupRule
-  extends PhutilRemarkupRule {
+abstract class DoorkeeperRemarkupRule extends PhutilRemarkupRule {
 
   const KEY_TAGS = 'doorkeeper.tags';
 

src/applications/doorkeeper/remarkup/DoorkeeperRemarkupRule.php

@@ -36,7 +36,7 @@ public function canUninstall() {
 
   public function getRemarkupRules() {
     return array(
-      new PhabricatorRemarkupRuleEmbedFile(),
+      new PhabricatorEmbedFileRemarkupRule(),
     );
   }
 

src/applications/files/application/PhabricatorFilesApplication.php

@@ -1,7 +1,7 @@
 <?php
 
-final class PhabricatorRemarkupRuleEmbedFile
-  extends PhabricatorRemarkupRuleObject {
+final class PhabricatorEmbedFileRemarkupRule
+  extends PhabricatorObjectRemarkupRule {
 
   const KEY_EMBED_FILE_PHIDS = 'phabricator.embedded-file-phids';
 

src/applications/files/remarkup/PhabricatorRemarkupRuleEmbedFile.php renamed to src/applications/files/markup/PhabricatorEmbedFileRemarkupRule.php

@@ -1,7 +1,6 @@
 <?php
 
-final class HarbormasterRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class HarbormasterRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'B';

src/applications/harbormaster/remarkup/HarbormasterRemarkupRule.php

@@ -1,7 +1,6 @@
 <?php
 
-final class HeraldRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class HeraldRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'H';

src/applications/herald/remarkup/HeraldRemarkupRule.php

@@ -1,7 +1,6 @@
 <?php
 
-final class LegalpadDocumentRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class LegalpadDocumentRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'L';

src/applications/legalpad/remarkup/LegalpadDocumentRemarkupRule.php

@@ -44,7 +44,7 @@ public function getRoutes() {
 
   public function getRemarkupRules() {
     return array(
-      new PhabricatorRemarkupRuleIcon(),
+      new PhabricatorIconRemarkupRule(),
     );
   }
 

src/applications/macro/application/PhabricatorMacroApplication.php

@@ -1,7 +1,6 @@
 <?php
 
-final class PhabricatorRemarkupRuleIcon
-  extends PhutilRemarkupRule {
+final class PhabricatorIconRemarkupRule extends PhutilRemarkupRule {
 
   public function getPriority() {
     return 200.0;

src/applications/macro/remarkup/PhabricatorRemarkupRuleIcon.php renamed to src/applications/macro/markup/PhabricatorIconRemarkupRule.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorRemarkupRuleImageMacro extends PhutilRemarkupRule {
+final class PhabricatorImageMacroRemarkupRule extends PhutilRemarkupRule {
 
   private $macros;
 

src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php renamed to src/applications/macro/markup/PhabricatorImageMacroRemarkupRule.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorRemarkupRuleMeme extends PhutilRemarkupRule {
+final class PhabricatorMemeRemarkupRule extends PhutilRemarkupRule {
 
   private $images;
 

src/applications/macro/remarkup/PhabricatorRemarkupRuleMeme.php renamed to src/applications/macro/markup/PhabricatorMemeRemarkupRule.php

@@ -1,6 +1,6 @@
 <?php
 
-final class ManiphestRemarkupRule extends PhabricatorRemarkupRuleObject {
+final class ManiphestRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'T';

src/applications/maniphest/remarkup/ManiphestRemarkupRule.php

@@ -1,7 +1,6 @@
 <?php
 
-final class PassphraseRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class PassphraseRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'K';

src/applications/passphrase/remarkup/PassphraseRemarkupRule.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorPasteRemarkupRule extends PhabricatorRemarkupRuleObject {
+final class PhabricatorPasteRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'P';

src/applications/paste/remarkup/PhabricatorPasteRemarkupRule.php

@@ -72,7 +72,7 @@ public function getRoutes() {
 
   public function getRemarkupRules() {
     return array(
-      new PhabricatorRemarkupRuleMention(),
+      new PhabricatorMentionRemarkupRule(),
     );
   }
 

src/applications/people/application/PhabricatorPeopleApplication.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorRemarkupRuleMention extends PhutilRemarkupRule {
+final class PhabricatorMentionRemarkupRule extends PhutilRemarkupRule {
 
   const KEY_RULE_MENTION          = 'rule.mention';
   const KEY_RULE_MENTION_ORIGINAL = 'rule.mention.original';

src/applications/people/remarkup/PhabricatorRemarkupRuleMention.php renamed to src/applications/people/markup/PhabricatorMentionRemarkupRule.php

@@ -1,7 +1,6 @@
 <?php
 
-final class PholioRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class PholioRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'M';

src/applications/pholio/remarkup/PholioRemarkupRule.php

@@ -69,7 +69,7 @@ public function didMarkupText(
     $output,
     PhutilMarkupEngine $engine) {
 
-    $toc = PhutilRemarkupEngineRemarkupHeaderBlockRule::renderTableOfContents(
+    $toc = PhutilRemarkupHeaderBlockRule::renderTableOfContents(
       $engine);
 
     if ($toc) {

src/applications/phriction/remarkup/PhrictionRemarkupRule.php renamed to src/applications/phriction/markup/PhrictionRemarkupRule.php

@@ -1,7 +1,6 @@
 <?php
 
-final class PonderRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class PonderRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'Q';

src/applications/phriction/storage/PhrictionContent.php

@@ -1,7 +1,6 @@
 <?php
 
-final class ProjectRemarkupRule
-  extends PhabricatorRemarkupRuleObject {
+final class ProjectRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return '#';

src/applications/ponder/remarkup/PonderRemarkupRule.php

@@ -1,6 +1,6 @@
 <?php
 
-final class SlowvoteRemarkupRule extends PhabricatorRemarkupRuleObject {
+final class SlowvoteRemarkupRule extends PhabricatorObjectRemarkupRule {
 
   protected function getObjectNamePrefix() {
     return 'V';

src/applications/project/remarkup/ProjectRemarkupRule.php

@@ -1140,7 +1140,7 @@ private function expandRemarkupBlockTransactions(
         foreach ($xaction_blocks as $block) {
           $engine->markupText($block);
           $phids += $engine->getTextMetadata(
-            PhabricatorRemarkupRuleObject::KEY_MENTIONED_OBJECTS,
+            PhabricatorObjectRemarkupRule::KEY_MENTIONED_OBJECTS,
             array());
         }
       }

src/applications/slowvote/remarkup/SlowvoteRemarkupRule.php

@@ -440,14 +440,14 @@ public static function newMarkupEngine(array $options) {
       $options['syntax-highlighter.engine']);
 
     $rules = array();
-    $rules[] = new PhutilRemarkupRuleEscapeRemarkup();
-    $rules[] = new PhutilRemarkupRuleMonospace();
+    $rules[] = new PhutilRemarkupEscapeRemarkupRule();
+    $rules[] = new PhutilRemarkupMonospaceRule();
 
 
-    $rules[] = new PhutilRemarkupRuleDocumentLink();
+    $rules[] = new PhutilRemarkupDocumentLinkRule();
 
     if ($options['youtube']) {
-      $rules[] = new PhabricatorRemarkupRuleYoutube();
+      $rules[] = new PhabricatorYoutubeRemarkupRule();
     }
 
     $applications = PhabricatorApplication::getAllInstalledApplications();
@@ -457,35 +457,35 @@ public static function newMarkupEngine(array $options) {
       }
     }
 
-    $rules[] = new PhutilRemarkupRuleHyperlink();
+    $rules[] = new PhutilRemarkupHyperlinkRule();
 
     if ($options['macros']) {
-      $rules[] = new PhabricatorRemarkupRuleImageMacro();
-      $rules[] = new PhabricatorRemarkupRuleMeme();
+      $rules[] = new PhabricatorImageMacroRemarkupRule();
+      $rules[] = new PhabricatorMemeRemarkupRule();
     }
 
-    $rules[] = new PhutilRemarkupRuleBold();
-    $rules[] = new PhutilRemarkupRuleItalic();
-    $rules[] = new PhutilRemarkupRuleDel();
-    $rules[] = new PhutilRemarkupRuleUnderline();
+    $rules[] = new PhutilRemarkupBoldRule();
+    $rules[] = new PhutilRemarkupItalicRule();
+    $rules[] = new PhutilRemarkupDelRule();
+    $rules[] = new PhutilRemarkupUnderlineRule();
 
     foreach (self::loadCustomInlineRules() as $rule) {
       $rules[] = $rule;
     }
 
     $blocks = array();
-    $blocks[] = new PhutilRemarkupEngineRemarkupQuotesBlockRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupReplyBlockRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupLiteralBlockRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupHeaderBlockRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupHorizontalRuleBlockRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupListBlockRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupCodeBlockRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupNoteBlockRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupTableBlockRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupSimpleTableBlockRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupInterpreterRule();
-    $blocks[] = new PhutilRemarkupEngineRemarkupDefaultBlockRule();
+    $blocks[] = new PhutilRemarkupQuotesBlockRule();
+    $blocks[] = new PhutilRemarkupReplyBlockRule();
+    $blocks[] = new PhutilRemarkupLiteralBlockRule();
+    $blocks[] = new PhutilRemarkupHeaderBlockRule();
+    $blocks[] = new PhutilRemarkupHorizontalRuleBlockRule();
+    $blocks[] = new PhutilRemarkupListBlockRule();
+    $blocks[] = new PhutilRemarkupCodeBlockRule();
+    $blocks[] = new PhutilRemarkupNoteBlockRule();
+    $blocks[] = new PhutilRemarkupTableBlockRule();
+    $blocks[] = new PhutilRemarkupSimpleTableBlockRule();
+    $blocks[] = new PhutilRemarkupInterpreterBlockRule();
+    $blocks[] = new PhutilRemarkupDefaultBlockRule();
 
     foreach (self::loadCustomBlockRules() as $rule) {
       $blocks[] = $rule;
@@ -512,7 +512,7 @@ public static function extractPHIDsFromMentions(
     foreach ($content_blocks as $content_block) {
       $engine->markupText($content_block);
       $phids = $engine->getTextMetadata(
-        PhabricatorRemarkupRuleMention::KEY_MENTIONED,
+        PhabricatorMentionRemarkupRule::KEY_MENTIONED,
         array());
       $mentions += $phids;
     }
@@ -531,7 +531,7 @@ public static function extractFilePHIDsFromEmbeddedFiles(
     foreach ($content_blocks as $content_block) {
       $engine->markupText($content_block);
       $ids = $engine->getTextMetadata(
-        PhabricatorRemarkupRuleEmbedFile::KEY_EMBED_FILE_PHIDS,
+        PhabricatorEmbedFileRemarkupRule::KEY_EMBED_FILE_PHIDS,
         array());
       $files += $ids;
     }

src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorRemarkupBlockInterpreterCowsay
+final class PhabricatorRemarkupCowsayBlockInterpreter
   extends PhutilRemarkupBlockInterpreter {
 
   public function getInterpreterName() {

src/infrastructure/markup/PhabricatorMarkupEngine.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorRemarkupBlockInterpreterFiglet
+final class PhabricatorRemarkupFigletBlockInterpreter
   extends PhutilRemarkupBlockInterpreter {
 
   public function getInterpreterName() {

src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterCowsay.php renamed to src/infrastructure/markup/interpreter/PhabricatorRemarkupCowsayBlockInterpreter.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorRemarkupBlockInterpreterGraphviz
+final class PhabricatorRemarkupGraphvizBlockInterpreter
   extends PhutilRemarkupBlockInterpreter {
 
   public function getInterpreterName() {
@@ -47,7 +47,7 @@ public function markupContent($content, array $argv) {
       ));
   }
 
-  // TODO: This is duplicated from PhabricatorRemarkupRuleEmbedFile since they
+  // TODO: This is duplicated from PhabricatorEmbedFileRemarkupRule since they
   // do not share a base class.
   private function parseDimension($string) {
     $string = trim($string);

src/infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterFiglet.php renamed to src/infrastructure/markup/interpreter/PhabricatorRemarkupFigletBlockInterpreter.php

@@ -1,7 +1,6 @@
 <?php
 
-abstract class PhabricatorRemarkupRuleObject
-  extends PhutilRemarkupRule {
+abstract class PhabricatorObjectRemarkupRule extends PhutilRemarkupRule {
 
   const KEY_RULE_OBJECT = 'rule.object';
   const KEY_MENTIONED_OBJECTS = 'rule.object.mentioned';