D10037.diff
No OneTemporary
Actions

Size

125 KB

Referenced Files

None

Subscribers

None

D10037.diff
View Options

	diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
	--- a/src/__phutil_library_map__.php
	+++ b/src/__phutil_library_map__.php
	@@ -335,7 +335,6 @@
	'DifferentialAuthorField' => 'applications/differential/customfield/DifferentialAuthorField.php',
	'DifferentialBlameRevisionField' => 'applications/differential/customfield/DifferentialBlameRevisionField.php',
	'DifferentialBranchField' => 'applications/differential/customfield/DifferentialBranchField.php',
	- 'DifferentialCapabilityDefaultView' => 'applications/differential/capability/DifferentialCapabilityDefaultView.php',
	'DifferentialChangeType' => 'applications/differential/constants/DifferentialChangeType.php',
	'DifferentialChangesSinceLastUpdateField' => 'applications/differential/customfield/DifferentialChangesSinceLastUpdateField.php',
	'DifferentialChangeset' => 'applications/differential/storage/DifferentialChangeset.php',
	@@ -370,6 +369,7 @@
	'DifferentialCustomFieldStorage' => 'applications/differential/storage/DifferentialCustomFieldStorage.php',
	'DifferentialCustomFieldStringIndex' => 'applications/differential/storage/DifferentialCustomFieldStringIndex.php',
	'DifferentialDAO' => 'applications/differential/storage/DifferentialDAO.php',
	+ 'DifferentialDefaultViewCapability' => 'applications/differential/capability/DifferentialDefaultViewCapability.php',
	'DifferentialDependenciesField' => 'applications/differential/customfield/DifferentialDependenciesField.php',
	'DifferentialDependsOnField' => 'applications/differential/customfield/DifferentialDependsOnField.php',
	'DifferentialDiff' => 'applications/differential/storage/DifferentialDiff.php',
	@@ -475,11 +475,6 @@
	'DiffusionBrowseResultSet' => 'applications/diffusion/data/DiffusionBrowseResultSet.php',
	'DiffusionBrowseSearchController' => 'applications/diffusion/controller/DiffusionBrowseSearchController.php',
	'DiffusionBrowseTableView' => 'applications/diffusion/view/DiffusionBrowseTableView.php',
	- 'DiffusionCapabilityCreateRepositories' => 'applications/diffusion/capability/DiffusionCapabilityCreateRepositories.php',
	- 'DiffusionCapabilityDefaultEdit' => 'applications/diffusion/capability/DiffusionCapabilityDefaultEdit.php',
	- 'DiffusionCapabilityDefaultPush' => 'applications/diffusion/capability/DiffusionCapabilityDefaultPush.php',
	- 'DiffusionCapabilityDefaultView' => 'applications/diffusion/capability/DiffusionCapabilityDefaultView.php',
	- 'DiffusionCapabilityPush' => 'applications/diffusion/capability/DiffusionCapabilityPush.php',
	'DiffusionChangeController' => 'applications/diffusion/controller/DiffusionChangeController.php',
	'DiffusionCommentListView' => 'applications/diffusion/view/DiffusionCommentListView.php',
	'DiffusionCommentView' => 'applications/diffusion/view/DiffusionCommentView.php',
	@@ -496,6 +491,10 @@
	'DiffusionCommitRemarkupRule' => 'applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php',
	'DiffusionCommitTagsController' => 'applications/diffusion/controller/DiffusionCommitTagsController.php',
	'DiffusionController' => 'applications/diffusion/controller/DiffusionController.php',
	+ 'DiffusionCreateRepositoriesCapability' => 'applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php',
	+ 'DiffusionDefaultEditCapability' => 'applications/diffusion/capability/DiffusionDefaultEditCapability.php',
	+ 'DiffusionDefaultPushCapability' => 'applications/diffusion/capability/DiffusionDefaultPushCapability.php',
	+ 'DiffusionDefaultViewCapability' => 'applications/diffusion/capability/DiffusionDefaultViewCapability.php',
	'DiffusionDiffController' => 'applications/diffusion/controller/DiffusionDiffController.php',
	'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php',
	'DiffusionEmptyResultView' => 'applications/diffusion/view/DiffusionEmptyResultView.php',
	@@ -541,6 +540,7 @@
	'DiffusionPathQueryTestCase' => 'applications/diffusion/query/pathid/__tests__/DiffusionPathQueryTestCase.php',
	'DiffusionPathTreeController' => 'applications/diffusion/controller/DiffusionPathTreeController.php',
	'DiffusionPathValidateController' => 'applications/diffusion/controller/DiffusionPathValidateController.php',
	+ 'DiffusionPushCapability' => 'applications/diffusion/capability/DiffusionPushCapability.php',
	'DiffusionPushEventViewController' => 'applications/diffusion/controller/DiffusionPushEventViewController.php',
	'DiffusionPushLogController' => 'applications/diffusion/controller/DiffusionPushLogController.php',
	'DiffusionPushLogListController' => 'applications/diffusion/controller/DiffusionPushLogListController.php',
	@@ -670,14 +670,14 @@
	'DrydockBlueprintTransaction' => 'applications/drydock/storage/DrydockBlueprintTransaction.php',
	'DrydockBlueprintTransactionQuery' => 'applications/drydock/query/DrydockBlueprintTransactionQuery.php',
	'DrydockBlueprintViewController' => 'applications/drydock/controller/DrydockBlueprintViewController.php',
	- 'DrydockCapabilityCreateBlueprints' => 'applications/drydock/capability/DrydockCapabilityCreateBlueprints.php',
	- 'DrydockCapabilityDefaultEdit' => 'applications/drydock/capability/DrydockCapabilityDefaultEdit.php',
	- 'DrydockCapabilityDefaultView' => 'applications/drydock/capability/DrydockCapabilityDefaultView.php',
	'DrydockCommandInterface' => 'applications/drydock/interface/command/DrydockCommandInterface.php',
	'DrydockConsoleController' => 'applications/drydock/controller/DrydockConsoleController.php',
	'DrydockConstants' => 'applications/drydock/constants/DrydockConstants.php',
	'DrydockController' => 'applications/drydock/controller/DrydockController.php',
	+ 'DrydockCreateBlueprintsCapability' => 'applications/drydock/capability/DrydockCreateBlueprintsCapability.php',
	'DrydockDAO' => 'applications/drydock/storage/DrydockDAO.php',
	+ 'DrydockDefaultEditCapability' => 'applications/drydock/capability/DrydockDefaultEditCapability.php',
	+ 'DrydockDefaultViewCapability' => 'applications/drydock/capability/DrydockDefaultViewCapability.php',
	'DrydockFilesystemInterface' => 'applications/drydock/interface/filesystem/DrydockFilesystemInterface.php',
	'DrydockInterface' => 'applications/drydock/interface/DrydockInterface.php',
	'DrydockLease' => 'applications/drydock/storage/DrydockLease.php',
	@@ -778,12 +778,12 @@
	'HarbormasterBuildableTransactionEditor' => 'applications/harbormaster/editor/HarbormasterBuildableTransactionEditor.php',
	'HarbormasterBuildableTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildableTransactionQuery.php',
	'HarbormasterBuildableViewController' => 'applications/harbormaster/controller/HarbormasterBuildableViewController.php',
	- 'HarbormasterCapabilityManagePlans' => 'applications/harbormaster/capability/HarbormasterCapabilityManagePlans.php',
	'HarbormasterCommandBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterCommandBuildStepImplementation.php',
	'HarbormasterController' => 'applications/harbormaster/controller/HarbormasterController.php',
	'HarbormasterDAO' => 'applications/harbormaster/storage/HarbormasterDAO.php',
	'HarbormasterHTTPRequestBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php',
	'HarbormasterLeaseHostBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterLeaseHostBuildStepImplementation.php',
	+ 'HarbormasterManagePlansCapability' => 'applications/harbormaster/capability/HarbormasterManagePlansCapability.php',
	'HarbormasterManagementBuildWorkflow' => 'applications/harbormaster/management/HarbormasterManagementBuildWorkflow.php',
	'HarbormasterManagementUpdateWorkflow' => 'applications/harbormaster/management/HarbormasterManagementUpdateWorkflow.php',
	'HarbormasterManagementWorkflow' => 'applications/harbormaster/management/HarbormasterManagementWorkflow.php',
	@@ -811,7 +811,6 @@
	'HeraldAction' => 'applications/herald/storage/HeraldAction.php',
	'HeraldAdapter' => 'applications/herald/adapter/HeraldAdapter.php',
	'HeraldApplyTranscript' => 'applications/herald/storage/transcript/HeraldApplyTranscript.php',
	- 'HeraldCapabilityManageGlobalRules' => 'applications/herald/capability/HeraldCapabilityManageGlobalRules.php',
	'HeraldCommitAdapter' => 'applications/herald/adapter/HeraldCommitAdapter.php',
	'HeraldCondition' => 'applications/herald/storage/HeraldCondition.php',
	'HeraldConditionTranscript' => 'applications/herald/storage/transcript/HeraldConditionTranscript.php',
	@@ -826,6 +825,7 @@
	'HeraldInvalidActionException' => 'applications/herald/engine/exception/HeraldInvalidActionException.php',
	'HeraldInvalidConditionException' => 'applications/herald/engine/exception/HeraldInvalidConditionException.php',
	'HeraldInvalidFieldException' => 'applications/herald/engine/exception/HeraldInvalidFieldException.php',
	+ 'HeraldManageGlobalRulesCapability' => 'applications/herald/capability/HeraldManageGlobalRulesCapability.php',
	'HeraldManiphestTaskAdapter' => 'applications/herald/adapter/HeraldManiphestTaskAdapter.php',
	'HeraldNewController' => 'applications/herald/controller/HeraldNewController.php',
	'HeraldObjectTranscript' => 'applications/herald/storage/transcript/HeraldObjectTranscript.php',
	@@ -865,12 +865,12 @@
	'JavelinUIExample' => 'applications/uiexample/examples/JavelinUIExample.php',
	'JavelinViewExample' => 'applications/uiexample/examples/JavelinViewExample.php',
	'JavelinViewExampleServerView' => 'applications/uiexample/examples/JavelinViewExampleServerView.php',
	- 'LegalpadCapabilityCreateDocuments' => 'applications/legalpad/capability/LegalpadCapabilityCreateDocuments.php',
	- 'LegalpadCapabilityDefaultEdit' => 'applications/legalpad/capability/LegalpadCapabilityDefaultEdit.php',
	- 'LegalpadCapabilityDefaultView' => 'applications/legalpad/capability/LegalpadCapabilityDefaultView.php',
	'LegalpadConstants' => 'applications/legalpad/constants/LegalpadConstants.php',
	'LegalpadController' => 'applications/legalpad/controller/LegalpadController.php',
	+ 'LegalpadCreateDocumentsCapability' => 'applications/legalpad/capability/LegalpadCreateDocumentsCapability.php',
	'LegalpadDAO' => 'applications/legalpad/storage/LegalpadDAO.php',
	+ 'LegalpadDefaultEditCapability' => 'applications/legalpad/capability/LegalpadDefaultEditCapability.php',
	+ 'LegalpadDefaultViewCapability' => 'applications/legalpad/capability/LegalpadDefaultViewCapability.php',
	'LegalpadDocument' => 'applications/legalpad/storage/LegalpadDocument.php',
	'LegalpadDocumentBody' => 'applications/legalpad/storage/LegalpadDocumentBody.php',
	'LegalpadDocumentCommentController' => 'applications/legalpad/controller/LegalpadDocumentCommentController.php',
	@@ -911,14 +911,7 @@
	'LiskRawMigrationIterator' => 'infrastructure/storage/lisk/LiskRawMigrationIterator.php',
	'ManiphestActionMenuEventListener' => 'applications/maniphest/event/ManiphestActionMenuEventListener.php',
	'ManiphestBatchEditController' => 'applications/maniphest/controller/ManiphestBatchEditController.php',
	- 'ManiphestCapabilityBulkEdit' => 'applications/maniphest/capability/ManiphestCapabilityBulkEdit.php',
	- 'ManiphestCapabilityDefaultEdit' => 'applications/maniphest/capability/ManiphestCapabilityDefaultEdit.php',
	- 'ManiphestCapabilityDefaultView' => 'applications/maniphest/capability/ManiphestCapabilityDefaultView.php',
	- 'ManiphestCapabilityEditAssign' => 'applications/maniphest/capability/ManiphestCapabilityEditAssign.php',
	- 'ManiphestCapabilityEditPolicies' => 'applications/maniphest/capability/ManiphestCapabilityEditPolicies.php',
	- 'ManiphestCapabilityEditPriority' => 'applications/maniphest/capability/ManiphestCapabilityEditPriority.php',
	- 'ManiphestCapabilityEditProjects' => 'applications/maniphest/capability/ManiphestCapabilityEditProjects.php',
	- 'ManiphestCapabilityEditStatus' => 'applications/maniphest/capability/ManiphestCapabilityEditStatus.php',
	+ 'ManiphestBulkEditCapability' => 'applications/maniphest/capability/ManiphestBulkEditCapability.php',
	'ManiphestConfiguredCustomField' => 'applications/maniphest/field/ManiphestConfiguredCustomField.php',
	'ManiphestConstants' => 'applications/maniphest/constants/ManiphestConstants.php',
	'ManiphestController' => 'applications/maniphest/controller/ManiphestController.php',
	@@ -930,6 +923,13 @@
	'ManiphestCustomFieldStorage' => 'applications/maniphest/storage/ManiphestCustomFieldStorage.php',
	'ManiphestCustomFieldStringIndex' => 'applications/maniphest/storage/ManiphestCustomFieldStringIndex.php',
	'ManiphestDAO' => 'applications/maniphest/storage/ManiphestDAO.php',
	+ 'ManiphestDefaultEditCapability' => 'applications/maniphest/capability/ManiphestDefaultEditCapability.php',
	+ 'ManiphestDefaultViewCapability' => 'applications/maniphest/capability/ManiphestDefaultViewCapability.php',
	+ 'ManiphestEditAssignCapability' => 'applications/maniphest/capability/ManiphestEditAssignCapability.php',
	+ 'ManiphestEditPoliciesCapability' => 'applications/maniphest/capability/ManiphestEditPoliciesCapability.php',
	+ 'ManiphestEditPriorityCapability' => 'applications/maniphest/capability/ManiphestEditPriorityCapability.php',
	+ 'ManiphestEditProjectsCapability' => 'applications/maniphest/capability/ManiphestEditProjectsCapability.php',
	+ 'ManiphestEditStatusCapability' => 'applications/maniphest/capability/ManiphestEditStatusCapability.php',
	'ManiphestExcelDefaultFormat' => 'applications/maniphest/export/ManiphestExcelDefaultFormat.php',
	'ManiphestExcelFormat' => 'applications/maniphest/export/ManiphestExcelFormat.php',
	'ManiphestExportController' => 'applications/maniphest/controller/ManiphestExportController.php',
	@@ -974,9 +974,6 @@
	'MetaMTAMailSentGarbageCollector' => 'applications/metamta/garbagecollector/MetaMTAMailSentGarbageCollector.php',
	'MetaMTANotificationType' => 'applications/metamta/constants/MetaMTANotificationType.php',
	'MetaMTAReceivedMailStatus' => 'applications/metamta/constants/MetaMTAReceivedMailStatus.php',
	- 'NuanceCapabilitySourceDefaultEdit' => 'applications/nuance/capability/NuanceCapabilitySourceDefaultEdit.php',
	- 'NuanceCapabilitySourceDefaultView' => 'applications/nuance/capability/NuanceCapabilitySourceDefaultView.php',
	- 'NuanceCapabilitySourceManage' => 'applications/nuance/capability/NuanceCapabilitySourceManage.php',
	'NuanceConstants' => 'applications/nuance/constants/NuanceConstants.php',
	'NuanceController' => 'applications/nuance/controller/NuanceController.php',
	'NuanceDAO' => 'applications/nuance/storage/NuanceDAO.php',
	@@ -1012,9 +1009,12 @@
	'NuanceRequestorTransactionQuery' => 'applications/nuance/query/NuanceRequestorTransactionQuery.php',
	'NuanceRequestorViewController' => 'applications/nuance/controller/NuanceRequestorViewController.php',
	'NuanceSource' => 'applications/nuance/storage/NuanceSource.php',
	+ 'NuanceSourceDefaultEditCapability' => 'applications/nuance/capability/NuanceSourceDefaultEditCapability.php',
	+ 'NuanceSourceDefaultViewCapability' => 'applications/nuance/capability/NuanceSourceDefaultViewCapability.php',
	'NuanceSourceDefinition' => 'applications/nuance/source/NuanceSourceDefinition.php',
	'NuanceSourceEditController' => 'applications/nuance/controller/NuanceSourceEditController.php',
	'NuanceSourceEditor' => 'applications/nuance/editor/NuanceSourceEditor.php',
	+ 'NuanceSourceManageCapability' => 'applications/nuance/capability/NuanceSourceManageCapability.php',
	'NuanceSourcePHIDType' => 'applications/nuance/phid/NuanceSourcePHIDType.php',
	'NuanceSourceQuery' => 'applications/nuance/query/NuanceSourceQuery.php',
	'NuanceSourceTransaction' => 'applications/nuance/storage/NuanceSourceTransaction.php',
	@@ -1112,12 +1112,12 @@
	'PassphraseRemarkupRule' => 'applications/passphrase/remarkup/PassphraseRemarkupRule.php',
	'PassphraseSSHKey' => 'applications/passphrase/keys/PassphraseSSHKey.php',
	'PassphraseSecret' => 'applications/passphrase/storage/PassphraseSecret.php',
	- 'PasteCapabilityDefaultView' => 'applications/paste/capability/PasteCapabilityDefaultView.php',
	'PasteCreateMailReceiver' => 'applications/paste/mail/PasteCreateMailReceiver.php',
	+ 'PasteDefaultViewCapability' => 'applications/paste/capability/PasteDefaultViewCapability.php',
	'PasteEmbedView' => 'applications/paste/view/PasteEmbedView.php',
	'PasteMockMailReceiver' => 'applications/paste/mail/PasteMockMailReceiver.php',
	'PasteReplyHandler' => 'applications/paste/mail/PasteReplyHandler.php',
	- 'PeopleCapabilityBrowseUserDirectory' => 'applications/people/capability/PeopleCapabilityBrowseUserDirectory.php',
	+ 'PeopleBrowseUserDirectoryCapability' => 'applications/people/capability/PeopleBrowseUserDirectoryCapability.php',
	'PeopleUserLogGarbageCollector' => 'applications/people/garbagecollector/PeopleUserLogGarbageCollector.php',
	'Phabricator404Controller' => 'applications/base/controller/Phabricator404Controller.php',
	'PhabricatorAWSConfigOptions' => 'applications/config/option/PhabricatorAWSConfigOptions.php',
	@@ -1376,10 +1376,10 @@
	'PhabricatorCoreConfigOptions' => 'applications/config/option/PhabricatorCoreConfigOptions.php',
	'PhabricatorCountdown' => 'applications/countdown/storage/PhabricatorCountdown.php',
	'PhabricatorCountdownApplication' => 'applications/countdown/application/PhabricatorCountdownApplication.php',
	- 'PhabricatorCountdownCapabilityDefaultView' => 'applications/countdown/capability/PhabricatorCountdownCapabilityDefaultView.php',
	'PhabricatorCountdownController' => 'applications/countdown/controller/PhabricatorCountdownController.php',
	'PhabricatorCountdownCountdownPHIDType' => 'applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php',
	'PhabricatorCountdownDAO' => 'applications/countdown/storage/PhabricatorCountdownDAO.php',
	+ 'PhabricatorCountdownDefaultViewCapability' => 'applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php',
	'PhabricatorCountdownDeleteController' => 'applications/countdown/controller/PhabricatorCountdownDeleteController.php',
	'PhabricatorCountdownEditController' => 'applications/countdown/controller/PhabricatorCountdownEditController.php',
	'PhabricatorCountdownListController' => 'applications/countdown/controller/PhabricatorCountdownListController.php',
	@@ -1686,7 +1686,6 @@
	'PhabricatorLogoutController' => 'applications/auth/controller/PhabricatorLogoutController.php',
	'PhabricatorMacroApplication' => 'applications/macro/application/PhabricatorMacroApplication.php',
	'PhabricatorMacroAudioController' => 'applications/macro/controller/PhabricatorMacroAudioController.php',
	- 'PhabricatorMacroCapabilityManage' => 'applications/macro/capability/PhabricatorMacroCapabilityManage.php',
	'PhabricatorMacroCommentController' => 'applications/macro/controller/PhabricatorMacroCommentController.php',
	'PhabricatorMacroConfigOptions' => 'applications/macro/config/PhabricatorMacroConfigOptions.php',
	'PhabricatorMacroController' => 'applications/macro/controller/PhabricatorMacroController.php',
	@@ -1697,6 +1696,7 @@
	'PhabricatorMacroListController' => 'applications/macro/controller/PhabricatorMacroListController.php',
	'PhabricatorMacroMacroPHIDType' => 'applications/macro/phid/PhabricatorMacroMacroPHIDType.php',
	'PhabricatorMacroMailReceiver' => 'applications/macro/mail/PhabricatorMacroMailReceiver.php',
	+ 'PhabricatorMacroManageCapability' => 'applications/macro/capability/PhabricatorMacroManageCapability.php',
	'PhabricatorMacroMemeController' => 'applications/macro/controller/PhabricatorMacroMemeController.php',
	'PhabricatorMacroMemeDialogController' => 'applications/macro/controller/PhabricatorMacroMemeDialogController.php',
	'PhabricatorMacroQuery' => 'applications/macro/query/PhabricatorMacroQuery.php',
	@@ -1811,13 +1811,13 @@
	'PhabricatorOAuthServerAuthController' => 'applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php',
	'PhabricatorOAuthServerAuthorizationCode' => 'applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php',
	'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php',
	- 'PhabricatorOAuthServerCapabilityCreateClients' => 'applications/oauthserver/capability/PhabricatorOAuthServerCapabilityCreateClients.php',
	'PhabricatorOAuthServerClient' => 'applications/oauthserver/storage/PhabricatorOAuthServerClient.php',
	'PhabricatorOAuthServerClientAuthorizationPHIDType' => 'applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php',
	'PhabricatorOAuthServerClientPHIDType' => 'applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php',
	'PhabricatorOAuthServerClientQuery' => 'applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php',
	'PhabricatorOAuthServerClientSearchEngine' => 'applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php',
	'PhabricatorOAuthServerController' => 'applications/oauthserver/controller/PhabricatorOAuthServerController.php',
	+ 'PhabricatorOAuthServerCreateClientsCapability' => 'applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php',
	'PhabricatorOAuthServerDAO' => 'applications/oauthserver/storage/PhabricatorOAuthServerDAO.php',
	'PhabricatorOAuthServerScope' => 'applications/oauthserver/PhabricatorOAuthServerScope.php',
	'PhabricatorOAuthServerTestCase' => 'applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php',
	@@ -1928,10 +1928,10 @@
	'PhabricatorPolicyApplication' => 'applications/policy/application/PhabricatorPolicyApplication.php',
	'PhabricatorPolicyAwareQuery' => 'infrastructure/query/policy/PhabricatorPolicyAwareQuery.php',
	'PhabricatorPolicyAwareTestQuery' => 'applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php',
	+ 'PhabricatorPolicyCanEditCapability' => 'applications/policy/capability/PhabricatorPolicyCanEditCapability.php',
	+ 'PhabricatorPolicyCanJoinCapability' => 'applications/policy/capability/PhabricatorPolicyCanJoinCapability.php',
	+ 'PhabricatorPolicyCanViewCapability' => 'applications/policy/capability/PhabricatorPolicyCanViewCapability.php',
	'PhabricatorPolicyCapability' => 'applications/policy/capability/PhabricatorPolicyCapability.php',
	- 'PhabricatorPolicyCapabilityCanEdit' => 'applications/policy/capability/PhabricatorPolicyCapabilityCanEdit.php',
	- 'PhabricatorPolicyCapabilityCanJoin' => 'applications/policy/capability/PhabricatorPolicyCapabilityCanJoin.php',
	- 'PhabricatorPolicyCapabilityCanView' => 'applications/policy/capability/PhabricatorPolicyCapabilityCanView.php',
	'PhabricatorPolicyConfigOptions' => 'applications/policy/config/PhabricatorPolicyConfigOptions.php',
	'PhabricatorPolicyConstants' => 'applications/policy/constants/PhabricatorPolicyConstants.php',
	'PhabricatorPolicyController' => 'applications/policy/controller/PhabricatorPolicyController.php',
	@@ -2217,13 +2217,13 @@
	'PhabricatorSetupIssueExample' => 'applications/uiexample/examples/PhabricatorSetupIssueExample.php',
	'PhabricatorSetupIssueView' => 'applications/config/view/PhabricatorSetupIssueView.php',
	'PhabricatorSlowvoteApplication' => 'applications/slowvote/application/PhabricatorSlowvoteApplication.php',
	- 'PhabricatorSlowvoteCapabilityDefaultView' => 'applications/slowvote/capability/PhabricatorSlowvoteCapabilityDefaultView.php',
	'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/PhabricatorSlowvoteChoice.php',
	'PhabricatorSlowvoteCloseController' => 'applications/slowvote/controller/PhabricatorSlowvoteCloseController.php',
	'PhabricatorSlowvoteComment' => 'applications/slowvote/storage/PhabricatorSlowvoteComment.php',
	'PhabricatorSlowvoteCommentController' => 'applications/slowvote/controller/PhabricatorSlowvoteCommentController.php',
	'PhabricatorSlowvoteController' => 'applications/slowvote/controller/PhabricatorSlowvoteController.php',
	'PhabricatorSlowvoteDAO' => 'applications/slowvote/storage/PhabricatorSlowvoteDAO.php',
	+ 'PhabricatorSlowvoteDefaultViewCapability' => 'applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php',
	'PhabricatorSlowvoteEditController' => 'applications/slowvote/controller/PhabricatorSlowvoteEditController.php',
	'PhabricatorSlowvoteEditor' => 'applications/slowvote/editor/PhabricatorSlowvoteEditor.php',
	'PhabricatorSlowvoteListController' => 'applications/slowvote/controller/PhabricatorSlowvoteListController.php',
	@@ -2453,11 +2453,11 @@
	'PhluxVariableQuery' => 'applications/phlux/query/PhluxVariableQuery.php',
	'PhluxViewController' => 'applications/phlux/controller/PhluxViewController.php',
	'PholioActionMenuEventListener' => 'applications/pholio/event/PholioActionMenuEventListener.php',
	- 'PholioCapabilityDefaultEdit' => 'applications/pholio/capability/PholioCapabilityDefaultEdit.php',
	- 'PholioCapabilityDefaultView' => 'applications/pholio/capability/PholioCapabilityDefaultView.php',
	'PholioConstants' => 'applications/pholio/constants/PholioConstants.php',
	'PholioController' => 'applications/pholio/controller/PholioController.php',
	'PholioDAO' => 'applications/pholio/storage/PholioDAO.php',
	+ 'PholioDefaultEditCapability' => 'applications/pholio/capability/PholioDefaultEditCapability.php',
	+ 'PholioDefaultViewCapability' => 'applications/pholio/capability/PholioDefaultViewCapability.php',
	'PholioImage' => 'applications/pholio/storage/PholioImage.php',
	'PholioImagePHIDType' => 'applications/pholio/phid/PholioImagePHIDType.php',
	'PholioImageQuery' => 'applications/pholio/query/PholioImageQuery.php',
	@@ -2538,7 +2538,7 @@
	'PhortuneTestPaymentProvider' => 'applications/phortune/provider/PhortuneTestPaymentProvider.php',
	'PhortuneWePayPaymentProvider' => 'applications/phortune/provider/PhortuneWePayPaymentProvider.php',
	'PhragmentBrowseController' => 'applications/phragment/controller/PhragmentBrowseController.php',
	- 'PhragmentCapabilityCanCreate' => 'applications/phragment/capability/PhragmentCapabilityCanCreate.php',
	+ 'PhragmentCanCreateCapability' => 'applications/phragment/capability/PhragmentCanCreateCapability.php',
	'PhragmentController' => 'applications/phragment/controller/PhragmentController.php',
	'PhragmentCreateController' => 'applications/phragment/controller/PhragmentCreateController.php',
	'PhragmentDAO' => 'applications/phragment/storage/PhragmentDAO.php',
	@@ -2647,7 +2647,7 @@
	'PonderVoteEditor' => 'applications/ponder/editor/PonderVoteEditor.php',
	'PonderVoteSaveController' => 'applications/ponder/controller/PonderVoteSaveController.php',
	'ProjectBoardTaskCard' => 'applications/project/view/ProjectBoardTaskCard.php',
	- 'ProjectCapabilityCreateProjects' => 'applications/project/capability/ProjectCapabilityCreateProjects.php',
	+ 'ProjectCreateProjectsCapability' => 'applications/project/capability/ProjectCreateProjectsCapability.php',
	'ProjectRemarkupRule' => 'applications/project/remarkup/ProjectRemarkupRule.php',
	'QueryFormattingTestCase' => 'infrastructure/storage/__tests__/QueryFormattingTestCase.php',
	'ReleephAuthorFieldSpecification' => 'applications/releeph/field/specification/ReleephAuthorFieldSpecification.php',
	@@ -3060,7 +3060,6 @@
	'DifferentialAuthorField' => 'DifferentialCustomField',
	'DifferentialBlameRevisionField' => 'DifferentialStoredCustomField',
	'DifferentialBranchField' => 'DifferentialCustomField',
	- 'DifferentialCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	'DifferentialChangesSinceLastUpdateField' => 'DifferentialCustomField',
	'DifferentialChangeset' => array(
	'DifferentialDAO',
	@@ -3093,6 +3092,7 @@
	'DifferentialCustomFieldStorage' => 'PhabricatorCustomFieldStorage',
	'DifferentialCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
	'DifferentialDAO' => 'PhabricatorLiskDAO',
	+ 'DifferentialDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'DifferentialDependenciesField' => 'DifferentialCustomField',
	'DifferentialDependsOnField' => 'DifferentialCustomField',
	'DifferentialDiff' => array(
	@@ -3206,11 +3206,6 @@
	'DiffusionBrowseMainController' => 'DiffusionBrowseController',
	'DiffusionBrowseSearchController' => 'DiffusionBrowseController',
	'DiffusionBrowseTableView' => 'DiffusionView',
	- 'DiffusionCapabilityCreateRepositories' => 'PhabricatorPolicyCapability',
	- 'DiffusionCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
	- 'DiffusionCapabilityDefaultPush' => 'PhabricatorPolicyCapability',
	- 'DiffusionCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	- 'DiffusionCapabilityPush' => 'PhabricatorPolicyCapability',
	'DiffusionChangeController' => 'DiffusionController',
	'DiffusionCommentListView' => 'AphrontView',
	'DiffusionCommentView' => 'AphrontView',
	@@ -3227,6 +3222,10 @@
	'DiffusionCommitRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'DiffusionCommitTagsController' => 'DiffusionController',
	'DiffusionController' => 'PhabricatorController',
	+ 'DiffusionCreateRepositoriesCapability' => 'PhabricatorPolicyCapability',
	+ 'DiffusionDefaultEditCapability' => 'PhabricatorPolicyCapability',
	+ 'DiffusionDefaultPushCapability' => 'PhabricatorPolicyCapability',
	+ 'DiffusionDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'DiffusionDiffController' => 'DiffusionController',
	'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'DoorkeeperFeedStoryPublisher',
	'DiffusionEmptyResultView' => 'DiffusionView',
	@@ -3264,6 +3263,7 @@
	'DiffusionPathQueryTestCase' => 'PhabricatorTestCase',
	'DiffusionPathTreeController' => 'DiffusionController',
	'DiffusionPathValidateController' => 'DiffusionController',
	+ 'DiffusionPushCapability' => 'PhabricatorPolicyCapability',
	'DiffusionPushEventViewController' => 'DiffusionPushLogController',
	'DiffusionPushLogController' => 'DiffusionController',
	'DiffusionPushLogListController' => 'DiffusionPushLogController',
	@@ -3393,13 +3393,13 @@
	'DrydockBlueprintTransaction' => 'PhabricatorApplicationTransaction',
	'DrydockBlueprintTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'DrydockBlueprintViewController' => 'DrydockBlueprintController',
	- 'DrydockCapabilityCreateBlueprints' => 'PhabricatorPolicyCapability',
	- 'DrydockCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
	- 'DrydockCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	'DrydockCommandInterface' => 'DrydockInterface',
	'DrydockConsoleController' => 'DrydockController',
	'DrydockController' => 'PhabricatorController',
	+ 'DrydockCreateBlueprintsCapability' => 'PhabricatorPolicyCapability',
	'DrydockDAO' => 'PhabricatorLiskDAO',
	+ 'DrydockDefaultEditCapability' => 'PhabricatorPolicyCapability',
	+ 'DrydockDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'DrydockFilesystemInterface' => 'DrydockInterface',
	'DrydockLease' => array(
	'DrydockDAO',
	@@ -3536,12 +3536,12 @@
	'HarbormasterBuildableTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	'HarbormasterBuildableTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'HarbormasterBuildableViewController' => 'HarbormasterController',
	- 'HarbormasterCapabilityManagePlans' => 'PhabricatorPolicyCapability',
	'HarbormasterCommandBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterController' => 'PhabricatorController',
	'HarbormasterDAO' => 'PhabricatorLiskDAO',
	'HarbormasterHTTPRequestBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterLeaseHostBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	+ 'HarbormasterManagePlansCapability' => 'PhabricatorPolicyCapability',
	'HarbormasterManagementBuildWorkflow' => 'HarbormasterManagementWorkflow',
	'HarbormasterManagementUpdateWorkflow' => 'HarbormasterManagementWorkflow',
	'HarbormasterManagementWorkflow' => 'PhabricatorManagementWorkflow',
	@@ -3568,7 +3568,6 @@
	'HarbormasterWorker' => 'PhabricatorWorker',
	'HeraldAction' => 'HeraldDAO',
	'HeraldApplyTranscript' => 'HeraldDAO',
	- 'HeraldCapabilityManageGlobalRules' => 'PhabricatorPolicyCapability',
	'HeraldCommitAdapter' => 'HeraldAdapter',
	'HeraldCondition' => 'HeraldDAO',
	'HeraldController' => 'PhabricatorController',
	@@ -3579,6 +3578,7 @@
	'HeraldInvalidActionException' => 'Exception',
	'HeraldInvalidConditionException' => 'Exception',
	'HeraldInvalidFieldException' => 'Exception',
	+ 'HeraldManageGlobalRulesCapability' => 'PhabricatorPolicyCapability',
	'HeraldManiphestTaskAdapter' => 'HeraldAdapter',
	'HeraldNewController' => 'HeraldController',
	'HeraldPholioMockAdapter' => 'HeraldAdapter',
	@@ -3621,11 +3621,11 @@
	'JavelinUIExample' => 'PhabricatorUIExample',
	'JavelinViewExample' => 'PhabricatorUIExample',
	'JavelinViewExampleServerView' => 'AphrontView',
	- 'LegalpadCapabilityCreateDocuments' => 'PhabricatorPolicyCapability',
	- 'LegalpadCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
	- 'LegalpadCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	'LegalpadController' => 'PhabricatorController',
	+ 'LegalpadCreateDocumentsCapability' => 'PhabricatorPolicyCapability',
	'LegalpadDAO' => 'PhabricatorLiskDAO',
	+ 'LegalpadDefaultEditCapability' => 'PhabricatorPolicyCapability',
	+ 'LegalpadDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'LegalpadDocument' => array(
	'LegalpadDAO',
	'PhabricatorPolicyInterface',
	@@ -3676,14 +3676,7 @@
	'LiskRawMigrationIterator' => 'PhutilBufferedIterator',
	'ManiphestActionMenuEventListener' => 'PhabricatorEventListener',
	'ManiphestBatchEditController' => 'ManiphestController',
	- 'ManiphestCapabilityBulkEdit' => 'PhabricatorPolicyCapability',
	- 'ManiphestCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
	- 'ManiphestCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	- 'ManiphestCapabilityEditAssign' => 'PhabricatorPolicyCapability',
	- 'ManiphestCapabilityEditPolicies' => 'PhabricatorPolicyCapability',
	- 'ManiphestCapabilityEditPriority' => 'PhabricatorPolicyCapability',
	- 'ManiphestCapabilityEditProjects' => 'PhabricatorPolicyCapability',
	- 'ManiphestCapabilityEditStatus' => 'PhabricatorPolicyCapability',
	+ 'ManiphestBulkEditCapability' => 'PhabricatorPolicyCapability',
	'ManiphestConfiguredCustomField' => array(
	'ManiphestCustomField',
	'PhabricatorStandardCustomFieldInterface',
	@@ -3697,6 +3690,13 @@
	'ManiphestCustomFieldStorage' => 'PhabricatorCustomFieldStorage',
	'ManiphestCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
	'ManiphestDAO' => 'PhabricatorLiskDAO',
	+ 'ManiphestDefaultEditCapability' => 'PhabricatorPolicyCapability',
	+ 'ManiphestDefaultViewCapability' => 'PhabricatorPolicyCapability',
	+ 'ManiphestEditAssignCapability' => 'PhabricatorPolicyCapability',
	+ 'ManiphestEditPoliciesCapability' => 'PhabricatorPolicyCapability',
	+ 'ManiphestEditPriorityCapability' => 'PhabricatorPolicyCapability',
	+ 'ManiphestEditProjectsCapability' => 'PhabricatorPolicyCapability',
	+ 'ManiphestEditStatusCapability' => 'PhabricatorPolicyCapability',
	'ManiphestExcelDefaultFormat' => 'ManiphestExcelFormat',
	'ManiphestExportController' => 'ManiphestController',
	'ManiphestHovercardEventListener' => 'PhabricatorEventListener',
	@@ -3749,9 +3749,6 @@
	'MetaMTAMailSentGarbageCollector' => 'PhabricatorGarbageCollector',
	'MetaMTANotificationType' => 'MetaMTAConstants',
	'MetaMTAReceivedMailStatus' => 'MetaMTAConstants',
	- 'NuanceCapabilitySourceDefaultEdit' => 'PhabricatorPolicyCapability',
	- 'NuanceCapabilitySourceDefaultView' => 'PhabricatorPolicyCapability',
	- 'NuanceCapabilitySourceManage' => 'PhabricatorPolicyCapability',
	'NuanceController' => 'PhabricatorController',
	'NuanceDAO' => 'PhabricatorLiskDAO',
	'NuanceItem' => array(
	@@ -3795,9 +3792,12 @@
	'NuanceDAO',
	'PhabricatorPolicyInterface',
	),
	+ 'NuanceSourceDefaultEditCapability' => 'PhabricatorPolicyCapability',
	+ 'NuanceSourceDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'NuanceSourceDefinition' => 'Phobject',
	'NuanceSourceEditController' => 'NuanceController',
	'NuanceSourceEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'NuanceSourceManageCapability' => 'PhabricatorPolicyCapability',
	'NuanceSourcePHIDType' => 'PhabricatorPHIDType',
	'NuanceSourceQuery' => 'NuanceQuery',
	'NuanceSourceTransaction' => 'NuanceTransaction',
	@@ -3897,12 +3897,12 @@
	'PassphraseRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'PassphraseSSHKey' => 'PassphraseAbstractKey',
	'PassphraseSecret' => 'PassphraseDAO',
	- 'PasteCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	'PasteCreateMailReceiver' => 'PhabricatorMailReceiver',
	+ 'PasteDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'PasteEmbedView' => 'AphrontView',
	'PasteMockMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PasteReplyHandler' => 'PhabricatorMailReplyHandler',
	- 'PeopleCapabilityBrowseUserDirectory' => 'PhabricatorPolicyCapability',
	+ 'PeopleBrowseUserDirectoryCapability' => 'PhabricatorPolicyCapability',
	'PeopleUserLogGarbageCollector' => 'PhabricatorGarbageCollector',
	'Phabricator404Controller' => 'PhabricatorController',
	'PhabricatorAWSConfigOptions' => 'PhabricatorApplicationConfigOptions',
	@@ -4187,10 +4187,10 @@
	'PhabricatorPolicyInterface',
	),
	'PhabricatorCountdownApplication' => 'PhabricatorApplication',
	- 'PhabricatorCountdownCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	'PhabricatorCountdownController' => 'PhabricatorController',
	'PhabricatorCountdownCountdownPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorCountdownDAO' => 'PhabricatorLiskDAO',
	+ 'PhabricatorCountdownDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorCountdownDeleteController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownEditController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownListController' => 'PhabricatorCountdownController',
	@@ -4504,7 +4504,6 @@
	'PhabricatorLogoutController' => 'PhabricatorAuthController',
	'PhabricatorMacroApplication' => 'PhabricatorApplication',
	'PhabricatorMacroAudioController' => 'PhabricatorMacroController',
	- 'PhabricatorMacroCapabilityManage' => 'PhabricatorPolicyCapability',
	'PhabricatorMacroCommentController' => 'PhabricatorMacroController',
	'PhabricatorMacroConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorMacroController' => 'PhabricatorController',
	@@ -4515,6 +4514,7 @@
	'PhabricatorMacroListController' => 'PhabricatorMacroController',
	'PhabricatorMacroMacroPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorMacroMailReceiver' => 'PhabricatorObjectMailReceiver',
	+ 'PhabricatorMacroManageCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorMacroMemeController' => 'PhabricatorMacroController',
	'PhabricatorMacroMemeDialogController' => 'PhabricatorMacroController',
	'PhabricatorMacroQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	@@ -4625,7 +4625,6 @@
	'PhabricatorOAuthServerAuthController' => 'PhabricatorAuthController',
	'PhabricatorOAuthServerAuthorizationCode' => 'PhabricatorOAuthServerDAO',
	'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'PhabricatorSettingsPanel',
	- 'PhabricatorOAuthServerCapabilityCreateClients' => 'PhabricatorPolicyCapability',
	'PhabricatorOAuthServerClient' => array(
	'PhabricatorOAuthServerDAO',
	'PhabricatorPolicyInterface',
	@@ -4635,6 +4634,7 @@
	'PhabricatorOAuthServerClientQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorOAuthServerClientSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorOAuthServerController' => 'PhabricatorController',
	+ 'PhabricatorOAuthServerCreateClientsCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorOAuthServerDAO' => 'PhabricatorLiskDAO',
	'PhabricatorOAuthServerTestCase' => 'PhabricatorTestCase',
	'PhabricatorOAuthServerTestController' => 'PhabricatorOAuthServerController',
	@@ -4748,10 +4748,10 @@
	'PhabricatorPolicyApplication' => 'PhabricatorApplication',
	'PhabricatorPolicyAwareQuery' => 'PhabricatorOffsetPagedQuery',
	'PhabricatorPolicyAwareTestQuery' => 'PhabricatorPolicyAwareQuery',
	+ 'PhabricatorPolicyCanEditCapability' => 'PhabricatorPolicyCapability',
	+ 'PhabricatorPolicyCanJoinCapability' => 'PhabricatorPolicyCapability',
	+ 'PhabricatorPolicyCanViewCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorPolicyCapability' => 'Phobject',
	- 'PhabricatorPolicyCapabilityCanEdit' => 'PhabricatorPolicyCapability',
	- 'PhabricatorPolicyCapabilityCanJoin' => 'PhabricatorPolicyCapability',
	- 'PhabricatorPolicyCapabilityCanView' => 'PhabricatorPolicyCapability',
	'PhabricatorPolicyConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorPolicyController' => 'PhabricatorController',
	'PhabricatorPolicyDAO' => 'PhabricatorLiskDAO',
	@@ -5066,13 +5066,13 @@
	'PhabricatorSetupIssueExample' => 'PhabricatorUIExample',
	'PhabricatorSetupIssueView' => 'AphrontView',
	'PhabricatorSlowvoteApplication' => 'PhabricatorApplication',
	- 'PhabricatorSlowvoteCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvoteCloseController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteComment' => 'PhabricatorSlowvoteDAO',
	'PhabricatorSlowvoteCommentController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteController' => 'PhabricatorController',
	'PhabricatorSlowvoteDAO' => 'PhabricatorLiskDAO',
	+ 'PhabricatorSlowvoteDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'PhabricatorSlowvoteEditController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorSlowvoteListController' => 'PhabricatorSlowvoteController',
	@@ -5322,10 +5322,10 @@
	'PhluxVariableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhluxViewController' => 'PhluxController',
	'PholioActionMenuEventListener' => 'PhabricatorEventListener',
	- 'PholioCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
	- 'PholioCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	'PholioController' => 'PhabricatorController',
	'PholioDAO' => 'PhabricatorLiskDAO',
	+ 'PholioDefaultEditCapability' => 'PhabricatorPolicyCapability',
	+ 'PholioDefaultViewCapability' => 'PhabricatorPolicyCapability',
	'PholioImage' => array(
	'PholioDAO',
	'PhabricatorMarkupInterface',
	@@ -5435,7 +5435,7 @@
	'PhortuneTestPaymentProvider' => 'PhortunePaymentProvider',
	'PhortuneWePayPaymentProvider' => 'PhortunePaymentProvider',
	'PhragmentBrowseController' => 'PhragmentController',
	- 'PhragmentCapabilityCanCreate' => 'PhabricatorPolicyCapability',
	+ 'PhragmentCanCreateCapability' => 'PhabricatorPolicyCapability',
	'PhragmentController' => 'PhabricatorController',
	'PhragmentCreateController' => 'PhragmentController',
	'PhragmentDAO' => 'PhabricatorLiskDAO',
	@@ -5584,7 +5584,7 @@
	'PonderVote' => 'PonderConstants',
	'PonderVoteEditor' => 'PhabricatorEditor',
	'PonderVoteSaveController' => 'PonderController',
	- 'ProjectCapabilityCreateProjects' => 'PhabricatorPolicyCapability',
	+ 'ProjectCreateProjectsCapability' => 'PhabricatorPolicyCapability',
	'ProjectRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'QueryFormattingTestCase' => 'PhabricatorTestCase',
	'ReleephAuthorFieldSpecification' => 'ReleephFieldSpecification',
	diff --git a/src/applications/countdown/application/PhabricatorCountdownApplication.php b/src/applications/countdown/application/PhabricatorCountdownApplication.php
	--- a/src/applications/countdown/application/PhabricatorCountdownApplication.php
	+++ b/src/applications/countdown/application/PhabricatorCountdownApplication.php
	@@ -50,7 +50,7 @@

	public function getCustomCapabilities() {
	return array(
	- PhabricatorCountdownCapabilityDefaultView::CAPABILITY => array(
	+ PhabricatorCountdownDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for new countdowns.'),
	),
	);
	diff --git a/src/applications/countdown/capability/PhabricatorCountdownCapabilityDefaultView.php b/src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php
	rename from src/applications/countdown/capability/PhabricatorCountdownCapabilityDefaultView.php
	rename to src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php
	--- a/src/applications/countdown/capability/PhabricatorCountdownCapabilityDefaultView.php
	+++ b/src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorCountdownCapabilityDefaultView
	+final class PhabricatorCountdownDefaultViewCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'countdown.default.view';
	diff --git a/src/applications/countdown/storage/PhabricatorCountdown.php b/src/applications/countdown/storage/PhabricatorCountdown.php
	--- a/src/applications/countdown/storage/PhabricatorCountdown.php
	+++ b/src/applications/countdown/storage/PhabricatorCountdown.php
	@@ -16,7 +16,7 @@
	->executeOne();

	$view_policy = $app->getPolicy(
	- PhabricatorCountdownCapabilityDefaultView::CAPABILITY);
	+ PhabricatorCountdownDefaultViewCapability::CAPABILITY);

	return id(new PhabricatorCountdown())
	->setAuthorPHID($actor->getPHID())
	diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
	--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
	+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
	@@ -133,7 +133,7 @@

	protected function getCustomCapabilities() {
	return array(
	- DifferentialCapabilityDefaultView::CAPABILITY => array(
	+ DifferentialDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for newly created revisions.'),
	),
	);
	diff --git a/src/applications/differential/capability/DifferentialCapabilityDefaultView.php b/src/applications/differential/capability/DifferentialDefaultViewCapability.php
	rename from src/applications/differential/capability/DifferentialCapabilityDefaultView.php
	rename to src/applications/differential/capability/DifferentialDefaultViewCapability.php
	--- a/src/applications/differential/capability/DifferentialCapabilityDefaultView.php
	+++ b/src/applications/differential/capability/DifferentialDefaultViewCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class DifferentialCapabilityDefaultView
	+final class DifferentialDefaultViewCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'differential.default.view';
	diff --git a/src/applications/differential/controller/DifferentialRevisionLandController.php b/src/applications/differential/controller/DifferentialRevisionLandController.php
	--- a/src/applications/differential/controller/DifferentialRevisionLandController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionLandController.php
	@@ -121,7 +121,7 @@
	$can_push = PhabricatorPolicyFilter::hasCapability(
	$request->getUser(),
	$repository,
	- DiffusionCapabilityPush::CAPABILITY);
	+ DiffusionPushCapability::CAPABILITY);

	if (!$can_push) {
	throw new Exception(
	@@ -159,4 +159,5 @@
	$lock->lock();
	return $lock;
	}
	+
	}
	diff --git a/src/applications/differential/landing/DifferentialLandingStrategy.php b/src/applications/differential/landing/DifferentialLandingStrategy.php
	--- a/src/applications/differential/landing/DifferentialLandingStrategy.php
	+++ b/src/applications/differential/landing/DifferentialLandingStrategy.php
	@@ -8,7 +8,7 @@
	PhabricatorRepository $repository);

	/**
	- * returns PhabricatorActionView or null.
	+ * @return PhabricatorActionView or null.
	*/
	abstract function createMenuItem(
	PhabricatorUser $viewer,
	@@ -16,7 +16,7 @@
	PhabricatorRepository $repository);

	/**
	- * returns PhabricatorActionView which can be attached to the revision view.
	+ * @return PhabricatorActionView which can be attached to the revision view.
	*/
	protected function createActionView($revision, $name) {
	$strategy = get_class($this);
	@@ -34,8 +34,8 @@
	* By default, this method checks for push permissions, and for the
	* revision being Accepted.
	*
	- * @return FALSE for "not disabled";
	- * Human-readable text explaining why, if it is disabled;
	+ * @return False for "not disabled"; human-readable text explaining why, if
	+ * it is disabled.
	*/
	public function isActionDisabled(
	PhabricatorUser $viewer,
	@@ -50,7 +50,7 @@
	if (!PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$repository,
	- DiffusionCapabilityPush::CAPABILITY)) {
	+ DiffusionPushCapability::CAPABILITY)) {
	return pht('You do not have permissions to push to this repository.');
	}

	@@ -58,29 +58,26 @@
	}

	/**
	- * might break if repository is not Git.
	+ * Might break if repository is not Git.
	*/
	protected function getGitWorkspace(PhabricatorRepository $repository) {
	try {
	return DifferentialGetWorkingCopy::getCleanGitWorkspace($repository);
	} catch (Exception $e) {
	- throw new PhutilProxyException(
	- 'Failed to allocate a workspace',
	- $e);
	+ throw new PhutilProxyException('Failed to allocate a workspace', $e);
	}
	}

	/**
	- * might break if repository is not Mercurial.
	+ * Might break if repository is not Mercurial.
	*/
	protected function getMercurialWorkspace(PhabricatorRepository $repository) {
	try {
	return DifferentialGetWorkingCopy::getCleanMercurialWorkspace(
	$repository);
	} catch (Exception $e) {
	- throw new PhutilProxyException(
	- 'Failed to allocate a workspace',
	- $e);
	+ throw new PhutilProxyException('Failed to allocate a workspace', $e);
	}
	}
	+
	}
	diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
	--- a/src/applications/differential/storage/DifferentialRevision.php
	+++ b/src/applications/differential/storage/DifferentialRevision.php
	@@ -57,7 +57,7 @@
	->executeOne();

	$view_policy = $app->getPolicy(
	- DifferentialCapabilityDefaultView::CAPABILITY);
	+ DifferentialDefaultViewCapability::CAPABILITY);

	return id(new DifferentialRevision())
	->setViewPolicy($view_policy)
	diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
	--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
	+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
	@@ -130,12 +130,12 @@

	protected function getCustomCapabilities() {
	return array(
	- DiffusionCapabilityDefaultView::CAPABILITY => array(),
	- DiffusionCapabilityDefaultEdit::CAPABILITY => array(
	+ DiffusionDefaultViewCapability::CAPABILITY => array(),
	+ DiffusionDefaultEditCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	- DiffusionCapabilityDefaultPush::CAPABILITY => array(),
	- DiffusionCapabilityCreateRepositories::CAPABILITY => array(
	+ DiffusionDefaultPushCapability::CAPABILITY => array(),
	+ DiffusionCreateRepositoriesCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	);
	diff --git a/src/applications/diffusion/capability/DiffusionCapabilityCreateRepositories.php b/src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php
	rename from src/applications/diffusion/capability/DiffusionCapabilityCreateRepositories.php
	rename to src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php
	--- a/src/applications/diffusion/capability/DiffusionCapabilityCreateRepositories.php
	+++ b/src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class DiffusionCapabilityCreateRepositories
	+final class DiffusionCreateRepositoriesCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'diffusion.create';
	diff --git a/src/applications/diffusion/capability/DiffusionCapabilityDefaultEdit.php b/src/applications/diffusion/capability/DiffusionDefaultEditCapability.php
	rename from src/applications/diffusion/capability/DiffusionCapabilityDefaultEdit.php
	rename to src/applications/diffusion/capability/DiffusionDefaultEditCapability.php
	--- a/src/applications/diffusion/capability/DiffusionCapabilityDefaultEdit.php
	+++ b/src/applications/diffusion/capability/DiffusionDefaultEditCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class DiffusionCapabilityDefaultEdit
	- extends PhabricatorPolicyCapability {
	+final class DiffusionDefaultEditCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'diffusion.default.edit';

	diff --git a/src/applications/diffusion/capability/DiffusionCapabilityDefaultPush.php b/src/applications/diffusion/capability/DiffusionDefaultPushCapability.php
	rename from src/applications/diffusion/capability/DiffusionCapabilityDefaultPush.php
	rename to src/applications/diffusion/capability/DiffusionDefaultPushCapability.php
	--- a/src/applications/diffusion/capability/DiffusionCapabilityDefaultPush.php
	+++ b/src/applications/diffusion/capability/DiffusionDefaultPushCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class DiffusionCapabilityDefaultPush
	- extends PhabricatorPolicyCapability {
	+final class DiffusionDefaultPushCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'diffusion.default.push';

	diff --git a/src/applications/diffusion/capability/DiffusionCapabilityDefaultView.php b/src/applications/diffusion/capability/DiffusionDefaultViewCapability.php
	rename from src/applications/diffusion/capability/DiffusionCapabilityDefaultView.php
	rename to src/applications/diffusion/capability/DiffusionDefaultViewCapability.php
	--- a/src/applications/diffusion/capability/DiffusionCapabilityDefaultView.php
	+++ b/src/applications/diffusion/capability/DiffusionDefaultViewCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class DiffusionCapabilityDefaultView
	- extends PhabricatorPolicyCapability {
	+final class DiffusionDefaultViewCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'diffusion.default.view';

	diff --git a/src/applications/diffusion/capability/DiffusionCapabilityPush.php b/src/applications/diffusion/capability/DiffusionPushCapability.php
	rename from src/applications/diffusion/capability/DiffusionCapabilityPush.php
	rename to src/applications/diffusion/capability/DiffusionPushCapability.php
	--- a/src/applications/diffusion/capability/DiffusionCapabilityPush.php
	+++ b/src/applications/diffusion/capability/DiffusionPushCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class DiffusionCapabilityPush
	- extends PhabricatorPolicyCapability {
	+final class DiffusionPushCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'diffusion.push';

	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
	--- a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
	@@ -38,7 +38,7 @@
	case 'import':
	case 'create':
	$this->requireApplicationCapability(
	- DiffusionCapabilityCreateRepositories::CAPABILITY);
	+ DiffusionCreateRepositoriesCapability::CAPABILITY);

	$cancel_uri = $this->getApplicationURI('new/');
	break;
	@@ -671,7 +671,7 @@

	$push_policy = id(new AphrontFormPolicyControl())
	->setUser($viewer)
	- ->setCapability(DiffusionCapabilityPush::CAPABILITY)
	+ ->setCapability(DiffusionPushCapability::CAPABILITY)
	->setPolicyObject($repository)
	->setPolicies($policies)
	->setName('pushPolicy');
	@@ -849,5 +849,4 @@
	return $this->repository;
	}

	-
	}
	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
	--- a/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php
	@@ -372,7 +372,7 @@
	$descriptions[PhabricatorPolicyCapability::CAN_EDIT]);

	$pushable = $repository->isHosted()
	- ? $descriptions[DiffusionCapabilityPush::CAPABILITY]
	+ ? $descriptions[DiffusionPushCapability::CAPABILITY]
	: phutil_tag('em', array(), pht('Not a Hosted Repository'));
	$view->addProperty(pht('Pushable By'), $pushable);

	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryListController.php b/src/applications/diffusion/controller/DiffusionRepositoryListController.php
	--- a/src/applications/diffusion/controller/DiffusionRepositoryListController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryListController.php
	@@ -41,7 +41,7 @@
	$crumbs = parent::buildApplicationCrumbs();

	$can_create = $this->hasApplicationCapability(
	- DiffusionCapabilityCreateRepositories::CAPABILITY);
	+ DiffusionCreateRepositoriesCapability::CAPABILITY);

	$crumbs->addAction(
	id(new PHUIListItemView())
	diff --git a/src/applications/diffusion/controller/DiffusionRepositoryNewController.php b/src/applications/diffusion/controller/DiffusionRepositoryNewController.php
	--- a/src/applications/diffusion/controller/DiffusionRepositoryNewController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryNewController.php
	@@ -1,14 +1,13 @@
	<?php

	-final class DiffusionRepositoryNewController
	- extends DiffusionController {
	+final class DiffusionRepositoryNewController extends DiffusionController {

	public function processRequest() {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$this->requireApplicationCapability(
	- DiffusionCapabilityCreateRepositories::CAPABILITY);
	+ DiffusionCreateRepositoriesCapability::CAPABILITY);

	if ($request->isFormPost()) {
	if ($request->getStr('type')) {
	diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php
	--- a/src/applications/diffusion/controller/DiffusionServeController.php
	+++ b/src/applications/diffusion/controller/DiffusionServeController.php
	@@ -144,7 +144,7 @@
	$can_push = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$repository,
	- DiffusionCapabilityPush::CAPABILITY);
	+ DiffusionPushCapability::CAPABILITY);
	if (!$can_push) {
	if ($viewer->isLoggedIn()) {
	return new PhabricatorVCSResponse(
	diff --git a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
	--- a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
	+++ b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php
	@@ -118,7 +118,7 @@
	$can_push = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$repository,
	- DiffusionCapabilityPush::CAPABILITY);
	+ DiffusionPushCapability::CAPABILITY);
	if (!$can_push) {
	throw new Exception(
	pht('You do not have permission to push to this repository.'));
	diff --git a/src/applications/drydock/application/PhabricatorDrydockApplication.php b/src/applications/drydock/application/PhabricatorDrydockApplication.php
	--- a/src/applications/drydock/application/PhabricatorDrydockApplication.php
	+++ b/src/applications/drydock/application/PhabricatorDrydockApplication.php
	@@ -67,11 +67,11 @@

	protected function getCustomCapabilities() {
	return array(
	- DrydockCapabilityDefaultView::CAPABILITY => array(),
	- DrydockCapabilityDefaultEdit::CAPABILITY => array(
	+ DrydockDefaultViewCapability::CAPABILITY => array(),
	+ DrydockDefaultEditCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	- DrydockCapabilityCreateBlueprints::CAPABILITY => array(
	+ DrydockCreateBlueprintsCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	);
	diff --git a/src/applications/drydock/capability/DrydockCapabilityCreateBlueprints.php b/src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php
	rename from src/applications/drydock/capability/DrydockCapabilityCreateBlueprints.php
	rename to src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php
	--- a/src/applications/drydock/capability/DrydockCapabilityCreateBlueprints.php
	+++ b/src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class DrydockCapabilityCreateBlueprints
	+final class DrydockCreateBlueprintsCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'drydock.blueprint.create';
	diff --git a/src/applications/drydock/capability/DrydockCapabilityDefaultEdit.php b/src/applications/drydock/capability/DrydockDefaultEditCapability.php
	rename from src/applications/drydock/capability/DrydockCapabilityDefaultEdit.php
	rename to src/applications/drydock/capability/DrydockDefaultEditCapability.php
	--- a/src/applications/drydock/capability/DrydockCapabilityDefaultEdit.php
	+++ b/src/applications/drydock/capability/DrydockDefaultEditCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class DrydockCapabilityDefaultEdit
	- extends PhabricatorPolicyCapability {
	+final class DrydockDefaultEditCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'drydock.default.edit';

	diff --git a/src/applications/drydock/capability/DrydockCapabilityDefaultView.php b/src/applications/drydock/capability/DrydockDefaultViewCapability.php
	rename from src/applications/drydock/capability/DrydockCapabilityDefaultView.php
	rename to src/applications/drydock/capability/DrydockDefaultViewCapability.php
	--- a/src/applications/drydock/capability/DrydockCapabilityDefaultView.php
	+++ b/src/applications/drydock/capability/DrydockDefaultViewCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class DrydockCapabilityDefaultView
	- extends PhabricatorPolicyCapability {
	+final class DrydockDefaultViewCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'drydock.default.view';

	diff --git a/src/applications/drydock/controller/DrydockBlueprintCreateController.php b/src/applications/drydock/controller/DrydockBlueprintCreateController.php
	--- a/src/applications/drydock/controller/DrydockBlueprintCreateController.php
	+++ b/src/applications/drydock/controller/DrydockBlueprintCreateController.php
	@@ -8,7 +8,7 @@
	$viewer = $request->getUser();

	$this->requireApplicationCapability(
	- DrydockCapabilityCreateBlueprints::CAPABILITY);
	+ DrydockCreateBlueprintsCapability::CAPABILITY);

	$implementations =
	DrydockBlueprintImplementation::getAllBlueprintImplementations();
	diff --git a/src/applications/drydock/controller/DrydockBlueprintEditController.php b/src/applications/drydock/controller/DrydockBlueprintEditController.php
	--- a/src/applications/drydock/controller/DrydockBlueprintEditController.php
	+++ b/src/applications/drydock/controller/DrydockBlueprintEditController.php
	@@ -30,7 +30,7 @@
	$cancel_uri = $this->getApplicationURI('blueprint/'.$this->id.'/');
	} else {
	$this->requireApplicationCapability(
	- DrydockCapabilityCreateBlueprints::CAPABILITY);
	+ DrydockCreateBlueprintsCapability::CAPABILITY);

	$class = $request->getStr('class');

	diff --git a/src/applications/drydock/controller/DrydockBlueprintListController.php b/src/applications/drydock/controller/DrydockBlueprintListController.php
	--- a/src/applications/drydock/controller/DrydockBlueprintListController.php
	+++ b/src/applications/drydock/controller/DrydockBlueprintListController.php
	@@ -24,7 +24,7 @@

	public function buildApplicationCrumbs() {
	$can_create = $this->hasApplicationCapability(
	- DrydockCapabilityCreateBlueprints::CAPABILITY);
	+ DrydockCreateBlueprintsCapability::CAPABILITY);

	$crumbs = parent::buildApplicationCrumbs();
	$crumbs->addAction(
	diff --git a/src/applications/drydock/storage/DrydockBlueprint.php b/src/applications/drydock/storage/DrydockBlueprint.php
	--- a/src/applications/drydock/storage/DrydockBlueprint.php
	+++ b/src/applications/drydock/storage/DrydockBlueprint.php
	@@ -18,9 +18,9 @@
	->executeOne();

	$view_policy = $app->getPolicy(
	- DrydockCapabilityDefaultView::CAPABILITY);
	+ DrydockDefaultViewCapability::CAPABILITY);
	$edit_policy = $app->getPolicy(
	- DrydockCapabilityDefaultEdit::CAPABILITY);
	+ DrydockDefaultEditCapability::CAPABILITY);

	return id(new DrydockBlueprint())
	->setViewPolicy($view_policy)
	diff --git a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
	--- a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
	+++ b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
	@@ -83,7 +83,7 @@

	public function getCustomCapabilities() {
	return array(
	- HarbormasterCapabilityManagePlans::CAPABILITY => array(
	+ HarbormasterManagePlansCapability::CAPABILITY => array(
	'caption' => pht('Can create and manage build plans.'),
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	diff --git a/src/applications/harbormaster/capability/HarbormasterCapabilityManagePlans.php b/src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php
	rename from src/applications/harbormaster/capability/HarbormasterCapabilityManagePlans.php
	rename to src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php
	--- a/src/applications/harbormaster/capability/HarbormasterCapabilityManagePlans.php
	+++ b/src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class HarbormasterCapabilityManagePlans
	+final class HarbormasterManagePlansCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'harbormaster.plans';
	diff --git a/src/applications/harbormaster/controller/HarbormasterPlanDisableController.php b/src/applications/harbormaster/controller/HarbormasterPlanDisableController.php
	--- a/src/applications/harbormaster/controller/HarbormasterPlanDisableController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterPlanDisableController.php
	@@ -14,7 +14,7 @@
	$viewer = $request->getUser();

	$this->requireApplicationCapability(
	- HarbormasterCapabilityManagePlans::CAPABILITY);
	+ HarbormasterManagePlansCapability::CAPABILITY);

	$plan = id(new HarbormasterBuildPlanQuery())
	->setViewer($viewer)
	diff --git a/src/applications/harbormaster/controller/HarbormasterPlanEditController.php b/src/applications/harbormaster/controller/HarbormasterPlanEditController.php
	--- a/src/applications/harbormaster/controller/HarbormasterPlanEditController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterPlanEditController.php
	@@ -1,7 +1,6 @@
	<?php

	-final class HarbormasterPlanEditController
	- extends HarbormasterPlanController {
	+final class HarbormasterPlanEditController extends HarbormasterPlanController {

	private $id;

	@@ -14,7 +13,7 @@
	$viewer = $request->getUser();

	$this->requireApplicationCapability(
	- HarbormasterCapabilityManagePlans::CAPABILITY);
	+ HarbormasterManagePlansCapability::CAPABILITY);

	if ($this->id) {
	$plan = id(new HarbormasterBuildPlanQuery())
	diff --git a/src/applications/harbormaster/controller/HarbormasterPlanOrderController.php b/src/applications/harbormaster/controller/HarbormasterPlanOrderController.php
	--- a/src/applications/harbormaster/controller/HarbormasterPlanOrderController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterPlanOrderController.php
	@@ -15,7 +15,7 @@
	$request->validateCSRF();

	$this->requireApplicationCapability(
	- HarbormasterCapabilityManagePlans::CAPABILITY);
	+ HarbormasterManagePlansCapability::CAPABILITY);

	$plan = id(new HarbormasterBuildPlanQuery())
	->setViewer($user)
	diff --git a/src/applications/harbormaster/controller/HarbormasterPlanRunController.php b/src/applications/harbormaster/controller/HarbormasterPlanRunController.php
	--- a/src/applications/harbormaster/controller/HarbormasterPlanRunController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterPlanRunController.php
	@@ -1,7 +1,6 @@
	<?php

	-final class HarbormasterPlanRunController
	- extends HarbormasterController {
	+final class HarbormasterPlanRunController extends HarbormasterController {

	private $id;

	@@ -14,7 +13,7 @@
	$viewer = $request->getUser();

	$this->requireApplicationCapability(
	- HarbormasterCapabilityManagePlans::CAPABILITY);
	+ HarbormasterManagePlansCapability::CAPABILITY);

	$plan_id = $this->id;
	$plan = id(new HarbormasterBuildPlanQuery())
	diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	@@ -1,7 +1,6 @@
	<?php

	-final class HarbormasterPlanViewController
	- extends HarbormasterPlanController {
	+final class HarbormasterPlanViewController extends HarbormasterPlanController {

	private $id;

	@@ -85,7 +84,7 @@
	->execute();

	$can_edit = $this->hasApplicationCapability(
	- HarbormasterCapabilityManagePlans::CAPABILITY);
	+ HarbormasterManagePlansCapability::CAPABILITY);

	$i = 1;
	$step_list = id(new PHUIObjectItemListView())
	@@ -215,7 +214,7 @@
	->setObjectURI($this->getApplicationURI("plan/{$id}/"));

	$can_edit = $this->hasApplicationCapability(
	- HarbormasterCapabilityManagePlans::CAPABILITY);
	+ HarbormasterManagePlansCapability::CAPABILITY);

	$list->addAction(
	id(new PhabricatorActionView())
	diff --git a/src/applications/harbormaster/controller/HarbormasterStepAddController.php b/src/applications/harbormaster/controller/HarbormasterStepAddController.php
	--- a/src/applications/harbormaster/controller/HarbormasterStepAddController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterStepAddController.php
	@@ -1,7 +1,6 @@
	<?php

	-final class HarbormasterStepAddController
	- extends HarbormasterController {
	+final class HarbormasterStepAddController extends HarbormasterController {

	private $id;

	@@ -14,12 +13,12 @@
	$viewer = $request->getUser();

	$this->requireApplicationCapability(
	- HarbormasterCapabilityManagePlans::CAPABILITY);
	+ HarbormasterManagePlansCapability::CAPABILITY);

	$plan = id(new HarbormasterBuildPlanQuery())
	- ->setViewer($viewer)
	- ->withIDs(array($this->id))
	- ->executeOne();
	+ ->setViewer($viewer)
	+ ->withIDs(array($this->id))
	+ ->executeOne();
	if (!$plan) {
	return new Aphront404Response();
	}
	@@ -31,8 +30,7 @@
	if ($request->isFormPost()) {
	$class = $request->getStr('class');
	if (!HarbormasterBuildStepImplementation::getImplementation($class)) {
	- $errors[] = pht(
	- 'Choose the type of build step you want to add.');
	+ $errors[] = pht('Choose the type of build step you want to add.');
	}
	if (!$errors) {
	$new_uri = $this->getApplicationURI("step/new/{$plan_id}/{$class}/");
	diff --git a/src/applications/harbormaster/controller/HarbormasterStepDeleteController.php b/src/applications/harbormaster/controller/HarbormasterStepDeleteController.php
	--- a/src/applications/harbormaster/controller/HarbormasterStepDeleteController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterStepDeleteController.php
	@@ -1,7 +1,6 @@
	<?php

	-final class HarbormasterStepDeleteController
	- extends HarbormasterController {
	+final class HarbormasterStepDeleteController extends HarbormasterController {

	private $id;

	@@ -14,7 +13,7 @@
	$viewer = $request->getUser();

	$this->requireApplicationCapability(
	- HarbormasterCapabilityManagePlans::CAPABILITY);
	+ HarbormasterManagePlansCapability::CAPABILITY);

	$id = $this->id;

	diff --git a/src/applications/harbormaster/controller/HarbormasterStepEditController.php b/src/applications/harbormaster/controller/HarbormasterStepEditController.php
	--- a/src/applications/harbormaster/controller/HarbormasterStepEditController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterStepEditController.php
	@@ -1,7 +1,6 @@
	<?php

	-final class HarbormasterStepEditController
	- extends HarbormasterController {
	+final class HarbormasterStepEditController extends HarbormasterController {

	private $id;
	private $planID;
	@@ -18,7 +17,7 @@
	$viewer = $request->getUser();

	$this->requireApplicationCapability(
	- HarbormasterCapabilityManagePlans::CAPABILITY);
	+ HarbormasterManagePlansCapability::CAPABILITY);

	if ($this->id) {
	$step = id(new HarbormasterBuildStepQuery())
	@@ -200,5 +199,4 @@
	->appendChild($form);
	}

	-
	}
	diff --git a/src/applications/herald/application/PhabricatorHeraldApplication.php b/src/applications/herald/application/PhabricatorHeraldApplication.php
	--- a/src/applications/herald/application/PhabricatorHeraldApplication.php
	+++ b/src/applications/herald/application/PhabricatorHeraldApplication.php
	@@ -63,7 +63,7 @@

	protected function getCustomCapabilities() {
	return array(
	- HeraldCapabilityManageGlobalRules::CAPABILITY => array(
	+ HeraldManageGlobalRulesCapability::CAPABILITY => array(
	'caption' => pht('Global rules can bypass access controls.'),
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	diff --git a/src/applications/herald/capability/HeraldCapabilityManageGlobalRules.php b/src/applications/herald/capability/HeraldManageGlobalRulesCapability.php
	rename from src/applications/herald/capability/HeraldCapabilityManageGlobalRules.php
	rename to src/applications/herald/capability/HeraldManageGlobalRulesCapability.php
	--- a/src/applications/herald/capability/HeraldCapabilityManageGlobalRules.php
	+++ b/src/applications/herald/capability/HeraldManageGlobalRulesCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class HeraldCapabilityManageGlobalRules
	+final class HeraldManageGlobalRulesCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'herald.global';
	diff --git a/src/applications/herald/controller/HeraldDisableController.php b/src/applications/herald/controller/HeraldDisableController.php
	--- a/src/applications/herald/controller/HeraldDisableController.php
	+++ b/src/applications/herald/controller/HeraldDisableController.php
	@@ -30,7 +30,7 @@

	if ($rule->isGlobalRule()) {
	$this->requireApplicationCapability(
	- HeraldCapabilityManageGlobalRules::CAPABILITY);
	+ HeraldManageGlobalRulesCapability::CAPABILITY);
	}

	$view_uri = $this->getApplicationURI("rule/{$id}/");
	diff --git a/src/applications/herald/controller/HeraldNewController.php b/src/applications/herald/controller/HeraldNewController.php
	--- a/src/applications/herald/controller/HeraldNewController.php
	+++ b/src/applications/herald/controller/HeraldNewController.php
	@@ -251,7 +251,7 @@
	)) + $rule_type_map;

	list($can_global, $global_link) = $this->explainApplicationCapability(
	- HeraldCapabilityManageGlobalRules::CAPABILITY,
	+ HeraldManageGlobalRulesCapability::CAPABILITY,
	pht('You have permission to create and manage global rules.'),
	pht('You do not have permission to create or manage global rules.'));

	@@ -313,4 +313,5 @@

	return $radio;
	}
	+
	}
	diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
	--- a/src/applications/herald/controller/HeraldRuleController.php
	+++ b/src/applications/herald/controller/HeraldRuleController.php
	@@ -10,7 +10,6 @@
	}

	public function processRequest() {
	-
	$request = $this->getRequest();
	$user = $request->getUser();

	@@ -83,7 +82,7 @@

	if ($rule->isGlobalRule()) {
	$this->requireApplicationCapability(
	- HeraldCapabilityManageGlobalRules::CAPABILITY);
	+ HeraldManageGlobalRulesCapability::CAPABILITY);
	}

	$adapter = HeraldAdapter::getAdapterForContentType($rule->getContentType());
	@@ -666,5 +665,4 @@
	return $all_rules;
	}

	-
	}
	diff --git a/src/applications/herald/storage/HeraldRule.php b/src/applications/herald/storage/HeraldRule.php
	--- a/src/applications/herald/storage/HeraldRule.php
	+++ b/src/applications/herald/storage/HeraldRule.php
	@@ -223,7 +223,7 @@
	case PhabricatorPolicyCapability::CAN_EDIT:
	$app = 'PhabricatorHeraldApplication';
	$herald = PhabricatorApplication::getByClass($app);
	- $global = HeraldCapabilityManageGlobalRules::CAPABILITY;
	+ $global = HeraldManageGlobalRulesCapability::CAPABILITY;
	return $herald->getPolicy($global);
	}
	} else if ($this->isObjectRule()) {
	diff --git a/src/applications/legalpad/application/PhabricatorLegalpadApplication.php b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
	--- a/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
	+++ b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
	@@ -68,9 +68,9 @@

	protected function getCustomCapabilities() {
	return array(
	- LegalpadCapabilityCreateDocuments::CAPABILITY => array(),
	- LegalpadCapabilityDefaultView::CAPABILITY => array(),
	- LegalpadCapabilityDefaultEdit::CAPABILITY => array(),
	+ LegalpadCreateDocumentsCapability::CAPABILITY => array(),
	+ LegalpadDefaultViewCapability::CAPABILITY => array(),
	+ LegalpadDefaultEditCapability::CAPABILITY => array(),
	);
	}

	diff --git a/src/applications/legalpad/capability/LegalpadCapabilityCreateDocuments.php b/src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php
	rename from src/applications/legalpad/capability/LegalpadCapabilityCreateDocuments.php
	rename to src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php
	--- a/src/applications/legalpad/capability/LegalpadCapabilityCreateDocuments.php
	+++ b/src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class LegalpadCapabilityCreateDocuments
	+final class LegalpadCreateDocumentsCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'legalpad.create';
	diff --git a/src/applications/legalpad/capability/LegalpadCapabilityDefaultEdit.php b/src/applications/legalpad/capability/LegalpadDefaultEditCapability.php
	rename from src/applications/legalpad/capability/LegalpadCapabilityDefaultEdit.php
	rename to src/applications/legalpad/capability/LegalpadDefaultEditCapability.php
	--- a/src/applications/legalpad/capability/LegalpadCapabilityDefaultEdit.php
	+++ b/src/applications/legalpad/capability/LegalpadDefaultEditCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class LegalpadCapabilityDefaultEdit
	- extends PhabricatorPolicyCapability {
	+final class LegalpadDefaultEditCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'legalpad.default.edit';

	diff --git a/src/applications/legalpad/capability/LegalpadCapabilityDefaultView.php b/src/applications/legalpad/capability/LegalpadDefaultViewCapability.php
	rename from src/applications/legalpad/capability/LegalpadCapabilityDefaultView.php
	rename to src/applications/legalpad/capability/LegalpadDefaultViewCapability.php
	--- a/src/applications/legalpad/capability/LegalpadCapabilityDefaultView.php
	+++ b/src/applications/legalpad/capability/LegalpadDefaultViewCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class LegalpadCapabilityDefaultView
	- extends PhabricatorPolicyCapability {
	+final class LegalpadDefaultViewCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'legalpad.default.view';

	diff --git a/src/applications/legalpad/controller/LegalpadDocumentEditController.php b/src/applications/legalpad/controller/LegalpadDocumentEditController.php
	--- a/src/applications/legalpad/controller/LegalpadDocumentEditController.php
	+++ b/src/applications/legalpad/controller/LegalpadDocumentEditController.php
	@@ -16,7 +16,7 @@
	$is_create = true;

	$this->requireApplicationCapability(
	- LegalpadCapabilityCreateDocuments::CAPABILITY);
	+ LegalpadCreateDocumentsCapability::CAPABILITY);

	$document = LegalpadDocument::initializeNewDocument($user);
	$body = id(new LegalpadDocumentBody())
	diff --git a/src/applications/legalpad/controller/LegalpadDocumentListController.php b/src/applications/legalpad/controller/LegalpadDocumentListController.php
	--- a/src/applications/legalpad/controller/LegalpadDocumentListController.php
	+++ b/src/applications/legalpad/controller/LegalpadDocumentListController.php
	@@ -26,7 +26,7 @@
	$crumbs = parent::buildApplicationCrumbs();

	$can_create = $this->hasApplicationCapability(
	- LegalpadCapabilityCreateDocuments::CAPABILITY);
	+ LegalpadCreateDocumentsCapability::CAPABILITY);

	$crumbs->addAction(
	id(new PHUIListItemView())
	diff --git a/src/applications/legalpad/storage/LegalpadDocument.php b/src/applications/legalpad/storage/LegalpadDocument.php
	--- a/src/applications/legalpad/storage/LegalpadDocument.php
	+++ b/src/applications/legalpad/storage/LegalpadDocument.php
	@@ -33,8 +33,8 @@
	->withClasses(array('PhabricatorLegalpadApplication'))
	->executeOne();

	- $view_policy = $app->getPolicy(LegalpadCapabilityDefaultView::CAPABILITY);
	- $edit_policy = $app->getPolicy(LegalpadCapabilityDefaultEdit::CAPABILITY);
	+ $view_policy = $app->getPolicy(LegalpadDefaultViewCapability::CAPABILITY);
	+ $edit_policy = $app->getPolicy(LegalpadDefaultEditCapability::CAPABILITY);

	return id(new LegalpadDocument())
	->setVersions(0)
	diff --git a/src/applications/macro/application/PhabricatorMacroApplication.php b/src/applications/macro/application/PhabricatorMacroApplication.php
	--- a/src/applications/macro/application/PhabricatorMacroApplication.php
	+++ b/src/applications/macro/application/PhabricatorMacroApplication.php
	@@ -50,7 +50,7 @@

	protected function getCustomCapabilities() {
	return array(
	- PhabricatorMacroCapabilityManage::CAPABILITY => array(
	+ PhabricatorMacroManageCapability::CAPABILITY => array(
	'caption' => pht('Allows creating and editing macros.'),
	),
	);
	diff --git a/src/applications/macro/capability/PhabricatorMacroCapabilityManage.php b/src/applications/macro/capability/PhabricatorMacroManageCapability.php
	rename from src/applications/macro/capability/PhabricatorMacroCapabilityManage.php
	rename to src/applications/macro/capability/PhabricatorMacroManageCapability.php
	--- a/src/applications/macro/capability/PhabricatorMacroCapabilityManage.php
	+++ b/src/applications/macro/capability/PhabricatorMacroManageCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorMacroCapabilityManage
	+final class PhabricatorMacroManageCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'macro.manage';
	diff --git a/src/applications/macro/controller/PhabricatorMacroAudioController.php b/src/applications/macro/controller/PhabricatorMacroAudioController.php
	--- a/src/applications/macro/controller/PhabricatorMacroAudioController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroAudioController.php
	@@ -1,7 +1,6 @@
	<?php

	-final class PhabricatorMacroAudioController
	- extends PhabricatorMacroController {
	+final class PhabricatorMacroAudioController extends PhabricatorMacroController {

	private $id;

	@@ -10,9 +9,8 @@
	}

	public function processRequest() {
	-
	$this->requireApplicationCapability(
	- PhabricatorMacroCapabilityManage::CAPABILITY);
	+ PhabricatorMacroManageCapability::CAPABILITY);

	$request = $this->getRequest();
	$viewer = $request->getUser();
	@@ -157,4 +155,5 @@
	'title' => $title,
	));
	}
	+
	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroController.php b/src/applications/macro/controller/PhabricatorMacroController.php
	--- a/src/applications/macro/controller/PhabricatorMacroController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroController.php
	@@ -1,7 +1,6 @@
	<?php

	-abstract class PhabricatorMacroController
	- extends PhabricatorController {
	+abstract class PhabricatorMacroController extends PhabricatorController {

	protected function buildSideNavView($for_app = false) {
	$nav = new AphrontSideNavFilterView();
	@@ -29,7 +28,7 @@
	$crumbs = parent::buildApplicationCrumbs();

	$can_manage = $this->hasApplicationCapability(
	- PhabricatorMacroCapabilityManage::CAPABILITY);
	+ PhabricatorMacroManageCapability::CAPABILITY);

	$crumbs->addAction(
	id(new PHUIListItemView())
	diff --git a/src/applications/macro/controller/PhabricatorMacroDisableController.php b/src/applications/macro/controller/PhabricatorMacroDisableController.php
	--- a/src/applications/macro/controller/PhabricatorMacroDisableController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroDisableController.php
	@@ -10,9 +10,8 @@
	}

	public function processRequest() {
	-
	$this->requireApplicationCapability(
	- PhabricatorMacroCapabilityManage::CAPABILITY);
	+ PhabricatorMacroManageCapability::CAPABILITY);

	$request = $this->getRequest();
	$user = $request->getUser();
	@@ -55,4 +54,5 @@

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}
	+
	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php
	--- a/src/applications/macro/controller/PhabricatorMacroEditController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroEditController.php
	@@ -1,7 +1,6 @@
	<?php

	-final class PhabricatorMacroEditController
	- extends PhabricatorMacroController {
	+final class PhabricatorMacroEditController extends PhabricatorMacroController {

	private $id;

	@@ -10,9 +9,8 @@
	}

	public function processRequest() {
	-
	$this->requireApplicationCapability(
	- PhabricatorMacroCapabilityManage::CAPABILITY);
	+ PhabricatorMacroManageCapability::CAPABILITY);

	$request = $this->getRequest();
	$user = $request->getUser();
	@@ -262,4 +260,5 @@
	'title' => $title,
	));
	}
	+
	}
	diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php
	--- a/src/applications/macro/controller/PhabricatorMacroViewController.php
	+++ b/src/applications/macro/controller/PhabricatorMacroViewController.php
	@@ -118,9 +118,8 @@
	}

	private function buildActionView(PhabricatorFileImageMacro $macro) {
	-
	$can_manage = $this->hasApplicationCapability(
	- PhabricatorMacroCapabilityManage::CAPABILITY);
	+ PhabricatorMacroManageCapability::CAPABILITY);

	$request = $this->getRequest();
	$view = id(new PhabricatorActionListView())
	diff --git a/src/applications/maniphest/application/PhabricatorManiphestApplication.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
	--- a/src/applications/maniphest/application/PhabricatorManiphestApplication.php
	+++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
	@@ -104,18 +104,18 @@

	protected function getCustomCapabilities() {
	return array(
	- ManiphestCapabilityDefaultView::CAPABILITY => array(
	+ ManiphestDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for newly created tasks.'),
	),
	- ManiphestCapabilityDefaultEdit::CAPABILITY => array(
	+ ManiphestDefaultEditCapability::CAPABILITY => array(
	'caption' => pht('Default edit policy for newly created tasks.'),
	),
	- ManiphestCapabilityEditStatus::CAPABILITY => array(),
	- ManiphestCapabilityEditAssign::CAPABILITY => array(),
	- ManiphestCapabilityEditPolicies::CAPABILITY => array(),
	- ManiphestCapabilityEditPriority::CAPABILITY => array(),
	- ManiphestCapabilityEditProjects::CAPABILITY => array(),
	- ManiphestCapabilityBulkEdit::CAPABILITY => array(),
	+ ManiphestEditStatusCapability::CAPABILITY => array(),
	+ ManiphestEditAssignCapability::CAPABILITY => array(),
	+ ManiphestEditPoliciesCapability::CAPABILITY => array(),
	+ ManiphestEditPriorityCapability::CAPABILITY => array(),
	+ ManiphestEditProjectsCapability::CAPABILITY => array(),
	+ ManiphestBulkEditCapability::CAPABILITY => array(),
	);
	}

	diff --git a/src/applications/maniphest/capability/ManiphestCapabilityBulkEdit.php b/src/applications/maniphest/capability/ManiphestBulkEditCapability.php
	rename from src/applications/maniphest/capability/ManiphestCapabilityBulkEdit.php
	rename to src/applications/maniphest/capability/ManiphestBulkEditCapability.php
	--- a/src/applications/maniphest/capability/ManiphestCapabilityBulkEdit.php
	+++ b/src/applications/maniphest/capability/ManiphestBulkEditCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class ManiphestCapabilityBulkEdit
	- extends PhabricatorPolicyCapability {
	+final class ManiphestBulkEditCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'maniphest.edit.bulk';

	diff --git a/src/applications/maniphest/capability/ManiphestCapabilityDefaultEdit.php b/src/applications/maniphest/capability/ManiphestDefaultEditCapability.php
	rename from src/applications/maniphest/capability/ManiphestCapabilityDefaultEdit.php
	rename to src/applications/maniphest/capability/ManiphestDefaultEditCapability.php
	--- a/src/applications/maniphest/capability/ManiphestCapabilityDefaultEdit.php
	+++ b/src/applications/maniphest/capability/ManiphestDefaultEditCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class ManiphestCapabilityDefaultEdit
	- extends PhabricatorPolicyCapability {
	+final class ManiphestDefaultEditCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'maniphest.default.edit';

	diff --git a/src/applications/maniphest/capability/ManiphestCapabilityDefaultView.php b/src/applications/maniphest/capability/ManiphestDefaultViewCapability.php
	rename from src/applications/maniphest/capability/ManiphestCapabilityDefaultView.php
	rename to src/applications/maniphest/capability/ManiphestDefaultViewCapability.php
	--- a/src/applications/maniphest/capability/ManiphestCapabilityDefaultView.php
	+++ b/src/applications/maniphest/capability/ManiphestDefaultViewCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class ManiphestCapabilityDefaultView
	- extends PhabricatorPolicyCapability {
	+final class ManiphestDefaultViewCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'maniphest.default.view';

	diff --git a/src/applications/maniphest/capability/ManiphestCapabilityEditAssign.php b/src/applications/maniphest/capability/ManiphestEditAssignCapability.php
	rename from src/applications/maniphest/capability/ManiphestCapabilityEditAssign.php
	rename to src/applications/maniphest/capability/ManiphestEditAssignCapability.php
	--- a/src/applications/maniphest/capability/ManiphestCapabilityEditAssign.php
	+++ b/src/applications/maniphest/capability/ManiphestEditAssignCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class ManiphestCapabilityEditAssign
	- extends PhabricatorPolicyCapability {
	+final class ManiphestEditAssignCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'maniphest.edit.assign';

	diff --git a/src/applications/maniphest/capability/ManiphestCapabilityEditPolicies.php b/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
	rename from src/applications/maniphest/capability/ManiphestCapabilityEditPolicies.php
	rename to src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
	--- a/src/applications/maniphest/capability/ManiphestCapabilityEditPolicies.php
	+++ b/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class ManiphestCapabilityEditPolicies
	+final class ManiphestEditPoliciesCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'maniphest.edit.policies';
	diff --git a/src/applications/maniphest/capability/ManiphestCapabilityEditPriority.php b/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
	rename from src/applications/maniphest/capability/ManiphestCapabilityEditPriority.php
	rename to src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
	--- a/src/applications/maniphest/capability/ManiphestCapabilityEditPriority.php
	+++ b/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class ManiphestCapabilityEditPriority
	+final class ManiphestEditPriorityCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'maniphest.edit.priority';
	diff --git a/src/applications/maniphest/capability/ManiphestCapabilityEditProjects.php b/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
	rename from src/applications/maniphest/capability/ManiphestCapabilityEditProjects.php
	rename to src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
	--- a/src/applications/maniphest/capability/ManiphestCapabilityEditProjects.php
	+++ b/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class ManiphestCapabilityEditProjects
	+final class ManiphestEditProjectsCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'maniphest.edit.projects';
	diff --git a/src/applications/maniphest/capability/ManiphestCapabilityEditStatus.php b/src/applications/maniphest/capability/ManiphestEditStatusCapability.php
	rename from src/applications/maniphest/capability/ManiphestCapabilityEditStatus.php
	rename to src/applications/maniphest/capability/ManiphestEditStatusCapability.php
	--- a/src/applications/maniphest/capability/ManiphestCapabilityEditStatus.php
	+++ b/src/applications/maniphest/capability/ManiphestEditStatusCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class ManiphestCapabilityEditStatus
	- extends PhabricatorPolicyCapability {
	+final class ManiphestEditStatusCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'maniphest.edit.status';

	diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php
	--- a/src/applications/maniphest/controller/ManiphestBatchEditController.php
	+++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php
	@@ -4,7 +4,7 @@

	public function processRequest() {
	$this->requireApplicationCapability(
	- ManiphestCapabilityBulkEdit::CAPABILITY);
	+ ManiphestBulkEditCapability::CAPABILITY);

	$request = $this->getRequest();
	$user = $request->getUser();
	diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	@@ -13,7 +13,6 @@
	}

	public function processRequest() {
	-
	$request = $this->getRequest();
	$user = $request->getUser();

	@@ -162,13 +161,13 @@

	$requires = array(
	ManiphestTransaction::TYPE_OWNER =>
	- ManiphestCapabilityEditAssign::CAPABILITY,
	+ ManiphestEditAssignCapability::CAPABILITY,
	ManiphestTransaction::TYPE_PRIORITY =>
	- ManiphestCapabilityEditPriority::CAPABILITY,
	+ ManiphestEditPriorityCapability::CAPABILITY,
	ManiphestTransaction::TYPE_PROJECTS =>
	- ManiphestCapabilityEditProjects::CAPABILITY,
	+ ManiphestEditProjectsCapability::CAPABILITY,
	ManiphestTransaction::TYPE_STATUS =>
	- ManiphestCapabilityEditStatus::CAPABILITY,
	+ ManiphestEditStatusCapability::CAPABILITY,
	);

	foreach ($transaction_types as $type => $name) {
	diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	--- a/src/applications/maniphest/controller/ManiphestTaskEditController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	@@ -9,21 +9,20 @@
	}

	public function processRequest() {
	-
	$request = $this->getRequest();
	$user = $request->getUser();
	$response_type = $request->getStr('responseType', 'task');

	$can_edit_assign = $this->hasApplicationCapability(
	- ManiphestCapabilityEditAssign::CAPABILITY);
	+ ManiphestEditAssignCapability::CAPABILITY);
	$can_edit_policies = $this->hasApplicationCapability(
	- ManiphestCapabilityEditPolicies::CAPABILITY);
	+ ManiphestEditPoliciesCapability::CAPABILITY);
	$can_edit_priority = $this->hasApplicationCapability(
	- ManiphestCapabilityEditPriority::CAPABILITY);
	+ ManiphestEditPriorityCapability::CAPABILITY);
	$can_edit_projects = $this->hasApplicationCapability(
	- ManiphestCapabilityEditProjects::CAPABILITY);
	+ ManiphestEditProjectsCapability::CAPABILITY);
	$can_edit_status = $this->hasApplicationCapability(
	- ManiphestCapabilityEditStatus::CAPABILITY);
	+ ManiphestEditStatusCapability::CAPABILITY);

	$parent_task = null;
	$template_id = null;
	@@ -750,4 +749,5 @@
	'pageObjects' => $page_objects,
	));
	}
	+
	}
	diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
	--- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php
	+++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
	@@ -432,15 +432,15 @@

	$app_capability_map = array(
	ManiphestTransaction::TYPE_PRIORITY =>
	- ManiphestCapabilityEditPriority::CAPABILITY,
	+ ManiphestEditPriorityCapability::CAPABILITY,
	ManiphestTransaction::TYPE_STATUS =>
	- ManiphestCapabilityEditStatus::CAPABILITY,
	+ ManiphestEditStatusCapability::CAPABILITY,
	ManiphestTransaction::TYPE_OWNER =>
	- ManiphestCapabilityEditAssign::CAPABILITY,
	+ ManiphestEditAssignCapability::CAPABILITY,
	PhabricatorTransactions::TYPE_EDIT_POLICY =>
	- ManiphestCapabilityEditPolicies::CAPABILITY,
	+ ManiphestEditPoliciesCapability::CAPABILITY,
	PhabricatorTransactions::TYPE_VIEW_POLICY =>
	- ManiphestCapabilityEditPolicies::CAPABILITY,
	+ ManiphestEditPoliciesCapability::CAPABILITY,
	);


	@@ -450,7 +450,7 @@
	if ($transaction_type == PhabricatorTransactions::TYPE_EDGE) {
	switch ($xaction->getMetadataValue('edge:type')) {
	case PhabricatorProjectObjectHasProjectEdgeType::EDGECONST:
	- $app_capability = ManiphestCapabilityEditProjects::CAPABILITY;
	+ $app_capability = ManiphestEditProjectsCapability::CAPABILITY;
	break;
	}
	} else {
	diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
	--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
	+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
	@@ -539,12 +539,12 @@
	$can_edit_priority = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$this->getApplication(),
	- ManiphestCapabilityEditPriority::CAPABILITY);
	+ ManiphestEditPriorityCapability::CAPABILITY);

	$can_bulk_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$this->getApplication(),
	- ManiphestCapabilityBulkEdit::CAPABILITY);
	+ ManiphestBulkEditCapability::CAPABILITY);
	}

	return id(new ManiphestTaskResultListView())
	diff --git a/src/applications/maniphest/storage/ManiphestTask.php b/src/applications/maniphest/storage/ManiphestTask.php
	--- a/src/applications/maniphest/storage/ManiphestTask.php
	+++ b/src/applications/maniphest/storage/ManiphestTask.php
	@@ -45,8 +45,8 @@
	->withClasses(array('PhabricatorManiphestApplication'))
	->executeOne();

	- $view_policy = $app->getPolicy(ManiphestCapabilityDefaultView::CAPABILITY);
	- $edit_policy = $app->getPolicy(ManiphestCapabilityDefaultEdit::CAPABILITY);
	+ $view_policy = $app->getPolicy(ManiphestDefaultViewCapability::CAPABILITY);
	+ $edit_policy = $app->getPolicy(ManiphestDefaultEditCapability::CAPABILITY);

	return id(new ManiphestTask())
	->setStatus(ManiphestTaskStatus::getDefaultStatus())
	diff --git a/src/applications/nuance/application/PhabricatorNuanceApplication.php b/src/applications/nuance/application/PhabricatorNuanceApplication.php
	--- a/src/applications/nuance/application/PhabricatorNuanceApplication.php
	+++ b/src/applications/nuance/application/PhabricatorNuanceApplication.php
	@@ -64,13 +64,13 @@

	protected function getCustomCapabilities() {
	return array(
	- NuanceCapabilitySourceDefaultView::CAPABILITY => array(
	+ NuanceSourceDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for newly created sources.'),
	),
	- NuanceCapabilitySourceDefaultEdit::CAPABILITY => array(
	+ NuanceSourceDefaultEditCapability::CAPABILITY => array(
	'caption' => pht('Default edit policy for newly created sources.'),
	),
	- NuanceCapabilitySourceManage::CAPABILITY => array(),
	+ NuanceSourceManageCapability::CAPABILITY => array(),
	);
	}

	diff --git a/src/applications/nuance/capability/NuanceCapabilitySourceDefaultEdit.php b/src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php
	rename from src/applications/nuance/capability/NuanceCapabilitySourceDefaultEdit.php
	rename to src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php
	--- a/src/applications/nuance/capability/NuanceCapabilitySourceDefaultEdit.php
	+++ b/src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class NuanceCapabilitySourceDefaultEdit
	+final class NuanceSourceDefaultEditCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'nuance.source.default.edit';
	diff --git a/src/applications/nuance/capability/NuanceCapabilitySourceDefaultView.php b/src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php
	rename from src/applications/nuance/capability/NuanceCapabilitySourceDefaultView.php
	rename to src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php
	--- a/src/applications/nuance/capability/NuanceCapabilitySourceDefaultView.php
	+++ b/src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class NuanceCapabilitySourceDefaultView
	+final class NuanceSourceDefaultViewCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'nuance.source.default.view';
	diff --git a/src/applications/nuance/capability/NuanceCapabilitySourceManage.php b/src/applications/nuance/capability/NuanceSourceManageCapability.php
	rename from src/applications/nuance/capability/NuanceCapabilitySourceManage.php
	rename to src/applications/nuance/capability/NuanceSourceManageCapability.php
	--- a/src/applications/nuance/capability/NuanceCapabilitySourceManage.php
	+++ b/src/applications/nuance/capability/NuanceSourceManageCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class NuanceCapabilitySourceManage
	- extends PhabricatorPolicyCapability {
	+final class NuanceSourceManageCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'nuance.source.manage';

	diff --git a/src/applications/nuance/controller/NuanceSourceEditController.php b/src/applications/nuance/controller/NuanceSourceEditController.php
	--- a/src/applications/nuance/controller/NuanceSourceEditController.php
	+++ b/src/applications/nuance/controller/NuanceSourceEditController.php
	@@ -18,7 +18,7 @@

	public function processRequest() {
	$can_edit = $this->requireApplicationCapability(
	- NuanceCapabilitySourceManage::CAPABILITY);
	+ NuanceSourceManageCapability::CAPABILITY);

	$request = $this->getRequest();
	$user = $request->getUser();
	diff --git a/src/applications/nuance/storage/NuanceSource.php b/src/applications/nuance/storage/NuanceSource.php
	--- a/src/applications/nuance/storage/NuanceSource.php
	+++ b/src/applications/nuance/storage/NuanceSource.php
	@@ -41,9 +41,9 @@
	->executeOne();

	$view_policy = $app->getPolicy(
	- NuanceCapabilitySourceDefaultView::CAPABILITY);
	+ NuanceSourceDefaultViewCapability::CAPABILITY);
	$edit_policy = $app->getPolicy(
	- NuanceCapabilitySourceDefaultEdit::CAPABILITY);
	+ NuanceSourceDefaultEditCapability::CAPABILITY);

	$definitions = NuanceSourceDefinition::getAllDefinitions();
	$lucky_definition = head($definitions);
	diff --git a/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
	--- a/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
	+++ b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
	@@ -58,7 +58,7 @@

	protected function getCustomCapabilities() {
	return array(
	- PhabricatorOAuthServerCapabilityCreateClients::CAPABILITY => array(
	+ PhabricatorOAuthServerCreateClientsCapability::CAPABILITY => array(
	'default' => PhabricatorPolicies::POLICY_ADMIN,
	),
	);
	diff --git a/src/applications/oauthserver/capability/PhabricatorOAuthServerCapabilityCreateClients.php b/src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php
	rename from src/applications/oauthserver/capability/PhabricatorOAuthServerCapabilityCreateClients.php
	rename to src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php
	--- a/src/applications/oauthserver/capability/PhabricatorOAuthServerCapabilityCreateClients.php
	+++ b/src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorOAuthServerCapabilityCreateClients
	+final class PhabricatorOAuthServerCreateClientsCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'oauthserver.create';
	diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php
	--- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php
	+++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php
	@@ -29,7 +29,7 @@
	$is_new = false;
	} else {
	$this->requireApplicationCapability(
	- PhabricatorOAuthServerCapabilityCreateClients::CAPABILITY);
	+ PhabricatorOAuthServerCreateClientsCapability::CAPABILITY);

	$client = PhabricatorOAuthServerClient::initializeNewClient($viewer);

	diff --git a/src/applications/paste/application/PhabricatorPasteApplication.php b/src/applications/paste/application/PhabricatorPasteApplication.php
	--- a/src/applications/paste/application/PhabricatorPasteApplication.php
	+++ b/src/applications/paste/application/PhabricatorPasteApplication.php
	@@ -47,7 +47,7 @@

	protected function getCustomCapabilities() {
	return array(
	- PasteCapabilityDefaultView::CAPABILITY => array(
	+ PasteDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for newly created pastes.'),
	),
	);
	diff --git a/src/applications/paste/capability/PasteCapabilityDefaultView.php b/src/applications/paste/capability/PasteDefaultViewCapability.php
	rename from src/applications/paste/capability/PasteCapabilityDefaultView.php
	rename to src/applications/paste/capability/PasteDefaultViewCapability.php
	--- a/src/applications/paste/capability/PasteCapabilityDefaultView.php
	+++ b/src/applications/paste/capability/PasteDefaultViewCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class PasteCapabilityDefaultView
	- extends PhabricatorPolicyCapability {
	+final class PasteDefaultViewCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'paste.default.view';

	diff --git a/src/applications/paste/storage/PhabricatorPaste.php b/src/applications/paste/storage/PhabricatorPaste.php
	--- a/src/applications/paste/storage/PhabricatorPaste.php
	+++ b/src/applications/paste/storage/PhabricatorPaste.php
	@@ -25,7 +25,7 @@
	->withClasses(array('PhabricatorPasteApplication'))
	->executeOne();

	- $view_policy = $app->getPolicy(PasteCapabilityDefaultView::CAPABILITY);
	+ $view_policy = $app->getPolicy(PasteDefaultViewCapability::CAPABILITY);

	return id(new PhabricatorPaste())
	->setTitle('')
	diff --git a/src/applications/people/application/PhabricatorPeopleApplication.php b/src/applications/people/application/PhabricatorPeopleApplication.php
	--- a/src/applications/people/application/PhabricatorPeopleApplication.php
	+++ b/src/applications/people/application/PhabricatorPeopleApplication.php
	@@ -76,10 +76,9 @@
	);
	}

	-
	protected function getCustomCapabilities() {
	return array(
	- PeopleCapabilityBrowseUserDirectory::CAPABILITY => array(),
	+ PeopleBrowseUserDirectoryCapability::CAPABILITY => array(),
	);
	}

	diff --git a/src/applications/people/capability/PeopleCapabilityBrowseUserDirectory.php b/src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php
	rename from src/applications/people/capability/PeopleCapabilityBrowseUserDirectory.php
	rename to src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php
	--- a/src/applications/people/capability/PeopleCapabilityBrowseUserDirectory.php
	+++ b/src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PeopleCapabilityBrowseUserDirectory
	+final class PeopleBrowseUserDirectoryCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'people.browse';
	@@ -18,8 +18,7 @@
	}

	public function describeCapabilityRejection() {
	- return pht(
	- 'You do not have permission to browse the user directory.');
	+ return pht('You do not have permission to browse the user directory.');
	}

	}
	diff --git a/src/applications/people/controller/PhabricatorPeopleListController.php b/src/applications/people/controller/PhabricatorPeopleListController.php
	--- a/src/applications/people/controller/PhabricatorPeopleListController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleListController.php
	@@ -22,7 +22,7 @@
	$viewer = $request->getUser();

	$this->requireApplicationCapability(
	- PeopleCapabilityBrowseUserDirectory::CAPABILITY);
	+ PeopleBrowseUserDirectoryCapability::CAPABILITY);

	$controller = id(new PhabricatorApplicationSearchController($request))
	->setQueryKey($this->key)
	diff --git a/src/applications/people/query/PhabricatorPeopleSearchEngine.php b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
	--- a/src/applications/people/query/PhabricatorPeopleSearchEngine.php
	+++ b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
	@@ -46,7 +46,7 @@
	$can_browse = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$this->getApplication(),
	- PeopleCapabilityBrowseUserDirectory::CAPABILITY);
	+ PeopleBrowseUserDirectoryCapability::CAPABILITY);
	if (!$can_browse) {
	$query->withPHIDs(array($viewer->getPHID()));
	}
	diff --git a/src/applications/pholio/application/PhabricatorPholioApplication.php b/src/applications/pholio/application/PhabricatorPholioApplication.php
	--- a/src/applications/pholio/application/PhabricatorPholioApplication.php
	+++ b/src/applications/pholio/application/PhabricatorPholioApplication.php
	@@ -72,8 +72,8 @@

	protected function getCustomCapabilities() {
	return array(
	- PholioCapabilityDefaultView::CAPABILITY => array(),
	- PholioCapabilityDefaultEdit::CAPABILITY => array(),
	+ PholioDefaultViewCapability::CAPABILITY => array(),
	+ PholioDefaultEditCapability::CAPABILITY => array(),
	);
	}

	diff --git a/src/applications/pholio/capability/PholioCapabilityDefaultEdit.php b/src/applications/pholio/capability/PholioDefaultEditCapability.php
	rename from src/applications/pholio/capability/PholioCapabilityDefaultEdit.php
	rename to src/applications/pholio/capability/PholioDefaultEditCapability.php
	--- a/src/applications/pholio/capability/PholioCapabilityDefaultEdit.php
	+++ b/src/applications/pholio/capability/PholioDefaultEditCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class PholioCapabilityDefaultEdit
	- extends PhabricatorPolicyCapability {
	+final class PholioDefaultEditCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'pholio.default.edit';

	diff --git a/src/applications/pholio/capability/PholioCapabilityDefaultView.php b/src/applications/pholio/capability/PholioDefaultViewCapability.php
	rename from src/applications/pholio/capability/PholioCapabilityDefaultView.php
	rename to src/applications/pholio/capability/PholioDefaultViewCapability.php
	--- a/src/applications/pholio/capability/PholioCapabilityDefaultView.php
	+++ b/src/applications/pholio/capability/PholioDefaultViewCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class PholioCapabilityDefaultView
	- extends PhabricatorPolicyCapability {
	+final class PholioDefaultViewCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'pholio.default.view';

	diff --git a/src/applications/pholio/storage/PholioMock.php b/src/applications/pholio/storage/PholioMock.php
	--- a/src/applications/pholio/storage/PholioMock.php
	+++ b/src/applications/pholio/storage/PholioMock.php
	@@ -35,8 +35,8 @@
	->withClasses(array('PhabricatorPholioApplication'))
	->executeOne();

	- $view_policy = $app->getPolicy(PholioCapabilityDefaultView::CAPABILITY);
	- $edit_policy = $app->getPolicy(PholioCapabilityDefaultEdit::CAPABILITY);
	+ $view_policy = $app->getPolicy(PholioDefaultViewCapability::CAPABILITY);
	+ $edit_policy = $app->getPolicy(PholioDefaultEditCapability::CAPABILITY);

	return id(new PholioMock())
	->setAuthorPHID($actor->getPHID())
	diff --git a/src/applications/phragment/application/PhabricatorPhragmentApplication.php b/src/applications/phragment/application/PhabricatorPhragmentApplication.php
	--- a/src/applications/phragment/application/PhabricatorPhragmentApplication.php
	+++ b/src/applications/phragment/application/PhabricatorPhragmentApplication.php
	@@ -63,7 +63,7 @@

	protected function getCustomCapabilities() {
	return array(
	- PhragmentCapabilityCanCreate::CAPABILITY => array(),
	+ PhragmentCanCreateCapability::CAPABILITY => array(),
	);
	}

	diff --git a/src/applications/phragment/capability/PhragmentCapabilityCanCreate.php b/src/applications/phragment/capability/PhragmentCanCreateCapability.php
	rename from src/applications/phragment/capability/PhragmentCapabilityCanCreate.php
	rename to src/applications/phragment/capability/PhragmentCanCreateCapability.php
	--- a/src/applications/phragment/capability/PhragmentCapabilityCanCreate.php
	+++ b/src/applications/phragment/capability/PhragmentCanCreateCapability.php
	@@ -1,7 +1,6 @@
	<?php

	-final class PhragmentCapabilityCanCreate
	- extends PhabricatorPolicyCapability {
	+final class PhragmentCanCreateCapability extends PhabricatorPolicyCapability {

	const CAPABILITY = 'phragment.create';

	diff --git a/src/applications/phragment/controller/PhragmentBrowseController.php b/src/applications/phragment/controller/PhragmentBrowseController.php
	--- a/src/applications/phragment/controller/PhragmentBrowseController.php
	+++ b/src/applications/phragment/controller/PhragmentBrowseController.php
	@@ -29,7 +29,7 @@

	$crumbs = $this->buildApplicationCrumbsWithPath($parents);
	if ($this->hasApplicationCapability(
	- PhragmentCapabilityCanCreate::CAPABILITY)) {
	+ PhragmentCanCreateCapability::CAPABILITY)) {
	$crumbs->addAction(
	id(new PHUIListItemView())
	->setName(pht('Create Fragment'))
	diff --git a/src/applications/phragment/controller/PhragmentHistoryController.php b/src/applications/phragment/controller/PhragmentHistoryController.php
	--- a/src/applications/phragment/controller/PhragmentHistoryController.php
	+++ b/src/applications/phragment/controller/PhragmentHistoryController.php
	@@ -26,7 +26,7 @@

	$crumbs = $this->buildApplicationCrumbsWithPath($parents);
	if ($this->hasApplicationCapability(
	- PhragmentCapabilityCanCreate::CAPABILITY)) {
	+ PhragmentCanCreateCapability::CAPABILITY)) {
	$crumbs->addAction(
	id(new PHUIListItemView())
	->setName(pht('Create Fragment'))
	diff --git a/src/applications/policy/capability/PhabricatorPolicyCapabilityCanEdit.php b/src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php
	rename from src/applications/policy/capability/PhabricatorPolicyCapabilityCanEdit.php
	rename to src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php
	--- a/src/applications/policy/capability/PhabricatorPolicyCapabilityCanEdit.php
	+++ b/src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorPolicyCapabilityCanEdit
	+final class PhabricatorPolicyCanEditCapability
	extends PhabricatorPolicyCapability {

	public function getCapabilityKey() {
	diff --git a/src/applications/policy/capability/PhabricatorPolicyCapabilityCanJoin.php b/src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php
	rename from src/applications/policy/capability/PhabricatorPolicyCapabilityCanJoin.php
	rename to src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php
	--- a/src/applications/policy/capability/PhabricatorPolicyCapabilityCanJoin.php
	+++ b/src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorPolicyCapabilityCanJoin
	+final class PhabricatorPolicyCanJoinCapability
	extends PhabricatorPolicyCapability {

	public function getCapabilityKey() {
	diff --git a/src/applications/policy/capability/PhabricatorPolicyCapabilityCanView.php b/src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php
	rename from src/applications/policy/capability/PhabricatorPolicyCapabilityCanView.php
	rename to src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php
	--- a/src/applications/policy/capability/PhabricatorPolicyCapabilityCanView.php
	+++ b/src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorPolicyCapabilityCanView
	+final class PhabricatorPolicyCanViewCapability
	extends PhabricatorPolicyCapability {

	public function getCapabilityKey() {
	diff --git a/src/applications/project/application/PhabricatorProjectApplication.php b/src/applications/project/application/PhabricatorProjectApplication.php
	--- a/src/applications/project/application/PhabricatorProjectApplication.php
	+++ b/src/applications/project/application/PhabricatorProjectApplication.php
	@@ -90,7 +90,7 @@

	protected function getCustomCapabilities() {
	return array(
	- ProjectCapabilityCreateProjects::CAPABILITY => array(),
	+ ProjectCreateProjectsCapability::CAPABILITY => array(),
	);
	}

	diff --git a/src/applications/project/capability/ProjectCapabilityCreateProjects.php b/src/applications/project/capability/ProjectCreateProjectsCapability.php
	rename from src/applications/project/capability/ProjectCapabilityCreateProjects.php
	rename to src/applications/project/capability/ProjectCreateProjectsCapability.php
	--- a/src/applications/project/capability/ProjectCapabilityCreateProjects.php
	+++ b/src/applications/project/capability/ProjectCreateProjectsCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class ProjectCapabilityCreateProjects
	+final class ProjectCreateProjectsCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'project.create';
	diff --git a/src/applications/project/controller/PhabricatorProjectCreateController.php b/src/applications/project/controller/PhabricatorProjectCreateController.php
	--- a/src/applications/project/controller/PhabricatorProjectCreateController.php
	+++ b/src/applications/project/controller/PhabricatorProjectCreateController.php
	@@ -3,14 +3,12 @@
	final class PhabricatorProjectCreateController
	extends PhabricatorProjectController {

	-
	public function processRequest() {
	-
	$request = $this->getRequest();
	$user = $request->getUser();

	$this->requireApplicationCapability(
	- ProjectCapabilityCreateProjects::CAPABILITY);
	+ ProjectCreateProjectsCapability::CAPABILITY);

	$project = PhabricatorProject::initializeNewProject($user);

	@@ -113,4 +111,5 @@
	));
	}
	}
	+
	}
	diff --git a/src/applications/project/controller/PhabricatorProjectListController.php b/src/applications/project/controller/PhabricatorProjectListController.php
	--- a/src/applications/project/controller/PhabricatorProjectListController.php
	+++ b/src/applications/project/controller/PhabricatorProjectListController.php
	@@ -27,7 +27,7 @@
	$crumbs = parent::buildApplicationCrumbs();

	$can_create = $this->hasApplicationCapability(
	- ProjectCapabilityCreateProjects::CAPABILITY);
	+ ProjectCreateProjectsCapability::CAPABILITY);

	$crumbs->addAction(
	id(new PHUIListItemView())
	diff --git a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php b/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
	--- a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
	+++ b/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
	@@ -64,7 +64,7 @@
	PhabricatorPolicyFilter::requireCapability(
	$request->getUser(),
	$application,
	- DiffusionCapabilityCreateRepositories::CAPABILITY);
	+ DiffusionCreateRepositoriesCapability::CAPABILITY);

	// TODO: This has some duplication with (and lacks some of the validation
	// of) the web workflow; refactor things so they can share more code as this
	diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
	--- a/src/applications/repository/storage/PhabricatorRepository.php
	+++ b/src/applications/repository/storage/PhabricatorRepository.php
	@@ -54,9 +54,9 @@
	->withClasses(array('PhabricatorDiffusionApplication'))
	->executeOne();

	- $view_policy = $app->getPolicy(DiffusionCapabilityDefaultView::CAPABILITY);
	- $edit_policy = $app->getPolicy(DiffusionCapabilityDefaultEdit::CAPABILITY);
	- $push_policy = $app->getPolicy(DiffusionCapabilityDefaultPush::CAPABILITY);
	+ $view_policy = $app->getPolicy(DiffusionDefaultViewCapability::CAPABILITY);
	+ $edit_policy = $app->getPolicy(DiffusionDefaultEditCapability::CAPABILITY);
	+ $push_policy = $app->getPolicy(DiffusionDefaultPushCapability::CAPABILITY);

	return id(new PhabricatorRepository())
	->setViewPolicy($view_policy)
	@@ -1319,8 +1319,6 @@
	}


	-
	-
	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	@@ -1328,7 +1326,7 @@
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	- DiffusionCapabilityPush::CAPABILITY,
	+ DiffusionPushCapability::CAPABILITY,
	);
	}

	@@ -1338,7 +1336,7 @@
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	- case DiffusionCapabilityPush::CAPABILITY:
	+ case DiffusionPushCapability::CAPABILITY:
	return $this->getPushPolicy();
	}
	}
	diff --git a/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php b/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
	--- a/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
	+++ b/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
	@@ -57,7 +57,7 @@

	public function getCustomCapabilities() {
	return array(
	- PhabricatorSlowvoteCapabilityDefaultView::CAPABILITY => array(
	+ PhabricatorSlowvoteDefaultViewCapability::CAPABILITY => array(
	'caption' => pht('Default view policy for new polls.'),
	),
	);
	diff --git a/src/applications/slowvote/capability/PhabricatorSlowvoteCapabilityDefaultView.php b/src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php
	rename from src/applications/slowvote/capability/PhabricatorSlowvoteCapabilityDefaultView.php
	rename to src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php
	--- a/src/applications/slowvote/capability/PhabricatorSlowvoteCapabilityDefaultView.php
	+++ b/src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorSlowvoteCapabilityDefaultView
	+final class PhabricatorSlowvoteDefaultViewCapability
	extends PhabricatorPolicyCapability {

	const CAPABILITY = 'slowvote.default.view';
	diff --git a/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php b/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
	--- a/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
	+++ b/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
	@@ -35,7 +35,7 @@
	->executeOne();

	$view_policy = $app->getPolicy(
	- PhabricatorSlowvoteCapabilityDefaultView::CAPABILITY);
	+ PhabricatorSlowvoteDefaultViewCapability::CAPABILITY);

	return id(new PhabricatorSlowvotePoll())
	->setAuthorPHID($actor->getPHID())
	@@ -111,8 +111,7 @@
	}

	public function describeAutomaticCapability($capability) {
	- return pht(
	- 'The author of a poll can always view and edit it.');
	+ return pht('The author of a poll can always view and edit it.');
	}


	@@ -140,5 +139,4 @@
	return array($this->getAuthorPHID());
	}

	-
	}

File Metadata

Mime Type: text/plain
Expires: Sat, Dec 21, 10:42 AM (18 h, 25 m)
Storage Engine: blob
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: 6913653
Default Alt Text: D10037.diff (125 KB)

D10037.diffNo OneTemporaryActions

D10037.diffView Options

File Metadata

Event Timeline

D10037.diff
No OneTemporary
Actions

D10037.diff
View Options