recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Pre-prepare for hovercards

Summary:
D5120 and followups refactor and generalize object references in Remarkup -- notably, they move remarkup rules from a central location to the implementing applications.

Preserve blame by doing moves/renames only first. This change moves application remarkup rules into those applications, and renames the ones D5120 modifies.

Test Plan: Typed some preview text into a textarea, got a valid Remarkup render.

Reviewers: vrana, chad

Reviewed By: vrana

CC: aran

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

epriestley fe500f42 1b8ac077

+34 -34
+20 -20
src/__phutil_library_map__.php
··· 320 320 'DifferentialPathFieldSpecification' => 'applications/differential/field/specification/DifferentialPathFieldSpecification.php', 321 321 'DifferentialPeopleMenuEventListener' => 'applications/differential/events/DifferentialPeopleMenuEventListener.php', 322 322 'DifferentialPrimaryPaneView' => 'applications/differential/view/DifferentialPrimaryPaneView.php', 323 + 'DifferentialRemarkupRule' => 'applications/differential/remarkup/DifferentialRemarkupRule.php', 323 324 'DifferentialReplyHandler' => 'applications/differential/DifferentialReplyHandler.php', 324 325 'DifferentialResultsTableView' => 'applications/differential/view/DifferentialResultsTableView.php', 325 326 'DifferentialRevertPlanFieldSpecification' => 'applications/differential/field/specification/DifferentialRevertPlanFieldSpecification.php', ··· 435 436 'DiffusionPeopleMenuEventListener' => 'applications/diffusion/events/DiffusionPeopleMenuEventListener.php', 436 437 'DiffusionQuery' => 'applications/diffusion/query/DiffusionQuery.php', 437 438 'DiffusionRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionRawDiffQuery.php', 439 + 'DiffusionRemarkupRule' => 'applications/diffusion/remarkup/DiffusionRemarkupRule.php', 438 440 'DiffusionRenameHistoryQuery' => 'applications/diffusion/query/DiffusionRenameHistoryQuery.php', 439 441 'DiffusionRepositoryController' => 'applications/diffusion/controller/DiffusionRepositoryController.php', 440 442 'DiffusionRepositoryPath' => 'applications/diffusion/data/DiffusionRepositoryPath.php', ··· 584 586 'ManiphestEdgeEventListener' => 'applications/maniphest/event/ManiphestEdgeEventListener.php', 585 587 'ManiphestExportController' => 'applications/maniphest/controller/ManiphestExportController.php', 586 588 'ManiphestPeopleMenuEventListener' => 'applications/maniphest/event/ManiphestPeopleMenuEventListener.php', 589 + 'ManiphestRemarkupRule' => 'applications/maniphest/remarkup/ManiphestRemarkupRule.php', 587 590 'ManiphestReplyHandler' => 'applications/maniphest/ManiphestReplyHandler.php', 588 591 'ManiphestReportController' => 'applications/maniphest/controller/ManiphestReportController.php', 589 592 'ManiphestSavedQuery' => 'applications/maniphest/storage/ManiphestSavedQuery.php', ··· 809 812 'PhabricatorCountdownDeleteController' => 'applications/countdown/controller/PhabricatorCountdownDeleteController.php', 810 813 'PhabricatorCountdownEditController' => 'applications/countdown/controller/PhabricatorCountdownEditController.php', 811 814 'PhabricatorCountdownListController' => 'applications/countdown/controller/PhabricatorCountdownListController.php', 815 + 'PhabricatorCountdownRemarkupRule' => 'applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php', 812 816 'PhabricatorCountdownViewController' => 'applications/countdown/controller/PhabricatorCountdownViewController.php', 813 817 'PhabricatorCrumbView' => 'view/layout/PhabricatorCrumbView.php', 814 818 'PhabricatorCrumbsView' => 'view/layout/PhabricatorCrumbsView.php', ··· 1122 1126 'PhabricatorPasteEditController' => 'applications/paste/controller/PhabricatorPasteEditController.php', 1123 1127 'PhabricatorPasteListController' => 'applications/paste/controller/PhabricatorPasteListController.php', 1124 1128 'PhabricatorPasteQuery' => 'applications/paste/query/PhabricatorPasteQuery.php', 1129 + 'PhabricatorPasteRemarkupRule' => 'applications/paste/remarkup/PhabricatorPasteRemarkupRule.php', 1125 1130 'PhabricatorPasteViewController' => 'applications/paste/controller/PhabricatorPasteViewController.php', 1126 1131 'PhabricatorPeopleController' => 'applications/people/controller/PhabricatorPeopleController.php', 1127 1132 'PhabricatorPeopleEditController' => 'applications/people/controller/PhabricatorPeopleEditController.php', ··· 1176 1181 'PhabricatorRedirectController' => 'applications/base/controller/PhabricatorRedirectController.php', 1177 1182 'PhabricatorRefreshCSRFController' => 'applications/auth/controller/PhabricatorRefreshCSRFController.php', 1178 1183 'PhabricatorRemarkupControl' => 'view/form/control/PhabricatorRemarkupControl.php', 1179 - 'PhabricatorRemarkupRuleCountdown' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleCountdown.php', 1180 - 'PhabricatorRemarkupRuleDifferential' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleDifferential.php', 1181 - 'PhabricatorRemarkupRuleDifferentialHandle' => 'infrastructure/markup/rule/handle/PhabricatorRemarkupRuleDifferentialHandle.php', 1182 - 'PhabricatorRemarkupRuleDiffusion' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleDiffusion.php', 1183 - 'PhabricatorRemarkupRuleEmbedFile' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php', 1184 - 'PhabricatorRemarkupRuleImageMacro' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php', 1185 - 'PhabricatorRemarkupRuleManiphest' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleManiphest.php', 1186 - 'PhabricatorRemarkupRuleManiphestHandle' => 'infrastructure/markup/rule/handle/PhabricatorRemarkupRuleManiphestHandle.php', 1187 - 'PhabricatorRemarkupRuleMeme' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleMeme.php', 1188 - 'PhabricatorRemarkupRuleMention' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleMention.php', 1184 + 'PhabricatorRemarkupRuleDifferentialHandle' => 'applications/differential/remarkup/PhabricatorRemarkupRuleDifferentialHandle.php', 1185 + 'PhabricatorRemarkupRuleEmbedFile' => 'applications/files/remarkup/PhabricatorRemarkupRuleEmbedFile.php', 1186 + 'PhabricatorRemarkupRuleImageMacro' => 'applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php', 1187 + 'PhabricatorRemarkupRuleManiphestHandle' => 'applications/maniphest/remarkup/PhabricatorRemarkupRuleManiphestHandle.php', 1188 + 'PhabricatorRemarkupRuleMeme' => 'applications/macro/remarkup/PhabricatorRemarkupRuleMeme.php', 1189 + 'PhabricatorRemarkupRuleMention' => 'applications/people/remarkup/PhabricatorRemarkupRuleMention.php', 1189 1190 'PhabricatorRemarkupRuleObjectHandle' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleObjectHandle.php', 1190 1191 'PhabricatorRemarkupRuleObjectName' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleObjectName.php', 1191 - 'PhabricatorRemarkupRulePaste' => 'infrastructure/markup/rule/PhabricatorRemarkupRulePaste.php', 1192 - 'PhabricatorRemarkupRulePhriction' => 'infrastructure/markup/rule/PhabricatorRemarkupRulePhriction.php', 1193 1192 'PhabricatorRemarkupRuleYoutube' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php', 1194 1193 'PhabricatorRepository' => 'applications/repository/storage/PhabricatorRepository.php', 1195 1194 'PhabricatorRepositoryArcanistProject' => 'applications/repository/storage/PhabricatorRepositoryArcanistProject.php', ··· 1491 1490 'PhrictionHistoryController' => 'applications/phriction/controller/PhrictionHistoryController.php', 1492 1491 'PhrictionListController' => 'applications/phriction/controller/PhrictionListController.php', 1493 1492 'PhrictionNewController' => 'applications/phriction/controller/PhrictionNewController.php', 1493 + 'PhrictionRemarkupRule' => 'applications/phriction/remarkup/PhrictionRemarkupRule.php', 1494 1494 'PhrictionSearchIndexer' => 'applications/phriction/search/PhrictionSearchIndexer.php', 1495 1495 'PonderAddAnswerView' => 'applications/ponder/view/PonderAddAnswerView.php', 1496 1496 'PonderAddCommentView' => 'applications/ponder/view/PonderAddCommentView.php', ··· 1523 1523 'PonderQuestionQuery' => 'applications/ponder/query/PonderQuestionQuery.php', 1524 1524 'PonderQuestionSummaryView' => 'applications/ponder/view/PonderQuestionSummaryView.php', 1525 1525 'PonderQuestionViewController' => 'applications/ponder/controller/PonderQuestionViewController.php', 1526 + 'PonderRemarkupRule' => 'applications/ponder/remarkup/PonderRemarkupRule.php', 1526 1527 'PonderReplyHandler' => 'applications/ponder/PonderReplyHandler.php', 1527 - 'PonderRuleQuestion' => 'infrastructure/markup/rule/PonderRuleQuestion.php', 1528 1528 'PonderSearchIndexer' => 'applications/ponder/search/PonderSearchIndexer.php', 1529 1529 'PonderUserProfileView' => 'applications/ponder/view/PonderUserProfileView.php', 1530 1530 'PonderVotableInterface' => 'applications/ponder/storage/PonderVotableInterface.php', ··· 1852 1852 'DifferentialPathFieldSpecification' => 'DifferentialFieldSpecification', 1853 1853 'DifferentialPeopleMenuEventListener' => 'PhutilEventListener', 1854 1854 'DifferentialPrimaryPaneView' => 'AphrontView', 1855 + 'DifferentialRemarkupRule' => 'PhabricatorRemarkupRuleObjectName', 1855 1856 'DifferentialReplyHandler' => 'PhabricatorMailReplyHandler', 1856 1857 'DifferentialResultsTableView' => 'AphrontView', 1857 1858 'DifferentialRevertPlanFieldSpecification' => 'DifferentialFieldSpecification', ··· 1953 1954 'DiffusionPathValidateController' => 'DiffusionController', 1954 1955 'DiffusionPeopleMenuEventListener' => 'PhutilEventListener', 1955 1956 'DiffusionRawDiffQuery' => 'DiffusionQuery', 1957 + 'DiffusionRemarkupRule' => 'PhabricatorRemarkupRuleObjectName', 1956 1958 'DiffusionRepositoryController' => 'DiffusionController', 1957 1959 'DiffusionSetupException' => 'AphrontUsageException', 1958 1960 'DiffusionSvnBrowseQuery' => 'DiffusionBrowseQuery', ··· 2070 2072 'ManiphestEdgeEventListener' => 'PhutilEventListener', 2071 2073 'ManiphestExportController' => 'ManiphestController', 2072 2074 'ManiphestPeopleMenuEventListener' => 'PhutilEventListener', 2075 + 'ManiphestRemarkupRule' => 'PhabricatorRemarkupRuleObjectName', 2073 2076 'ManiphestReplyHandler' => 'PhabricatorMailReplyHandler', 2074 2077 'ManiphestReportController' => 'ManiphestController', 2075 2078 'ManiphestSavedQuery' => 'ManiphestDAO', ··· 2313 2316 'PhabricatorCountdownDeleteController' => 'PhabricatorCountdownController', 2314 2317 'PhabricatorCountdownEditController' => 'PhabricatorCountdownController', 2315 2318 'PhabricatorCountdownListController' => 'PhabricatorCountdownController', 2319 + 'PhabricatorCountdownRemarkupRule' => 'PhutilRemarkupRule', 2316 2320 'PhabricatorCountdownViewController' => 'PhabricatorCountdownController', 2317 2321 'PhabricatorCrumbView' => 'AphrontView', 2318 2322 'PhabricatorCrumbsView' => 'AphrontView', ··· 2601 2605 'PhabricatorPasteEditController' => 'PhabricatorPasteController', 2602 2606 'PhabricatorPasteListController' => 'PhabricatorPasteController', 2603 2607 'PhabricatorPasteQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 2608 + 'PhabricatorPasteRemarkupRule' => 'PhabricatorRemarkupRuleObjectName', 2604 2609 'PhabricatorPasteViewController' => 'PhabricatorPasteController', 2605 2610 'PhabricatorPeopleController' => 'PhabricatorController', 2606 2611 'PhabricatorPeopleEditController' => 'PhabricatorPeopleController', ··· 2652 2657 'PhabricatorRedirectController' => 'PhabricatorController', 2653 2658 'PhabricatorRefreshCSRFController' => 'PhabricatorAuthController', 2654 2659 'PhabricatorRemarkupControl' => 'AphrontFormTextAreaControl', 2655 - 'PhabricatorRemarkupRuleCountdown' => 'PhutilRemarkupRule', 2656 - 'PhabricatorRemarkupRuleDifferential' => 'PhabricatorRemarkupRuleObjectName', 2657 2660 'PhabricatorRemarkupRuleDifferentialHandle' => 'PhabricatorRemarkupRuleObjectHandle', 2658 - 'PhabricatorRemarkupRuleDiffusion' => 'PhabricatorRemarkupRuleObjectName', 2659 2661 'PhabricatorRemarkupRuleEmbedFile' => 'PhutilRemarkupRule', 2660 2662 'PhabricatorRemarkupRuleImageMacro' => 'PhutilRemarkupRule', 2661 - 'PhabricatorRemarkupRuleManiphest' => 'PhabricatorRemarkupRuleObjectName', 2662 2663 'PhabricatorRemarkupRuleManiphestHandle' => 'PhabricatorRemarkupRuleObjectHandle', 2663 2664 'PhabricatorRemarkupRuleMeme' => 'PhutilRemarkupRule', 2664 2665 'PhabricatorRemarkupRuleMention' => 'PhutilRemarkupRule', 2665 2666 'PhabricatorRemarkupRuleObjectHandle' => 'PhutilRemarkupRule', 2666 2667 'PhabricatorRemarkupRuleObjectName' => 'PhutilRemarkupRule', 2667 - 'PhabricatorRemarkupRulePaste' => 'PhabricatorRemarkupRuleObjectName', 2668 - 'PhabricatorRemarkupRulePhriction' => 'PhutilRemarkupRule', 2669 2668 'PhabricatorRemarkupRuleYoutube' => 'PhutilRemarkupRule', 2670 2669 'PhabricatorRepository' => 2671 2670 array( ··· 2984 2983 'PhrictionHistoryController' => 'PhrictionController', 2985 2984 'PhrictionListController' => 'PhrictionController', 2986 2985 'PhrictionNewController' => 'PhrictionController', 2986 + 'PhrictionRemarkupRule' => 'PhutilRemarkupRule', 2987 2987 'PhrictionSearchIndexer' => 'PhabricatorSearchDocumentIndexer', 2988 2988 'PonderAddAnswerView' => 'AphrontView', 2989 2989 'PonderAddCommentView' => 'AphrontView', ··· 3030 3030 'PonderQuestionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 3031 3031 'PonderQuestionSummaryView' => 'AphrontView', 3032 3032 'PonderQuestionViewController' => 'PonderController', 3033 + 'PonderRemarkupRule' => 'PhabricatorRemarkupRuleObjectName', 3033 3034 'PonderReplyHandler' => 'PhabricatorMailReplyHandler', 3034 - 'PonderRuleQuestion' => 'PhabricatorRemarkupRuleObjectName', 3035 3035 'PonderSearchIndexer' => 'PhabricatorSearchDocumentIndexer', 3036 3036 'PonderUserProfileView' => 'AphrontView', 3037 3037 'PonderVotableView' => 'AphrontView',
+7 -7
src/infrastructure/markup/PhabricatorMarkupEngine.php
··· 398 398 } 399 399 400 400 $rules[] = new PhutilRemarkupRuleHyperlink(); 401 - $rules[] = new PhabricatorRemarkupRulePhriction(); 401 + $rules[] = new PhrictionRemarkupRule(); 402 402 403 403 $rules[] = new PhabricatorRemarkupRuleDifferentialHandle(); 404 404 if (PhabricatorEnv::getEnvConfig('maniphest.enabled')) { ··· 407 407 408 408 $rules[] = new PhabricatorRemarkupRuleEmbedFile(); 409 409 410 - $rules[] = new PhabricatorRemarkupRuleDifferential(); 411 - $rules[] = new PhabricatorRemarkupRuleDiffusion(); 410 + $rules[] = new DifferentialRemarkupRule(); 411 + $rules[] = new DiffusionRemarkupRule(); 412 412 if (PhabricatorEnv::getEnvConfig('maniphest.enabled')) { 413 - $rules[] = new PhabricatorRemarkupRuleManiphest(); 413 + $rules[] = new ManiphestRemarkupRule(); 414 414 } 415 - $rules[] = new PhabricatorRemarkupRulePaste(); 415 + $rules[] = new PhabricatorPasteRemarkupRule(); 416 416 417 - $rules[] = new PhabricatorRemarkupRuleCountdown(); 417 + $rules[] = new PhabricatorCountdownRemarkupRule(); 418 418 419 - $rules[] = new PonderRuleQuestion(); 419 + $rules[] = new PonderRemarkupRule(); 420 420 421 421 if ($options['macros']) { 422 422 $rules[] = new PhabricatorRemarkupRuleImageMacro();
+1 -1
src/infrastructure/markup/rule/PhabricatorRemarkupRuleCountdown.php src/applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php
··· 3 3 /** 4 4 * @group markup 5 5 */ 6 - final class PhabricatorRemarkupRuleCountdown extends PhutilRemarkupRule { 6 + final class PhabricatorCountdownRemarkupRule extends PhutilRemarkupRule { 7 7 8 8 const KEY_RULE_COUNTDOWN = 'rule.countdown'; 9 9
+1 -1
src/infrastructure/markup/rule/PhabricatorRemarkupRuleDifferential.php src/applications/differential/remarkup/DifferentialRemarkupRule.php
··· 3 3 /** 4 4 * @group markup 5 5 */ 6 - final class PhabricatorRemarkupRuleDifferential 6 + final class DifferentialRemarkupRule 7 7 extends PhabricatorRemarkupRuleObjectName { 8 8 9 9 protected function getObjectNamePrefix() {
+1 -1
src/infrastructure/markup/rule/PhabricatorRemarkupRuleDiffusion.php src/applications/diffusion/remarkup/DiffusionRemarkupRule.php
··· 3 3 /** 4 4 * @group markup 5 5 */ 6 - final class PhabricatorRemarkupRuleDiffusion 6 + final class DiffusionRemarkupRule 7 7 extends PhabricatorRemarkupRuleObjectName { 8 8 9 9 protected function getObjectNamePrefix() {
src/infrastructure/markup/rule/PhabricatorRemarkupRuleEmbedFile.php src/applications/files/remarkup/PhabricatorRemarkupRuleEmbedFile.php
src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php src/applications/macro/remarkup/PhabricatorRemarkupRuleImageMacro.php
+1 -1
src/infrastructure/markup/rule/PhabricatorRemarkupRuleManiphest.php src/applications/maniphest/remarkup/ManiphestRemarkupRule.php
··· 3 3 /** 4 4 * @group markup 5 5 */ 6 - final class PhabricatorRemarkupRuleManiphest 6 + final class ManiphestRemarkupRule 7 7 extends PhabricatorRemarkupRuleObjectName { 8 8 9 9 protected function getObjectNamePrefix() {
src/infrastructure/markup/rule/PhabricatorRemarkupRuleMeme.php src/applications/macro/remarkup/PhabricatorRemarkupRuleMeme.php
src/infrastructure/markup/rule/PhabricatorRemarkupRuleMention.php src/applications/people/remarkup/PhabricatorRemarkupRuleMention.php
+1 -1
src/infrastructure/markup/rule/PhabricatorRemarkupRulePaste.php src/applications/paste/remarkup/PhabricatorPasteRemarkupRule.php
··· 3 3 /** 4 4 * @group markup 5 5 */ 6 - final class PhabricatorRemarkupRulePaste 6 + final class PhabricatorPasteRemarkupRule 7 7 extends PhabricatorRemarkupRuleObjectName { 8 8 9 9 protected function getObjectNamePrefix() {
+1 -1
src/infrastructure/markup/rule/PhabricatorRemarkupRulePhriction.php src/applications/phriction/remarkup/PhrictionRemarkupRule.php
··· 3 3 /** 4 4 * @group markup 5 5 */ 6 - final class PhabricatorRemarkupRulePhriction 6 + final class PhrictionRemarkupRule 7 7 extends PhutilRemarkupRule { 8 8 9 9 public function apply($text) {
+1 -1
src/infrastructure/markup/rule/PonderRuleQuestion.php src/applications/ponder/remarkup/PonderRemarkupRule.php
··· 3 3 /** 4 4 * @group markup 5 5 */ 6 - final class PonderRuleQuestion 6 + final class PonderRemarkupRule 7 7 extends PhabricatorRemarkupRuleObjectName { 8 8 9 9 protected function getObjectNamePrefix() {
src/infrastructure/markup/rule/handle/PhabricatorRemarkupRuleDifferentialHandle.php src/applications/differential/remarkup/PhabricatorRemarkupRuleDifferentialHandle.php
src/infrastructure/markup/rule/handle/PhabricatorRemarkupRuleManiphestHandle.php src/applications/maniphest/remarkup/PhabricatorRemarkupRuleManiphestHandle.php