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.

Move some PhabricatorSearchField subclasses

Summary: Move some `PhabricatorSearchField` subclasses to be adjacent to the application to which they belong. This seems generally better to me than lumping them all together in the `src/applications/search/field/` directory. I was also wondering if it makes sense to rename these subclasses as `PhabricatorXSearchField` rather than `PhabricatorSearchXField` (as per T5655), but wasn't really sure if these objects are meant to be search-fields, or just fields belonging to the #search application.

Test Plan: N/A.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin

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

Joshua Spence acb1eb81 ab7dc13c

+25 -25
+9 -9
src/__phutil_library_map__.php
··· 2240 2240 'PhabricatorOwnersPackageTransactionQuery' => 'applications/owners/query/PhabricatorOwnersPackageTransactionQuery.php', 2241 2241 'PhabricatorOwnersPath' => 'applications/owners/storage/PhabricatorOwnersPath.php', 2242 2242 'PhabricatorOwnersPathsController' => 'applications/owners/controller/PhabricatorOwnersPathsController.php', 2243 + 'PhabricatorOwnersSearchField' => 'applications/owners/searchfield/PhabricatorOwnersSearchField.php', 2243 2244 'PhabricatorPHDConfigOptions' => 'applications/config/option/PhabricatorPHDConfigOptions.php', 2244 2245 'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php', 2245 2246 'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php', ··· 2416 2417 'PhabricatorProjectQuery' => 'applications/project/query/PhabricatorProjectQuery.php', 2417 2418 'PhabricatorProjectSchemaSpec' => 'applications/project/storage/PhabricatorProjectSchemaSpec.php', 2418 2419 'PhabricatorProjectSearchEngine' => 'applications/project/query/PhabricatorProjectSearchEngine.php', 2420 + 'PhabricatorProjectSearchField' => 'applications/project/searchfield/PhabricatorProjectSearchField.php', 2419 2421 'PhabricatorProjectSearchIndexer' => 'applications/project/search/PhabricatorProjectSearchIndexer.php', 2420 2422 'PhabricatorProjectSlug' => 'applications/project/storage/PhabricatorProjectSlug.php', 2421 2423 'PhabricatorProjectStandardCustomField' => 'applications/project/customfield/PhabricatorProjectStandardCustomField.php', ··· 2588 2590 'PhabricatorSearchManagementWorkflow' => 'applications/search/management/PhabricatorSearchManagementWorkflow.php', 2589 2591 'PhabricatorSearchOrderController' => 'applications/search/controller/PhabricatorSearchOrderController.php', 2590 2592 'PhabricatorSearchOrderField' => 'applications/search/field/PhabricatorSearchOrderField.php', 2591 - 'PhabricatorSearchOwnersField' => 'applications/search/field/PhabricatorSearchOwnersField.php', 2592 2593 'PhabricatorSearchPreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorSearchPreferencesSettingsPanel.php', 2593 - 'PhabricatorSearchProjectsField' => 'applications/search/field/PhabricatorSearchProjectsField.php', 2594 2594 'PhabricatorSearchRelationship' => 'applications/search/constants/PhabricatorSearchRelationship.php', 2595 2595 'PhabricatorSearchResultView' => 'applications/search/view/PhabricatorSearchResultView.php', 2596 2596 'PhabricatorSearchSelectController' => 'applications/search/controller/PhabricatorSearchSelectController.php', 2597 2597 'PhabricatorSearchSelectField' => 'applications/search/field/PhabricatorSearchSelectField.php', 2598 - 'PhabricatorSearchSpacesField' => 'applications/search/field/PhabricatorSearchSpacesField.php', 2599 2598 'PhabricatorSearchStringListField' => 'applications/search/field/PhabricatorSearchStringListField.php', 2600 2599 'PhabricatorSearchSubscribersField' => 'applications/search/field/PhabricatorSearchSubscribersField.php', 2601 2600 'PhabricatorSearchTextField' => 'applications/search/field/PhabricatorSearchTextField.php', 2602 2601 'PhabricatorSearchThreeStateField' => 'applications/search/field/PhabricatorSearchThreeStateField.php', 2603 2602 'PhabricatorSearchTokenizerField' => 'applications/search/field/PhabricatorSearchTokenizerField.php', 2604 - 'PhabricatorSearchUsersField' => 'applications/search/field/PhabricatorSearchUsersField.php', 2605 2603 'PhabricatorSearchWorker' => 'applications/search/worker/PhabricatorSearchWorker.php', 2606 2604 'PhabricatorSecurityConfigOptions' => 'applications/config/option/PhabricatorSecurityConfigOptions.php', 2607 2605 'PhabricatorSecuritySetupCheck' => 'applications/config/check/PhabricatorSecuritySetupCheck.php', ··· 2664 2662 'PhabricatorSpacesNoAccessController' => 'applications/spaces/controller/PhabricatorSpacesNoAccessController.php', 2665 2663 'PhabricatorSpacesRemarkupRule' => 'applications/spaces/remarkup/PhabricatorSpacesRemarkupRule.php', 2666 2664 'PhabricatorSpacesSchemaSpec' => 'applications/spaces/storage/PhabricatorSpacesSchemaSpec.php', 2665 + 'PhabricatorSpacesSearchField' => 'applications/spaces/searchfield/PhabricatorSpacesSearchField.php', 2667 2666 'PhabricatorSpacesTestCase' => 'applications/spaces/__tests__/PhabricatorSpacesTestCase.php', 2668 2667 'PhabricatorSpacesViewController' => 'applications/spaces/controller/PhabricatorSpacesViewController.php', 2669 2668 'PhabricatorStandardCustomField' => 'infrastructure/customfield/standard/PhabricatorStandardCustomField.php', ··· 2814 2813 'PhabricatorUserRealNameField' => 'applications/people/customfield/PhabricatorUserRealNameField.php', 2815 2814 'PhabricatorUserRolesField' => 'applications/people/customfield/PhabricatorUserRolesField.php', 2816 2815 'PhabricatorUserSchemaSpec' => 'applications/people/storage/PhabricatorUserSchemaSpec.php', 2817 - 'PhabricatorUserSearchIndexer' => 'applications/people/search/PhabricatorUserSearchIndexer.php', 2816 + 'PhabricatorUserSearchIndexer' => 'applications/people/searchfield/PhabricatorUserSearchIndexer.php', 2818 2817 'PhabricatorUserSinceField' => 'applications/people/customfield/PhabricatorUserSinceField.php', 2819 2818 'PhabricatorUserStatusField' => 'applications/people/customfield/PhabricatorUserStatusField.php', 2820 2819 'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php', 2821 2820 'PhabricatorUserTitleField' => 'applications/people/customfield/PhabricatorUserTitleField.php', 2822 2821 'PhabricatorUserTransaction' => 'applications/people/storage/PhabricatorUserTransaction.php', 2823 2822 'PhabricatorUsersPolicyRule' => 'applications/policy/rule/PhabricatorUsersPolicyRule.php', 2823 + 'PhabricatorUsersSearchField' => 'applications/people/search/PhabricatorUserSearchField.php', 2824 2824 'PhabricatorVCSResponse' => 'applications/repository/response/PhabricatorVCSResponse.php', 2825 2825 'PhabricatorVeryWowEnglishTranslation' => 'infrastructure/internationalization/translation/PhabricatorVeryWowEnglishTranslation.php', 2826 2826 'PhabricatorViewerDatasource' => 'applications/people/typeahead/PhabricatorViewerDatasource.php', ··· 5939 5939 'PhabricatorOwnersPackageTransactionQuery' => 'PhabricatorApplicationTransactionQuery', 5940 5940 'PhabricatorOwnersPath' => 'PhabricatorOwnersDAO', 5941 5941 'PhabricatorOwnersPathsController' => 'PhabricatorOwnersController', 5942 + 'PhabricatorOwnersSearchField' => 'PhabricatorSearchTokenizerField', 5942 5943 'PhabricatorPHDConfigOptions' => 'PhabricatorApplicationConfigOptions', 5943 5944 'PhabricatorPHID' => 'Phobject', 5944 5945 'PhabricatorPHIDConstants' => 'Phobject', ··· 6151 6152 'PhabricatorProjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 6152 6153 'PhabricatorProjectSchemaSpec' => 'PhabricatorConfigSchemaSpec', 6153 6154 'PhabricatorProjectSearchEngine' => 'PhabricatorApplicationSearchEngine', 6155 + 'PhabricatorProjectSearchField' => 'PhabricatorSearchTokenizerField', 6154 6156 'PhabricatorProjectSearchIndexer' => 'PhabricatorSearchDocumentIndexer', 6155 6157 'PhabricatorProjectSlug' => 'PhabricatorProjectDAO', 6156 6158 'PhabricatorProjectStandardCustomField' => array( ··· 6370 6372 'PhabricatorSearchManagementWorkflow' => 'PhabricatorManagementWorkflow', 6371 6373 'PhabricatorSearchOrderController' => 'PhabricatorSearchBaseController', 6372 6374 'PhabricatorSearchOrderField' => 'PhabricatorSearchField', 6373 - 'PhabricatorSearchOwnersField' => 'PhabricatorSearchTokenizerField', 6374 6375 'PhabricatorSearchPreferencesSettingsPanel' => 'PhabricatorSettingsPanel', 6375 - 'PhabricatorSearchProjectsField' => 'PhabricatorSearchTokenizerField', 6376 6376 'PhabricatorSearchRelationship' => 'Phobject', 6377 6377 'PhabricatorSearchResultView' => 'AphrontView', 6378 6378 'PhabricatorSearchSelectController' => 'PhabricatorSearchBaseController', 6379 6379 'PhabricatorSearchSelectField' => 'PhabricatorSearchField', 6380 - 'PhabricatorSearchSpacesField' => 'PhabricatorSearchTokenizerField', 6381 6380 'PhabricatorSearchStringListField' => 'PhabricatorSearchField', 6382 6381 'PhabricatorSearchSubscribersField' => 'PhabricatorSearchTokenizerField', 6383 6382 'PhabricatorSearchTextField' => 'PhabricatorSearchField', 6384 6383 'PhabricatorSearchThreeStateField' => 'PhabricatorSearchField', 6385 6384 'PhabricatorSearchTokenizerField' => 'PhabricatorSearchField', 6386 - 'PhabricatorSearchUsersField' => 'PhabricatorSearchTokenizerField', 6387 6385 'PhabricatorSearchWorker' => 'PhabricatorWorker', 6388 6386 'PhabricatorSecurityConfigOptions' => 'PhabricatorApplicationConfigOptions', 6389 6387 'PhabricatorSecuritySetupCheck' => 'PhabricatorSetupCheck', ··· 6460 6458 'PhabricatorSpacesNoAccessController' => 'PhabricatorSpacesController', 6461 6459 'PhabricatorSpacesRemarkupRule' => 'PhabricatorObjectRemarkupRule', 6462 6460 'PhabricatorSpacesSchemaSpec' => 'PhabricatorConfigSchemaSpec', 6461 + 'PhabricatorSpacesSearchField' => 'PhabricatorSearchTokenizerField', 6463 6462 'PhabricatorSpacesTestCase' => 'PhabricatorTestCase', 6464 6463 'PhabricatorSpacesViewController' => 'PhabricatorSpacesController', 6465 6464 'PhabricatorStandardCustomField' => 'PhabricatorCustomField', ··· 6634 6633 'PhabricatorUserTitleField' => 'PhabricatorUserCustomField', 6635 6634 'PhabricatorUserTransaction' => 'PhabricatorApplicationTransaction', 6636 6635 'PhabricatorUsersPolicyRule' => 'PhabricatorPolicyRule', 6636 + 'PhabricatorUsersSearchField' => 'PhabricatorSearchTokenizerField', 6637 6637 'PhabricatorVCSResponse' => 'AphrontResponse', 6638 6638 'PhabricatorVeryWowEnglishTranslation' => 'PhutilTranslation', 6639 6639 'PhabricatorViewerDatasource' => 'PhabricatorTypeaheadDatasource',
+1 -1
src/applications/files/query/PhabricatorFileSearchEngine.php
··· 17 17 18 18 protected function buildCustomSearchFields() { 19 19 return array( 20 - id(new PhabricatorSearchUsersField()) 20 + id(new PhabricatorUsersSearchField()) 21 21 ->setKey('authorPHIDs') 22 22 ->setAliases(array('author', 'authors')) 23 23 ->setLabel(pht('Authors')),
+1 -1
src/applications/macro/query/PhabricatorMacroSearchEngine.php
··· 22 22 ->setLabel(pht('Status')) 23 23 ->setKey('status') 24 24 ->setOptions(PhabricatorMacroQuery::getStatusOptions()), 25 - id(new PhabricatorSearchUsersField()) 25 + id(new PhabricatorUsersSearchField()) 26 26 ->setLabel(pht('Authors')) 27 27 ->setKey('authorPHIDs') 28 28 ->setAliases(array('author', 'authors')),
+2 -2
src/applications/maniphest/query/ManiphestTaskSearchEngine.php
··· 45 45 46 46 protected function buildCustomSearchFields() { 47 47 return array( 48 - id(new PhabricatorSearchOwnersField()) 48 + id(new PhabricatorOwnersSearchField()) 49 49 ->setLabel(pht('Assigned To')) 50 50 ->setKey('assignedPHIDs') 51 51 ->setAliases(array('assigned')), 52 - id(new PhabricatorSearchUsersField()) 52 + id(new PhabricatorUsersSearchField()) 53 53 ->setLabel(pht('Authors')) 54 54 ->setKey('authorPHIDs') 55 55 ->setAliases(array('author', 'authors')),
+2 -2
src/applications/metamta/query/PhabricatorMetaMTAMailSearchEngine.php
··· 21 21 22 22 protected function buildCustomSearchFields() { 23 23 return array( 24 - id(new PhabricatorSearchUsersField()) 24 + id(new PhabricatorUsersSearchField()) 25 25 ->setLabel(pht('Actors')) 26 26 ->setKey('actorPHIDs') 27 27 ->setAliases(array('actor', 'actors')), 28 - id(new PhabricatorSearchUsersField()) 28 + id(new PhabricatorUsersSearchField()) 29 29 ->setLabel(pht('Recipients')) 30 30 ->setKey('recipientPHIDs') 31 31 ->setAliases(array('recipient', 'recipients')),
+1 -1
src/applications/paste/query/PhabricatorPasteSearchEngine.php
··· 40 40 41 41 protected function buildCustomSearchFields() { 42 42 return array( 43 - id(new PhabricatorSearchUsersField()) 43 + id(new PhabricatorUsersSearchField()) 44 44 ->setAliases(array('authors')) 45 45 ->setKey('authorPHIDs') 46 46 ->setLabel(pht('Authors')),
src/applications/people/search/PhabricatorUserSearchIndexer.php src/applications/people/searchfield/PhabricatorUserSearchIndexer.php
+1 -1
src/applications/pholio/query/PholioMockSearchEngine.php
··· 19 19 20 20 protected function buildCustomSearchFields() { 21 21 return array( 22 - id(new PhabricatorSearchUsersField()) 22 + id(new PhabricatorUsersSearchField()) 23 23 ->setKey('authorPHIDs') 24 24 ->setAliases(array('authors')) 25 25 ->setLabel(pht('Authors')),
+1 -1
src/applications/project/query/PhabricatorProjectSearchEngine.php
··· 21 21 id(new PhabricatorSearchTextField()) 22 22 ->setLabel(pht('Name')) 23 23 ->setKey('name'), 24 - id(new PhabricatorSearchUsersField()) 24 + id(new PhabricatorUsersSearchField()) 25 25 ->setLabel(pht('Members')) 26 26 ->setKey('memberPHIDs') 27 27 ->setAliases(array('member', 'members')),
+2 -2
src/applications/search/engine/PhabricatorApplicationSearchEngine.php
··· 245 245 } 246 246 247 247 if ($object instanceof PhabricatorProjectInterface) { 248 - $fields[] = id(new PhabricatorSearchProjectsField()) 248 + $fields[] = id(new PhabricatorProjectSearchField()) 249 249 ->setKey('projectPHIDs') 250 250 ->setAliases(array('project', 'projects')) 251 251 ->setLabel(pht('Projects')); ··· 253 253 254 254 if ($object instanceof PhabricatorSpacesInterface) { 255 255 if (PhabricatorSpacesNamespaceQuery::getSpacesExist()) { 256 - $fields[] = id(new PhabricatorSearchSpacesField()) 256 + $fields[] = id(new PhabricatorSpacesSearchField()) 257 257 ->setKey('spacePHIDs') 258 258 ->setAliases(array('space', 'spaces')) 259 259 ->setLabel(pht('Spaces'));
+1 -1
src/applications/search/field/PhabricatorSearchOwnersField.php src/applications/owners/searchfield/PhabricatorOwnersSearchField.php
··· 1 1 <?php 2 2 3 - final class PhabricatorSearchOwnersField 3 + final class PhabricatorOwnersSearchField 4 4 extends PhabricatorSearchTokenizerField { 5 5 6 6 protected function getDefaultValue() {
+1 -1
src/applications/search/field/PhabricatorSearchProjectsField.php src/applications/project/searchfield/PhabricatorProjectSearchField.php
··· 1 1 <?php 2 2 3 - final class PhabricatorSearchProjectsField 3 + final class PhabricatorProjectSearchField 4 4 extends PhabricatorSearchTokenizerField { 5 5 6 6 protected function getDefaultValue() {
+1 -1
src/applications/search/field/PhabricatorSearchSpacesField.php src/applications/spaces/searchfield/PhabricatorSpacesSearchField.php
··· 1 1 <?php 2 2 3 - final class PhabricatorSearchSpacesField 3 + final class PhabricatorSpacesSearchField 4 4 extends PhabricatorSearchTokenizerField { 5 5 6 6 protected function getDefaultValue() {
+1 -1
src/applications/search/field/PhabricatorSearchUsersField.php src/applications/people/search/PhabricatorUserSearchField.php
··· 1 1 <?php 2 2 3 - final class PhabricatorSearchUsersField 3 + final class PhabricatorUsersSearchField 4 4 extends PhabricatorSearchTokenizerField { 5 5 6 6 protected function getDefaultValue() {
+1 -1
src/infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobSearchEngine.php
··· 27 27 28 28 protected function buildCustomSearchFields() { 29 29 return array( 30 - id(new PhabricatorSearchUsersField()) 30 + id(new PhabricatorUsersSearchField()) 31 31 ->setLabel(pht('Authors')) 32 32 ->setKey('authorPHIDs') 33 33 ->setAliases(array('author', 'authors')),