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.

Rename "QuickSearch" Engine/EngineExtension to "Datasource"

Summary: Ref T13079. This recently-introduced Engine/EngineExtension are a good fit for adding more datasource functions in general, but we didn't think quite big enough in naming them.

Test Plan: Used quick search typeahead, hit applications/users/monograms/symbols/etc.

Maniphest Tasks: T13079

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

epriestley abe5fd57 a4053bb5

+94 -85
+15 -13
src/__phutil_library_map__.php
··· 716 716 'DiffusionController' => 'applications/diffusion/controller/DiffusionController.php', 717 717 'DiffusionCreateRepositoriesCapability' => 'applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php', 718 718 'DiffusionDaemonLockException' => 'applications/diffusion/exception/DiffusionDaemonLockException.php', 719 + 'DiffusionDatasourceEngineExtension' => 'applications/diffusion/engineextension/DiffusionDatasourceEngineExtension.php', 719 720 'DiffusionDefaultEditCapability' => 'applications/diffusion/capability/DiffusionDefaultEditCapability.php', 720 721 'DiffusionDefaultPushCapability' => 'applications/diffusion/capability/DiffusionDefaultPushCapability.php', 721 722 'DiffusionDefaultViewCapability' => 'applications/diffusion/capability/DiffusionDefaultViewCapability.php', ··· 844 845 'DiffusionQueryCommitsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php', 845 846 'DiffusionQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php', 846 847 'DiffusionQueryPathsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php', 847 - 'DiffusionQuickSearchEngineExtension' => 'applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php', 848 848 'DiffusionRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionRawDiffQuery.php', 849 849 'DiffusionRawDiffQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionRawDiffQueryConduitAPIMethod.php', 850 850 'DiffusionReadmeView' => 'applications/diffusion/view/DiffusionReadmeView.php', ··· 2745 2745 'PhabricatorDatabaseRef' => 'infrastructure/cluster/PhabricatorDatabaseRef.php', 2746 2746 'PhabricatorDatabaseRefParser' => 'infrastructure/cluster/PhabricatorDatabaseRefParser.php', 2747 2747 'PhabricatorDatabaseSetupCheck' => 'applications/config/check/PhabricatorDatabaseSetupCheck.php', 2748 + 'PhabricatorDatasourceApplicationEngineExtension' => 'applications/meta/engineextension/PhabricatorDatasourceApplicationEngineExtension.php', 2748 2749 'PhabricatorDatasourceEditField' => 'applications/transactions/editfield/PhabricatorDatasourceEditField.php', 2749 2750 'PhabricatorDatasourceEditType' => 'applications/transactions/edittype/PhabricatorDatasourceEditType.php', 2751 + 'PhabricatorDatasourceEngine' => 'applications/search/engine/PhabricatorDatasourceEngine.php', 2752 + 'PhabricatorDatasourceEngineExtension' => 'applications/search/engineextension/PhabricatorDatasourceEngineExtension.php', 2750 2753 'PhabricatorDateFormatSetting' => 'applications/settings/setting/PhabricatorDateFormatSetting.php', 2751 2754 'PhabricatorDateTimeSettingsPanel' => 'applications/settings/panel/PhabricatorDateTimeSettingsPanel.php', 2752 2755 'PhabricatorDebugController' => 'applications/system/controller/PhabricatorDebugController.php', ··· 3316 3319 'PhabricatorMetronomicTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorMetronomicTriggerClock.php', 3317 3320 'PhabricatorModularTransaction' => 'applications/transactions/storage/PhabricatorModularTransaction.php', 3318 3321 'PhabricatorModularTransactionType' => 'applications/transactions/storage/PhabricatorModularTransactionType.php', 3319 - 'PhabricatorMonogramQuickSearchEngineExtension' => 'applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php', 3322 + 'PhabricatorMonogramDatasourceEngineExtension' => 'applications/typeahead/engineextension/PhabricatorMonogramDatasourceEngineExtension.php', 3320 3323 'PhabricatorMonospacedFontSetting' => 'applications/settings/setting/PhabricatorMonospacedFontSetting.php', 3321 3324 'PhabricatorMonospacedTextareasSetting' => 'applications/settings/setting/PhabricatorMonospacedTextareasSetting.php', 3322 3325 'PhabricatorMotivatorProfileMenuItem' => 'applications/search/menuitem/PhabricatorMotivatorProfileMenuItem.php', ··· 3615 3618 'PhabricatorPeopleCreateController' => 'applications/people/controller/PhabricatorPeopleCreateController.php', 3616 3619 'PhabricatorPeopleCreateGuidanceContext' => 'applications/people/guidance/PhabricatorPeopleCreateGuidanceContext.php', 3617 3620 'PhabricatorPeopleDatasource' => 'applications/people/typeahead/PhabricatorPeopleDatasource.php', 3621 + 'PhabricatorPeopleDatasourceEngineExtension' => 'applications/people/engineextension/PhabricatorPeopleDatasourceEngineExtension.php', 3618 3622 'PhabricatorPeopleDeleteController' => 'applications/people/controller/PhabricatorPeopleDeleteController.php', 3619 3623 'PhabricatorPeopleDetailsProfileMenuItem' => 'applications/people/menuitem/PhabricatorPeopleDetailsProfileMenuItem.php', 3620 3624 'PhabricatorPeopleDisableController' => 'applications/people/controller/PhabricatorPeopleDisableController.php', ··· 3647 3651 'PhabricatorPeopleProfileTasksController' => 'applications/people/controller/PhabricatorPeopleProfileTasksController.php', 3648 3652 'PhabricatorPeopleProfileViewController' => 'applications/people/controller/PhabricatorPeopleProfileViewController.php', 3649 3653 'PhabricatorPeopleQuery' => 'applications/people/query/PhabricatorPeopleQuery.php', 3650 - 'PhabricatorPeopleQuickSearchEngineExtension' => 'applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php', 3651 3654 'PhabricatorPeopleRenameController' => 'applications/people/controller/PhabricatorPeopleRenameController.php', 3652 3655 'PhabricatorPeopleRevisionsProfileMenuItem' => 'applications/people/menuitem/PhabricatorPeopleRevisionsProfileMenuItem.php', 3653 3656 'PhabricatorPeopleSearchEngine' => 'applications/people/query/PhabricatorPeopleSearchEngine.php', ··· 3910 3913 'PhabricatorQueryOrderItem' => 'infrastructure/query/order/PhabricatorQueryOrderItem.php', 3911 3914 'PhabricatorQueryOrderTestCase' => 'infrastructure/query/order/__tests__/PhabricatorQueryOrderTestCase.php', 3912 3915 'PhabricatorQueryOrderVector' => 'infrastructure/query/order/PhabricatorQueryOrderVector.php', 3913 - 'PhabricatorQuickSearchApplicationEngineExtension' => 'applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php', 3914 - 'PhabricatorQuickSearchEngine' => 'applications/search/engine/PhabricatorQuickSearchEngine.php', 3915 3916 'PhabricatorQuickSearchEngineExtension' => 'applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php', 3916 3917 'PhabricatorRateLimitRequestExceptionHandler' => 'aphront/handler/PhabricatorRateLimitRequestExceptionHandler.php', 3917 3918 'PhabricatorRecaptchaConfigOptions' => 'applications/config/option/PhabricatorRecaptchaConfigOptions.php', ··· 4950 4951 'ProjectConduitAPIMethod' => 'applications/project/conduit/ProjectConduitAPIMethod.php', 4951 4952 'ProjectCreateConduitAPIMethod' => 'applications/project/conduit/ProjectCreateConduitAPIMethod.php', 4952 4953 'ProjectCreateProjectsCapability' => 'applications/project/capability/ProjectCreateProjectsCapability.php', 4954 + 'ProjectDatasourceEngineExtension' => 'applications/project/engineextension/ProjectDatasourceEngineExtension.php', 4953 4955 'ProjectDefaultEditCapability' => 'applications/project/capability/ProjectDefaultEditCapability.php', 4954 4956 'ProjectDefaultJoinCapability' => 'applications/project/capability/ProjectDefaultJoinCapability.php', 4955 4957 'ProjectDefaultViewCapability' => 'applications/project/capability/ProjectDefaultViewCapability.php', 4956 4958 'ProjectEditConduitAPIMethod' => 'applications/project/conduit/ProjectEditConduitAPIMethod.php', 4957 4959 'ProjectQueryConduitAPIMethod' => 'applications/project/conduit/ProjectQueryConduitAPIMethod.php', 4958 - 'ProjectQuickSearchEngineExtension' => 'applications/project/engineextension/ProjectQuickSearchEngineExtension.php', 4959 4960 'ProjectRemarkupRule' => 'applications/project/remarkup/ProjectRemarkupRule.php', 4960 4961 'ProjectRemarkupRuleTestCase' => 'applications/project/remarkup/__tests__/ProjectRemarkupRuleTestCase.php', 4961 4962 'ProjectReplyHandler' => 'applications/project/mail/ProjectReplyHandler.php', ··· 5901 5902 'DiffusionController' => 'PhabricatorController', 5902 5903 'DiffusionCreateRepositoriesCapability' => 'PhabricatorPolicyCapability', 5903 5904 'DiffusionDaemonLockException' => 'Exception', 5905 + 'DiffusionDatasourceEngineExtension' => 'PhabricatorDatasourceEngineExtension', 5904 5906 'DiffusionDefaultEditCapability' => 'PhabricatorPolicyCapability', 5905 5907 'DiffusionDefaultPushCapability' => 'PhabricatorPolicyCapability', 5906 5908 'DiffusionDefaultViewCapability' => 'PhabricatorPolicyCapability', ··· 6032 6034 'DiffusionQueryCommitsConduitAPIMethod' => 'DiffusionConduitAPIMethod', 6033 6035 'DiffusionQueryConduitAPIMethod' => 'DiffusionConduitAPIMethod', 6034 6036 'DiffusionQueryPathsConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod', 6035 - 'DiffusionQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension', 6036 6037 'DiffusionRawDiffQuery' => 'DiffusionFileFutureQuery', 6037 6038 'DiffusionRawDiffQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod', 6038 6039 'DiffusionReadmeView' => 'DiffusionView', ··· 8254 8255 'PhabricatorDatabaseRef' => 'Phobject', 8255 8256 'PhabricatorDatabaseRefParser' => 'Phobject', 8256 8257 'PhabricatorDatabaseSetupCheck' => 'PhabricatorSetupCheck', 8258 + 'PhabricatorDatasourceApplicationEngineExtension' => 'PhabricatorDatasourceEngineExtension', 8257 8259 'PhabricatorDatasourceEditField' => 'PhabricatorTokenizerEditField', 8258 8260 'PhabricatorDatasourceEditType' => 'PhabricatorPHIDListEditType', 8261 + 'PhabricatorDatasourceEngine' => 'Phobject', 8262 + 'PhabricatorDatasourceEngineExtension' => 'Phobject', 8259 8263 'PhabricatorDateFormatSetting' => 'PhabricatorSelectSetting', 8260 8264 'PhabricatorDateTimeSettingsPanel' => 'PhabricatorEditEngineSettingsPanel', 8261 8265 'PhabricatorDebugController' => 'PhabricatorController', ··· 8880 8884 'PhabricatorMetronomicTriggerClock' => 'PhabricatorTriggerClock', 8881 8885 'PhabricatorModularTransaction' => 'PhabricatorApplicationTransaction', 8882 8886 'PhabricatorModularTransactionType' => 'Phobject', 8883 - 'PhabricatorMonogramQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension', 8887 + 'PhabricatorMonogramDatasourceEngineExtension' => 'PhabricatorDatasourceEngineExtension', 8884 8888 'PhabricatorMonospacedFontSetting' => 'PhabricatorStringSetting', 8885 8889 'PhabricatorMonospacedTextareasSetting' => 'PhabricatorSelectSetting', 8886 8890 'PhabricatorMotivatorProfileMenuItem' => 'PhabricatorProfileMenuItem', ··· 9248 9252 'PhabricatorPeopleCreateController' => 'PhabricatorPeopleController', 9249 9253 'PhabricatorPeopleCreateGuidanceContext' => 'PhabricatorGuidanceContext', 9250 9254 'PhabricatorPeopleDatasource' => 'PhabricatorTypeaheadDatasource', 9255 + 'PhabricatorPeopleDatasourceEngineExtension' => 'PhabricatorDatasourceEngineExtension', 9251 9256 'PhabricatorPeopleDeleteController' => 'PhabricatorPeopleController', 9252 9257 'PhabricatorPeopleDetailsProfileMenuItem' => 'PhabricatorProfileMenuItem', 9253 9258 'PhabricatorPeopleDisableController' => 'PhabricatorPeopleController', ··· 9280 9285 'PhabricatorPeopleProfileTasksController' => 'PhabricatorPeopleProfileController', 9281 9286 'PhabricatorPeopleProfileViewController' => 'PhabricatorPeopleProfileController', 9282 9287 'PhabricatorPeopleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 9283 - 'PhabricatorPeopleQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension', 9284 9288 'PhabricatorPeopleRenameController' => 'PhabricatorPeopleController', 9285 9289 'PhabricatorPeopleRevisionsProfileMenuItem' => 'PhabricatorProfileMenuItem', 9286 9290 'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine', ··· 9598 9602 'Phobject', 9599 9603 'Iterator', 9600 9604 ), 9601 - 'PhabricatorQuickSearchApplicationEngineExtension' => 'PhabricatorQuickSearchEngineExtension', 9602 - 'PhabricatorQuickSearchEngine' => 'Phobject', 9603 - 'PhabricatorQuickSearchEngineExtension' => 'Phobject', 9605 + 'PhabricatorQuickSearchEngineExtension' => 'PhabricatorDatasourceEngineExtension', 9604 9606 'PhabricatorRateLimitRequestExceptionHandler' => 'PhabricatorRequestExceptionHandler', 9605 9607 'PhabricatorRecaptchaConfigOptions' => 'PhabricatorApplicationConfigOptions', 9606 9608 'PhabricatorRedirectController' => 'PhabricatorController', ··· 10893 10895 'ProjectConduitAPIMethod' => 'ConduitAPIMethod', 10894 10896 'ProjectCreateConduitAPIMethod' => 'ProjectConduitAPIMethod', 10895 10897 'ProjectCreateProjectsCapability' => 'PhabricatorPolicyCapability', 10898 + 'ProjectDatasourceEngineExtension' => 'PhabricatorDatasourceEngineExtension', 10896 10899 'ProjectDefaultEditCapability' => 'PhabricatorPolicyCapability', 10897 10900 'ProjectDefaultJoinCapability' => 'PhabricatorPolicyCapability', 10898 10901 'ProjectDefaultViewCapability' => 'PhabricatorPolicyCapability', 10899 10902 'ProjectEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod', 10900 10903 'ProjectQueryConduitAPIMethod' => 'ProjectConduitAPIMethod', 10901 - 'ProjectQuickSearchEngineExtension' => 'PhabricatorQuickSearchEngineExtension', 10902 10904 'ProjectRemarkupRule' => 'PhabricatorObjectRemarkupRule', 10903 10905 'ProjectRemarkupRuleTestCase' => 'PhabricatorTestCase', 10904 10906 'ProjectReplyHandler' => 'PhabricatorApplicationTransactionReplyHandler',
+2 -2
src/applications/diffusion/engineextension/DiffusionQuickSearchEngineExtension.php src/applications/diffusion/engineextension/DiffusionDatasourceEngineExtension.php
··· 1 1 <?php 2 2 3 - final class DiffusionQuickSearchEngineExtension 4 - extends PhabricatorQuickSearchEngineExtension { 3 + final class DiffusionDatasourceEngineExtension 4 + extends PhabricatorDatasourceEngineExtension { 5 5 6 6 public function newQuickSearchDatasources() { 7 7 return array(
+11
src/applications/meta/engineextension/PhabricatorDatasourceApplicationEngineExtension.php
··· 1 + <?php 2 + 3 + final class PhabricatorDatasourceApplicationEngineExtension 4 + extends PhabricatorDatasourceEngineExtension { 5 + 6 + public function newQuickSearchDatasources() { 7 + return array( 8 + new PhabricatorApplicationDatasource(), 9 + ); 10 + } 11 + }
-11
src/applications/meta/engineextension/PhabricatorQuickSearchApplicationEngineExtension.php
··· 1 - <?php 2 - 3 - final class PhabricatorQuickSearchApplicationEngineExtension 4 - extends PhabricatorQuickSearchEngineExtension { 5 - 6 - public function newQuickSearchDatasources() { 7 - return array( 8 - new PhabricatorApplicationDatasource(), 9 - ); 10 - } 11 - }
+11
src/applications/people/engineextension/PhabricatorPeopleDatasourceEngineExtension.php
··· 1 + <?php 2 + 3 + final class PhabricatorPeopleDatasourceEngineExtension 4 + extends PhabricatorDatasourceEngineExtension { 5 + 6 + public function newQuickSearchDatasources() { 7 + return array( 8 + new PhabricatorPeopleDatasource(), 9 + ); 10 + } 11 + }
-11
src/applications/people/engineextension/PhabricatorPeopleQuickSearchEngineExtension.php
··· 1 - <?php 2 - 3 - final class PhabricatorPeopleQuickSearchEngineExtension 4 - extends PhabricatorQuickSearchEngineExtension { 5 - 6 - public function newQuickSearchDatasources() { 7 - return array( 8 - new PhabricatorPeopleDatasource(), 9 - ); 10 - } 11 - }
+11
src/applications/project/engineextension/ProjectDatasourceEngineExtension.php
··· 1 + <?php 2 + 3 + final class ProjectDatasourceEngineExtension 4 + extends PhabricatorDatasourceEngineExtension { 5 + 6 + public function newQuickSearchDatasources() { 7 + return array( 8 + new PhabricatorProjectDatasource(), 9 + ); 10 + } 11 + }
-11
src/applications/project/engineextension/ProjectQuickSearchEngineExtension.php
··· 1 - <?php 2 - 3 - final class ProjectQuickSearchEngineExtension 4 - extends PhabricatorQuickSearchEngineExtension { 5 - 6 - public function newQuickSearchDatasources() { 7 - return array( 8 - new PhabricatorProjectDatasource(), 9 - ); 10 - } 11 - }
+8
src/applications/search/engine/PhabricatorDatasourceEngine.php
··· 1 + <?php 2 + 3 + final class PhabricatorDatasourceEngine extends Phobject { 4 + 5 + public function getAllQuickSearchDatasources() { 6 + return PhabricatorDatasourceEngineExtension::getAllQuickSearchDatasources(); 7 + } 8 + }
-8
src/applications/search/engine/PhabricatorQuickSearchEngine.php
··· 1 - <?php 2 - 3 - final class PhabricatorQuickSearchEngine extends Phobject { 4 - 5 - public function getAllDatasources() { 6 - return PhabricatorQuickSearchEngineExtension::getAllDatasources(); 7 - } 8 - }
+19
src/applications/search/engineextension/PhabricatorDatasourceEngineExtension.php
··· 1 + <?php 2 + 3 + abstract class PhabricatorDatasourceEngineExtension extends Phobject { 4 + 5 + abstract public function newQuickSearchDatasources(); 6 + 7 + final public static function getAllQuickSearchDatasources() { 8 + $extensions = id(new PhutilClassMapQuery()) 9 + ->setAncestorClass(__CLASS__) 10 + ->execute(); 11 + 12 + $datasources = array(); 13 + foreach ($extensions as $extension) { 14 + $datasources[] = $extension->newQuickSearchDatasources(); 15 + } 16 + 17 + return array_mergev($datasources); 18 + } 19 + }
+4 -16
src/applications/search/engineextension/PhabricatorQuickSearchEngineExtension.php
··· 1 1 <?php 2 2 3 - abstract class PhabricatorQuickSearchEngineExtension extends Phobject { 4 - 5 - abstract public function newQuickSearchDatasources(); 6 - 7 - final public static function getAllDatasources() { 8 - $extensions = id(new PhutilClassMapQuery()) 9 - ->setAncestorClass(__CLASS__) 10 - ->execute(); 11 - 12 - $datasources = array(); 13 - foreach ($extensions as $extension) { 14 - $datasources[] = $extension->newQuickSearchDatasources(); 15 - } 16 - return array_mergev($datasources); 17 - } 18 - } 3 + // TODO: This is an older name "PhabricatorDatasourceEngineExtension" purely 4 + // to preserve compatibility that should be removed soon. 5 + abstract class PhabricatorQuickSearchEngineExtension 6 + extends PhabricatorDatasourceEngineExtension {}
+2 -2
src/applications/search/typeahead/PhabricatorSearchDatasource.php
··· 16 16 } 17 17 18 18 public function getComponentDatasources() { 19 - $sources = id(new PhabricatorQuickSearchEngine()) 20 - ->getAllDatasources(); 19 + $sources = id(new PhabricatorDatasourceEngine()) 20 + ->getAllQuickSearchDatasources(); 21 21 22 22 // These results are always rendered in the full browse display mode, so 23 23 // set the browse flag on all component sources.
+11
src/applications/typeahead/engineextension/PhabricatorMonogramDatasourceEngineExtension.php
··· 1 + <?php 2 + 3 + final class PhabricatorMonogramDatasourceEngineExtension 4 + extends PhabricatorDatasourceEngineExtension { 5 + 6 + public function newQuickSearchDatasources() { 7 + return array( 8 + new PhabricatorTypeaheadMonogramDatasource(), 9 + ); 10 + } 11 + }
-11
src/applications/typeahead/engineextension/PhabricatorMonogramQuickSearchEngineExtension.php
··· 1 - <?php 2 - 3 - final class PhabricatorMonogramQuickSearchEngineExtension 4 - extends PhabricatorQuickSearchEngineExtension { 5 - 6 - public function newQuickSearchDatasources() { 7 - return array( 8 - new PhabricatorTypeaheadMonogramDatasource(), 9 - ); 10 - } 11 - }