From 86c399b657835ca18f300c92b0b71f66af1559be Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Wed, 23 Jul 2014 10:03:09 +1000 Subject: [PATCH] Rename `PhabricatorApplication` subclasses Summary: Ref T5655. Some discussion in D9839. Generally speaking, `Phabricator{$name}Application` is clearer than `PhabricatorApplication{$name}`. Test Plan: # Pinned and uninstalled some applications. # Applied patch and performed migrations. # Verified that the pinned applications were still pinned and that the uninstalled applications were still uninstalled. # Performed a sanity check on the database contents. Reviewers: btrahan, epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: hach-que, epriestley, Korvin Maniphest Tasks: T5655 Differential Revision: https://secure.phabricator.com/D9982 --- .../sql/autopatches/20140722.appname.php | 166 ++++++++++++ src/__phutil_library_map__.php | 250 +++++++++--------- ...AphrontDefaultApplicationConfiguration.php | 8 +- ...it.php => PhabricatorAuditApplication.php} | 4 +- .../audit/conduit/ConduitAPI_audit_Method.php | 2 +- .../mail/PhabricatorAuditMailReceiver.php | 2 +- ...uth.php => PhabricatorAuthApplication.php} | 14 +- .../auth/provider/PhabricatorAuthProvider.php | 31 +-- .../PhabricatorAuthProviderConfigQuery.php | 2 +- .../query/PhabricatorAuthSessionQuery.php | 2 +- .../PhabricatorAuthTemporaryTokenQuery.php | 2 +- .../query/PhabricatorExternalAccountQuery.php | 8 +- .../base/PhabricatorApplication.php | 17 +- .../base/controller/PhabricatorController.php | 7 +- .../PhabricatorAccessControlTestCase.php | 5 +- ...est.php => PhabricatorTestApplication.php} | 5 +- ...php => PhabricatorCalendarApplication.php} | 22 +- .../query/PhabricatorCalendarEventQuery.php | 2 +- .../PhabricatorCalendarEventSearchEngine.php | 6 +- .../PhabricatorChatLogApplication.php} | 9 +- .../conduit/ConduitAPI_chatlog_Method.php | 2 +- .../query/PhabricatorChatLogChannelQuery.php | 2 +- .../chatlog/query/PhabricatorChatLogQuery.php | 2 +- ....php => PhabricatorConduitApplication.php} | 2 +- .../query/PhabricatorConduitLogQuery.php | 3 +- .../query/PhabricatorConduitMethodQuery.php | 8 +- .../query/PhabricatorConduitSearchEngine.php | 9 +- ...g.php => PhabricatorConfigApplication.php} | 10 +- .../PhabricatorConfigWelcomeController.php | 4 +- .../query/PhabricatorConfigEntryQuery.php | 2 +- ... => PhabricatorConpherenceApplication.php} | 3 +- .../conduit/ConduitAPI_conpherence_Method.php | 2 +- .../ConpherenceCreateThreadMailReceiver.php | 2 +- .../mail/ConpherenceThreadMailReceiver.php | 2 +- .../query/ConpherenceThreadQuery.php | 2 +- ...hp => PhabricatorCountdownApplication.php} | 11 +- .../query/PhabricatorCountdownQuery.php | 2 +- .../PhabricatorCountdownSearchEngine.php | 8 +- .../storage/PhabricatorCountdown.php | 2 +- ....php => PhabricatorDaemonsApplication.php} | 2 +- .../query/PhabricatorDaemonLogQuery.php | 2 +- ...hp => PhabricatorDashboardApplication.php} | 6 +- .../PhabricatorDashboardInstallController.php | 15 +- .../PhabricatorDashboardManageController.php | 3 +- ...habricatorDashboardUninstallController.php | 8 +- .../query/PhabricatorDashboardPanelQuery.php | 2 +- .../PhabricatorDashboardPanelSearchEngine.php | 11 +- .../query/PhabricatorDashboardQuery.php | 2 +- .../PhabricatorDashboardSearchEngine.php | 15 +- ...=> PhabricatorDifferentialApplication.php} | 5 +- .../ConduitAPI_differential_Method.php | 2 +- .../DifferentialRevisionViewController.php | 6 +- .../DifferentialRequiredSignaturesField.php | 3 +- .../editor/DifferentialTransactionEditor.php | 11 +- .../mail/DifferentialRevisionMailReceiver.php | 2 +- .../DifferentialCommitMessageParser.php | 2 +- .../phid/DifferentialPHIDTypeRevision.php | 2 +- .../query/DifferentialChangesetQuery.php | 3 +- .../query/DifferentialDiffQuery.php | 2 +- .../query/DifferentialHunkQuery.php | 3 +- .../query/DifferentialRevisionQuery.php | 13 +- .../DifferentialRevisionSearchEngine.php | 3 +- .../storage/DifferentialRevision.php | 3 +- ...hp => PhabricatorDiffusionApplication.php} | 14 +- .../conduit/ConduitAPI_diffusion_Method.php | 2 +- .../controller/DiffusionBrowseController.php | 5 +- .../controller/DiffusionCommitController.php | 3 +- .../herald/HeraldPreCommitAdapter.php | 5 +- .../diffusion/query/DiffusionCommitQuery.php | 13 +- .../DiffusionArcanistProjectDatasource.php | 2 +- .../typeahead/DiffusionAuditorDatasource.php | 2 +- .../DiffusionRepositoryDatasource.php | 2 +- .../typeahead/DiffusionSymbolDatasource.php | 2 +- .../view/DiffusionHistoryTableView.php | 5 +- ....php => PhabricatorDivinerApplication.php} | 2 +- .../diviner/query/DivinerAtomQuery.php | 8 +- .../diviner/query/DivinerAtomSearchEngine.php | 11 +- .../diviner/query/DivinerBookQuery.php | 6 +- ...p => PhabricatorDoorkeeperApplication.php} | 2 +- .../query/DoorkeeperExternalObjectQuery.php | 2 +- ....php => PhabricatorDrydockApplication.php} | 6 +- .../query/DrydockBlueprintSearchEngine.php | 14 +- .../query/DrydockLeaseSearchEngine.php | 6 +- .../drydock/query/DrydockLogSearchEngine.php | 17 +- .../drydock/query/DrydockQuery.php | 5 +- .../query/DrydockResourceSearchEngine.php | 7 +- .../drydock/storage/DrydockBlueprint.php | 3 +- ...act.php => PhabricatorFactApplication.php} | 2 +- ...eed.php => PhabricatorFeedApplication.php} | 2 +- .../feed/conduit/ConduitAPI_feed_Method.php | 3 +- .../feed/query/PhabricatorFeedQuery.php | 4 +- ...es.php => PhabricatorFilesApplication.php} | 3 +- .../files/conduit/ConduitAPI_file_Method.php | 3 +- .../files/mail/FileCreateMailReceiver.php | 6 +- .../files/mail/FileMailReceiver.php | 2 +- .../files/query/PhabricatorFileQuery.php | 3 +- .../query/PhabricatorFileSearchEngine.php | 5 +- ...gs.php => PhabricatorFlagsApplication.php} | 2 +- .../flag/conduit/ConduitAPI_flag_Method.php | 9 +- .../flag/query/PhabricatorFlagQuery.php | 7 +- .../query/PhabricatorFlagSearchEngine.php | 2 +- ...=> PhabricatorHarbormasterApplication.php} | 2 +- .../ConduitAPI_harbormaster_Method.php | 2 +- .../engine/HarbormasterBuildEngine.php | 5 +- .../query/HarbormasterBuildArtifactQuery.php | 2 +- .../query/HarbormasterBuildItemQuery.php | 2 +- .../query/HarbormasterBuildLogQuery.php | 2 +- .../query/HarbormasterBuildMessageQuery.php | 2 +- .../query/HarbormasterBuildPlanQuery.php | 3 +- .../HarbormasterBuildPlanSearchEngine.php | 8 +- .../query/HarbormasterBuildQuery.php | 2 +- .../query/HarbormasterBuildStepQuery.php | 2 +- .../query/HarbormasterBuildTargetQuery.php | 2 +- .../query/HarbormasterBuildableQuery.php | 2 +- .../HarbormasterBuildableSearchEngine.php | 8 +- .../storage/HarbormasterBuildable.php | 4 +- .../HarbormasterBuildPlanDatasource.php | 2 +- ...elp.php => PhabricatorHelpApplication.php} | 2 +- .../herald/adapter/HeraldCommitAdapter.php | 5 +- .../HeraldDifferentialRevisionAdapter.php | 3 +- .../adapter/HeraldManiphestTaskAdapter.php | 5 +- .../adapter/HeraldPholioMockAdapter.php | 3 +- ...d.php => PhabricatorHeraldApplication.php} | 9 +- .../herald/query/HeraldRuleQuery.php | 7 +- .../herald/query/HeraldRuleSearchEngine.php | 7 +- .../herald/query/HeraldTranscriptQuery.php | 2 +- .../query/HeraldTranscriptSearchEngine.php | 11 +- .../herald/storage/HeraldRule.php | 4 +- ...ome.php => PhabricatorHomeApplication.php} | 2 +- .../controller/PhabricatorHomeController.php | 4 +- .../PhabricatorHomeMainController.php | 11 +- ...php => PhabricatorLegalpadApplication.php} | 19 +- .../mail/LegalpadMockMailReceiver.php | 2 +- .../legalpad/query/LegalpadDocumentQuery.php | 2 +- .../query/LegalpadDocumentSearchEngine.php | 3 +- .../query/LegalpadDocumentSignatureQuery.php | 2 +- .../LegalpadDocumentSignatureSearchEngine.php | 2 +- .../legalpad/storage/LegalpadDocument.php | 2 +- .../typeahead/LegalpadDocumentDatasource.php | 5 +- ...ro.php => PhabricatorMacroApplication.php} | 4 +- .../macro/conduit/ConduitAPI_macro_Method.php | 3 +- .../mail/PhabricatorMacroMailReceiver.php | 4 +- .../macro/query/PhabricatorMacroQuery.php | 2 +- .../query/PhabricatorMacroSearchEngine.php | 3 +- .../typeahead/PhabricatorMacroDatasource.php | 5 +- ...=> PhabricatorMailingListsApplication.php} | 2 +- .../query/PhabricatorMailingListQuery.php | 2 +- .../PhabricatorMailingListSearchEngine.php | 7 +- .../PhabricatorMailingListDatasource.php | 2 +- ...hp => PhabricatorManiphestApplication.php} | 30 +-- .../conduit/ConduitAPI_maniphest_Method.php | 15 +- .../editor/ManiphestTransactionEditor.php | 7 +- .../mail/ManiphestCreateMailReceiver.php | 2 +- .../mail/ManiphestTaskMailReceiver.php | 2 +- .../maniphest/phid/ManiphestPHIDTypeTask.php | 2 +- .../maniphest/query/ManiphestTaskQuery.php | 4 +- .../query/ManiphestTaskSearchEngine.php | 20 +- .../maniphest/storage/ManiphestTask.php | 6 +- .../ManiphestTaskPriorityDatasource.php | 4 +- ...=> PhabricatorApplicationsApplication.php} | 20 +- .../meta/query/PhabricatorAppSearchEngine.php | 8 +- .../PhabricatorApplicationDatasource.php | 2 +- ....php => PhabricatorMetaMTAApplication.php} | 4 +- .../PhabricatorMetaMTAMailableDatasource.php | 2 +- ...> PhabricatorNotificationsApplication.php} | 2 +- .../PhabricatorNotificationQuery.php | 3 +- ...e.php => PhabricatorNuanceApplication.php} | 13 +- .../conduit/ConduitAPI_nuance_Method.php | 3 +- src/applications/nuance/query/NuanceQuery.php | 5 +- .../nuance/storage/NuanceSource.php | 10 +- ... => PhabricatorOAuthServerApplication.php} | 12 +- ...OAuthServerAuthorizationsSettingsPanel.php | 4 +- ...abricatorOAuthClientAuthorizationQuery.php | 2 +- .../PhabricatorOAuthServerClientQuery.php | 3 +- ...abricatorOAuthServerClientSearchEngine.php | 4 +- ...s.php => PhabricatorOwnersApplication.php} | 2 +- .../conduit/ConduitAPI_owners_Method.php | 6 +- .../query/PhabricatorOwnersPackageQuery.php | 3 +- .../PhabricatorOwnersPackageDatasource.php | 2 +- ...p => PhabricatorPassphraseApplication.php} | 2 +- .../query/PassphraseCredentialQuery.php | 2 +- .../PassphraseCredentialSearchEngine.php | 9 +- ...te.php => PhabricatorPasteApplication.php} | 11 +- .../paste/conduit/ConduitAPI_paste_Method.php | 3 +- .../paste/mail/PasteCreateMailReceiver.php | 2 +- .../paste/mail/PasteMockMailReceiver.php | 2 +- .../paste/query/PhabricatorPasteQuery.php | 2 +- .../paste/storage/PhabricatorPaste.php | 3 +- ...e.php => PhabricatorPeopleApplication.php} | 6 +- .../people/conduit/ConduitAPI_user_Method.php | 2 +- .../PhabricatorUserStatusField.php | 2 +- ...habricatorPeopleHovercardEventListener.php | 2 +- .../phid/PhabricatorPeoplePHIDTypeUser.php | 2 +- .../query/PhabricatorPeopleLogQuery.php | 2 +- .../PhabricatorPeopleLogSearchEngine.php | 2 +- .../people/query/PhabricatorPeopleQuery.php | 2 +- .../query/PhabricatorPeopleSearchEngine.php | 2 +- .../typeahead/PhabricatorPeopleDatasource.php | 2 +- .../PhabricatorApplicationPhame.php | 62 ----- .../PhabricatorPhameApplication.php | 63 +++++ .../phame/conduit/ConduitAPI_phame_Method.php | 2 +- .../phid/query/PhabricatorObjectListQuery.php | 2 +- ...ux.php => PhabricatorPhluxApplication.php} | 2 +- .../phlux/query/PhluxVariableQuery.php | 2 +- ...o.php => PhabricatorPholioApplication.php} | 2 +- .../pholio/mail/PholioMockMailReceiver.php | 2 +- .../pholio/phid/PholioPHIDTypeMock.php | 2 +- .../pholio/query/PholioImageQuery.php | 2 +- .../pholio/query/PholioMockQuery.php | 2 +- .../pholio/query/PholioMockSearchEngine.php | 6 +- .../pholio/storage/PholioMock.php | 2 +- ...php => PhabricatorPhortuneApplication.php} | 2 +- .../provider/PhortunePaymentProvider.php | 5 +- .../phortune/query/PhortuneAccountQuery.php | 3 +- .../query/PhortunePaymentMethodQuery.php | 3 +- .../phortune/query/PhortuneProductQuery.php | 2 +- ...T.php => PhabricatorPHPASTApplication.php} | 2 +- ...hp => PhabricatorPhragmentApplication.php} | 5 +- .../conduit/ConduitAPI_phragment_Method.php | 2 +- .../query/PhragmentFragmentQuery.php | 2 +- .../query/PhragmentFragmentVersionQuery.php | 2 +- .../query/PhragmentSnapshotChildQuery.php | 2 +- .../query/PhragmentSnapshotQuery.php | 3 +- ...hp => PhabricatorPhrequentApplication.php} | 2 +- .../conduit/ConduitAPI_phrequent_Method.php | 3 +- .../phrequent/query/PhrequentSearchEngine.php | 11 +- .../query/PhrequentUserTimeQuery.php | 3 +- ...hp => PhabricatorPhrictionApplication.php} | 4 +- .../conduit/ConduitAPI_phriction_Method.php | 2 +- .../phid/PhrictionPHIDTypeDocument.php | 2 +- .../query/PhrictionDocumentQuery.php | 3 +- ...y.php => PhabricatorPolicyApplication.php} | 2 +- .../policy/query/PhabricatorPolicyQuery.php | 3 +- ...r.php => PhabricatorPonderApplication.php} | 6 +- .../mail/PonderQuestionMailReceiver.php | 2 +- .../ponder/phid/PonderPHIDTypeQuestion.php | 2 +- .../ponder/query/PonderAnswerQuery.php | 4 +- .../ponder/query/PonderQuestionQuery.php | 3 +- .../query/PonderQuestionSearchEngine.php | 2 +- ....php => PhabricatorProjectApplication.php} | 21 +- .../conduit/ConduitAPI_project_Method.php | 3 +- .../PhabricatorProjectPHIDTypeProject.php | 3 +- .../query/PhabricatorProjectColumnQuery.php | 2 +- .../project/query/PhabricatorProjectQuery.php | 3 +- .../query/PhabricatorProjectSearchEngine.php | 3 +- .../PhabricatorProjectDatasource.php | 2 +- ....php => PhabricatorReleephApplication.php} | 26 +- .../conduit/ConduitAPI_releeph_Method.php | 2 +- ...icatorReleephApplicationConfigOptions.php} | 4 +- .../mail/ReleephRequestMailReceiver.php | 2 +- .../releeph/query/ReleephBranchQuery.php | 4 +- .../releeph/query/ReleephProductQuery.php | 4 +- .../query/ReleephProductSearchEngine.php | 9 +- .../releeph/query/ReleephRequestQuery.php | 4 +- ...=> PhabricatorRepositoriesApplication.php} | 12 +- .../conduit/ConduitAPI_repository_Method.php | 2 +- .../ConduitAPI_repository_create_Method.php | 2 +- .../PhabricatorRepositoryPHIDTypeCommit.php | 3 +- .../PhabricatorRepositoryMirrorQuery.php | 4 +- .../PhabricatorRepositoryPushEventQuery.php | 3 +- .../PhabricatorRepositoryPushLogQuery.php | 4 +- ...abricatorRepositoryPushLogSearchEngine.php | 7 +- .../query/PhabricatorRepositoryQuery.php | 4 +- .../PhabricatorRepositoryRefCursorQuery.php | 3 +- .../PhabricatorRepositorySearchEngine.php | 2 +- .../storage/PhabricatorRepository.php | 2 +- ...torRepositoryCommitMessageParserWorker.php | 2 +- ...h.php => PhabricatorSearchApplication.php} | 8 +- .../query/PhabricatorNamedQueryQuery.php | 3 +- .../query/PhabricatorSavedQueryQuery.php | 3 +- ...abricatorSearchApplicationSearchEngine.php | 7 +- .../query/PhabricatorSearchDocumentQuery.php | 3 +- .../typeahead/PhabricatorSearchDatasource.php | 2 +- ...php => PhabricatorSettingsApplication.php} | 2 +- ...torSettingsPanelConpherencePreferences.php | 3 +- ...abricatorSettingsPanelEmailPreferences.php | 10 +- ...habricatorSettingsPanelHomePreferences.php | 5 +- ...php => PhabricatorSlowvoteApplication.php} | 2 +- .../conduit/ConduitAPI_slowvote_Method.php | 3 +- .../query/PhabricatorSlowvoteQuery.php | 3 +- .../storage/PhabricatorSlowvotePoll.php | 2 +- ...> PhabricatorSubscriptionsApplication.php} | 6 +- ....php => PhabricatorSupportApplication.php} | 2 +- ...m.php => PhabricatorSystemApplication.php} | 2 +- ...s.php => PhabricatorTokensApplication.php} | 2 +- .../conduit/ConduitAPI_token_Method.php | 4 +- .../query/PhabricatorTokenGivenQuery.php | 2 +- .../tokens/query/PhabricatorTokenQuery.php | 2 +- .../query/PhabricatorTokenReceiverQuery.php | 2 +- ...=> PhabricatorTransactionsApplication.php} | 2 +- ...habricatorApplicationTransactionEditor.php | 2 +- ...hp => PhabricatorTypeaheadApplication.php} | 2 +- ...p => PhabricatorUIExamplesApplication.php} | 2 +- ...f.php => PhabricatorXHProfApplication.php} | 3 +- .../page/menu/PhabricatorMainMenuView.php | 4 +- 295 files changed, 918 insertions(+), 978 deletions(-) create mode 100644 resources/sql/autopatches/20140722.appname.php rename src/applications/audit/application/{PhabricatorApplicationAudit.php => PhabricatorAuditApplication.php} (95%) rename src/applications/auth/application/{PhabricatorApplicationAuth.php => PhabricatorAuthApplication.php} (91%) rename src/applications/base/controller/__tests__/{PhabricatorApplicationTest.php => PhabricatorTestApplication.php} (86%) rename src/applications/calendar/application/{PhabricatorApplicationCalendar.php => PhabricatorCalendarApplication.php} (68%) rename src/applications/chatlog/{applications/PhabricatorApplicationChatLog.php => application/PhabricatorChatLogApplication.php} (69%) rename src/applications/conduit/application/{PhabricatorApplicationConduit.php => PhabricatorConduitApplication.php} (94%) rename src/applications/config/application/{PhabricatorApplicationConfig.php => PhabricatorConfigApplication.php} (73%) rename src/applications/conpherence/application/{PhabricatorApplicationConpherence.php => PhabricatorConpherenceApplication.php} (95%) rename src/applications/countdown/application/{PhabricatorApplicationCountdown.php => PhabricatorCountdownApplication.php} (76%) rename src/applications/daemon/application/{PhabricatorApplicationDaemons.php => PhabricatorDaemonsApplication.php} (95%) rename src/applications/dashboard/application/{PhabricatorApplicationDashboard.php => PhabricatorDashboardApplication.php} (92%) rename src/applications/differential/application/{PhabricatorApplicationDifferential.php => PhabricatorDifferentialApplication.php} (96%) rename src/applications/diffusion/application/{PhabricatorApplicationDiffusion.php => PhabricatorDiffusionApplication.php} (93%) rename src/applications/diviner/application/{PhabricatorApplicationDiviner.php => PhabricatorDivinerApplication.php} (93%) rename src/applications/doorkeeper/application/{PhabricatorApplicationDoorkeeper.php => PhabricatorDoorkeeperApplication.php} (89%) rename src/applications/drydock/application/{PhabricatorApplicationDrydock.php => PhabricatorDrydockApplication.php} (93%) rename src/applications/fact/application/{PhabricatorApplicationFact.php => PhabricatorFactApplication.php} (90%) rename src/applications/feed/application/{PhabricatorApplicationFeed.php => PhabricatorFeedApplication.php} (90%) rename src/applications/files/application/{PhabricatorApplicationFiles.php => PhabricatorFilesApplication.php} (96%) rename src/applications/flag/application/{PhabricatorApplicationFlags.php => PhabricatorFlagsApplication.php} (95%) rename src/applications/harbormaster/application/{PhabricatorApplicationHarbormaster.php => PhabricatorHarbormasterApplication.php} (97%) rename src/applications/help/application/{PhabricatorApplicationHelp.php => PhabricatorHelpApplication.php} (94%) rename src/applications/herald/application/{PhabricatorApplicationHerald.php => PhabricatorHeraldApplication.php} (88%) rename src/applications/home/application/{PhabricatorApplicationHome.php => PhabricatorHomeApplication.php} (97%) rename src/applications/legalpad/application/{PhabricatorApplicationLegalpad.php => PhabricatorLegalpadApplication.php} (81%) rename src/applications/macro/application/{PhabricatorApplicationMacro.php => PhabricatorMacroApplication.php} (91%) rename src/applications/mailinglists/application/{PhabricatorApplicationMailingLists.php => PhabricatorMailingListsApplication.php} (91%) rename src/applications/maniphest/application/{PhabricatorApplicationManiphest.php => PhabricatorManiphestApplication.php} (79%) rename src/applications/meta/application/{PhabricatorApplicationApplications.php => PhabricatorApplicationsApplication.php} (58%) rename src/applications/metamta/application/{PhabricatorApplicationMetaMTA.php => PhabricatorMetaMTAApplication.php} (84%) rename src/applications/notification/application/{PhabricatorApplicationNotifications.php => PhabricatorNotificationsApplication.php} (92%) rename src/applications/notification/{ => query}/PhabricatorNotificationQuery.php (98%) rename src/applications/nuance/application/{PhabricatorApplicationNuance.php => PhabricatorNuanceApplication.php} (83%) rename src/applications/oauthserver/application/{PhabricatorApplicationOAuthServer.php => PhabricatorOAuthServerApplication.php} (73%) rename src/applications/owners/application/{PhabricatorApplicationOwners.php => PhabricatorOwnersApplication.php} (94%) rename src/applications/passphrase/application/{PhabricatorApplicationPassphrase.php => PhabricatorPassphraseApplication.php} (95%) rename src/applications/paste/application/{PhabricatorApplicationPaste.php => PhabricatorPasteApplication.php} (75%) rename src/applications/people/application/{PhabricatorApplicationPeople.php => PhabricatorPeopleApplication.php} (96%) delete mode 100644 src/applications/phame/application/PhabricatorApplicationPhame.php create mode 100644 src/applications/phame/application/PhabricatorPhameApplication.php rename src/applications/phlux/application/{PhabricatorApplicationPhlux.php => PhabricatorPhluxApplication.php} (91%) rename src/applications/pholio/application/{PhabricatorApplicationPholio.php => PhabricatorPholioApplication.php} (96%) rename src/applications/phortune/application/{PhabricatorApplicationPhortune.php => PhabricatorPhortuneApplication.php} (95%) rename src/applications/phpast/application/{PhabricatorApplicationPHPAST.php => PhabricatorPHPASTApplication.php} (93%) rename src/applications/phragment/application/{PhabricatorApplicationPhragment.php => PhabricatorPhragmentApplication.php} (93%) rename src/applications/phrequent/application/{PhabricatorApplicationPhrequent.php => PhabricatorPhrequentApplication.php} (95%) rename src/applications/phriction/application/{PhabricatorApplicationPhriction.php => PhabricatorPhrictionApplication.php} (92%) rename src/applications/policy/application/{PhabricatorApplicationPolicy.php => PhabricatorPolicyApplication.php} (86%) rename src/applications/ponder/application/{PhabricatorApplicationPonder.php => PhabricatorPonderApplication.php} (90%) rename src/applications/project/application/{PhabricatorApplicationProject.php => PhabricatorProjectApplication.php} (83%) rename src/applications/releeph/application/{PhabricatorApplicationReleeph.php => PhabricatorReleephApplication.php} (76%) rename src/applications/releeph/config/{PhabricatorApplicationReleephConfigOptions.php => PhabricatorReleephApplicationConfigOptions.php} (97%) rename src/applications/repository/application/{PhabricatorApplicationRepositories.php => PhabricatorRepositoriesApplication.php} (56%) rename src/applications/search/application/{PhabricatorApplicationSearch.php => PhabricatorSearchApplication.php} (86%) rename src/applications/settings/application/{PhabricatorApplicationSettings.php => PhabricatorSettingsApplication.php} (95%) rename src/applications/slowvote/application/{PhabricatorApplicationSlowvote.php => PhabricatorSlowvoteApplication.php} (95%) rename src/applications/subscriptions/application/{PhabricatorApplicationSubscriptions.php => PhabricatorSubscriptionsApplication.php} (75%) rename src/applications/support/application/{PhabricatorApplicationSupport.php => PhabricatorSupportApplication.php} (82%) rename src/applications/system/application/{PhabricatorApplicationSystem.php => PhabricatorSystemApplication.php} (89%) rename src/applications/tokens/application/{PhabricatorApplicationTokens.php => PhabricatorTokensApplication.php} (93%) rename src/applications/transactions/application/{PhabricatorApplicationTransactions.php => PhabricatorTransactionsApplication.php} (93%) rename src/applications/typeahead/application/{PhabricatorApplicationTypeahead.php => PhabricatorTypeaheadApplication.php} (84%) rename src/applications/uiexample/application/{PhabricatorApplicationUIExamples.php => PhabricatorUIExamplesApplication.php} (92%) rename src/applications/xhprof/application/{PhabricatorApplicationXHProf.php => PhabricatorXHProfApplication.php} (91%) diff --git a/resources/sql/autopatches/20140722.appname.php b/resources/sql/autopatches/20140722.appname.php new file mode 100644 index 0000000000..fca11bb4b5 --- /dev/null +++ b/resources/sql/autopatches/20140722.appname.php @@ -0,0 +1,166 @@ +establishConnection('w'); +$pref_pinned = PhabricatorUserPreferences::PREFERENCE_APP_PINNED; + +foreach (new LiskMigrationIterator(new PhabricatorUser()) as $user) { + $user_preferences = $user->loadPreferences(); + + $old_pinned_apps = $user_preferences->getPreference($pref_pinned); + $new_pinned_apps = array(); + + if (!$old_pinned_apps) { + continue; + } + + foreach ($old_pinned_apps as $pinned_app) { + $new_pinned_apps[] = idx($map, $pinned_app, $pinned_app); + } + + $user_preferences + ->setPreference($pref_pinned, $new_pinned_apps); + + queryfx( + $conn_w, + 'UPDATE %T SET preferences = %s WHERE id = %d', + $user_preferences->getTableName(), + json_encode($user_preferences->getPreferences()), + $user_preferences->getID()); +} + + +/* -( Dashboard installs )------------------------------------------------- */ + +echo "Migrating dashboard installs...\n"; +$table = new PhabricatorDashboardInstall(); +$conn_w = $table->establishConnection('w'); + +foreach (new LiskMigrationIterator($table) as $dashboard_install) { + $application = $dashboard_install->getApplicationClass(); + + queryfx( + $conn_w, + 'UPDATE %T SET applicationClass = %s WHERE id = %d', + $table->getTableName(), + idx($map, $application, $application), + $dashboard_install->getID()); +} + + +/* -( Phabricator configuration )------------------------------------------ */ + +$config_key = 'phabricator.uninstalled-applications'; +echo "Migrating `{$config_key}` config...\n"; + +$config = PhabricatorConfigEntry::loadConfigEntry($config_key); +$old_config = $config->getValue(); +$new_config = array(); + +if ($old_config) { + foreach ($old_config as $application => $uninstalled) { + $new_config[idx($map, $application, $application)] = $uninstalled; + } + + $config + ->setIsDeleted(0) + ->setValue($new_config) + ->save(); +} + + +/* -( phabricator.application-settings )----------------------------------- */ + +$config_key = 'phabricator.application-settings'; +echo "Migrating `{$config_key}` config...\n"; + +$config = PhabricatorConfigEntry::loadConfigEntry($config_key); +$old_config = $config->getValue(); +$new_config = array(); + +if ($old_config) { + foreach ($old_config as $application => $settings) { + $application = preg_replace('/^PHID-APPS-/', '', $application); + $new_config['PHID-APPS-'.idx($map, $application, $application)] = $settings; + } + + $config + ->setIsDeleted(0) + ->setValue($new_config) + ->save(); +} diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 0b32f656fa..46d0edaa8a 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -1140,75 +1140,17 @@ phutil_register_library_map(array( 'PhabricatorAphrontViewTestCase' => 'view/__tests__/PhabricatorAphrontViewTestCase.php', 'PhabricatorAppSearchEngine' => 'applications/meta/query/PhabricatorAppSearchEngine.php', 'PhabricatorApplication' => 'applications/base/PhabricatorApplication.php', - 'PhabricatorApplicationApplications' => 'applications/meta/application/PhabricatorApplicationApplications.php', - 'PhabricatorApplicationAudit' => 'applications/audit/application/PhabricatorApplicationAudit.php', - 'PhabricatorApplicationAuth' => 'applications/auth/application/PhabricatorApplicationAuth.php', - 'PhabricatorApplicationCalendar' => 'applications/calendar/application/PhabricatorApplicationCalendar.php', - 'PhabricatorApplicationChatLog' => 'applications/chatlog/applications/PhabricatorApplicationChatLog.php', - 'PhabricatorApplicationConduit' => 'applications/conduit/application/PhabricatorApplicationConduit.php', - 'PhabricatorApplicationConfig' => 'applications/config/application/PhabricatorApplicationConfig.php', 'PhabricatorApplicationConfigOptions' => 'applications/config/option/PhabricatorApplicationConfigOptions.php', - 'PhabricatorApplicationConpherence' => 'applications/conpherence/application/PhabricatorApplicationConpherence.php', - 'PhabricatorApplicationCountdown' => 'applications/countdown/application/PhabricatorApplicationCountdown.php', - 'PhabricatorApplicationDaemons' => 'applications/daemon/application/PhabricatorApplicationDaemons.php', - 'PhabricatorApplicationDashboard' => 'applications/dashboard/application/PhabricatorApplicationDashboard.php', 'PhabricatorApplicationDatasource' => 'applications/meta/typeahead/PhabricatorApplicationDatasource.php', 'PhabricatorApplicationDetailViewController' => 'applications/meta/controller/PhabricatorApplicationDetailViewController.php', - 'PhabricatorApplicationDifferential' => 'applications/differential/application/PhabricatorApplicationDifferential.php', - 'PhabricatorApplicationDiffusion' => 'applications/diffusion/application/PhabricatorApplicationDiffusion.php', - 'PhabricatorApplicationDiviner' => 'applications/diviner/application/PhabricatorApplicationDiviner.php', - 'PhabricatorApplicationDoorkeeper' => 'applications/doorkeeper/application/PhabricatorApplicationDoorkeeper.php', - 'PhabricatorApplicationDrydock' => 'applications/drydock/application/PhabricatorApplicationDrydock.php', 'PhabricatorApplicationEditController' => 'applications/meta/controller/PhabricatorApplicationEditController.php', - 'PhabricatorApplicationFact' => 'applications/fact/application/PhabricatorApplicationFact.php', - 'PhabricatorApplicationFeed' => 'applications/feed/application/PhabricatorApplicationFeed.php', - 'PhabricatorApplicationFiles' => 'applications/files/application/PhabricatorApplicationFiles.php', - 'PhabricatorApplicationFlags' => 'applications/flag/application/PhabricatorApplicationFlags.php', - 'PhabricatorApplicationHarbormaster' => 'applications/harbormaster/application/PhabricatorApplicationHarbormaster.php', - 'PhabricatorApplicationHelp' => 'applications/help/application/PhabricatorApplicationHelp.php', - 'PhabricatorApplicationHerald' => 'applications/herald/application/PhabricatorApplicationHerald.php', - 'PhabricatorApplicationHome' => 'applications/home/application/PhabricatorApplicationHome.php', 'PhabricatorApplicationLaunchView' => 'applications/meta/view/PhabricatorApplicationLaunchView.php', - 'PhabricatorApplicationLegalpad' => 'applications/legalpad/application/PhabricatorApplicationLegalpad.php', - 'PhabricatorApplicationMacro' => 'applications/macro/application/PhabricatorApplicationMacro.php', - 'PhabricatorApplicationMailingLists' => 'applications/mailinglists/application/PhabricatorApplicationMailingLists.php', - 'PhabricatorApplicationManiphest' => 'applications/maniphest/application/PhabricatorApplicationManiphest.php', - 'PhabricatorApplicationMetaMTA' => 'applications/metamta/application/PhabricatorApplicationMetaMTA.php', - 'PhabricatorApplicationNotifications' => 'applications/notification/application/PhabricatorApplicationNotifications.php', - 'PhabricatorApplicationNuance' => 'applications/nuance/application/PhabricatorApplicationNuance.php', - 'PhabricatorApplicationOAuthServer' => 'applications/oauthserver/application/PhabricatorApplicationOAuthServer.php', - 'PhabricatorApplicationOwners' => 'applications/owners/application/PhabricatorApplicationOwners.php', 'PhabricatorApplicationPHIDTypeApplication' => 'applications/meta/phid/PhabricatorApplicationPHIDTypeApplication.php', - 'PhabricatorApplicationPHPAST' => 'applications/phpast/application/PhabricatorApplicationPHPAST.php', - 'PhabricatorApplicationPassphrase' => 'applications/passphrase/application/PhabricatorApplicationPassphrase.php', - 'PhabricatorApplicationPaste' => 'applications/paste/application/PhabricatorApplicationPaste.php', - 'PhabricatorApplicationPeople' => 'applications/people/application/PhabricatorApplicationPeople.php', - 'PhabricatorApplicationPhame' => 'applications/phame/application/PhabricatorApplicationPhame.php', - 'PhabricatorApplicationPhlux' => 'applications/phlux/application/PhabricatorApplicationPhlux.php', - 'PhabricatorApplicationPholio' => 'applications/pholio/application/PhabricatorApplicationPholio.php', - 'PhabricatorApplicationPhortune' => 'applications/phortune/application/PhabricatorApplicationPhortune.php', - 'PhabricatorApplicationPhragment' => 'applications/phragment/application/PhabricatorApplicationPhragment.php', - 'PhabricatorApplicationPhrequent' => 'applications/phrequent/application/PhabricatorApplicationPhrequent.php', - 'PhabricatorApplicationPhriction' => 'applications/phriction/application/PhabricatorApplicationPhriction.php', - 'PhabricatorApplicationPolicy' => 'applications/policy/application/PhabricatorApplicationPolicy.php', - 'PhabricatorApplicationPonder' => 'applications/ponder/application/PhabricatorApplicationPonder.php', - 'PhabricatorApplicationProject' => 'applications/project/application/PhabricatorApplicationProject.php', 'PhabricatorApplicationQuery' => 'applications/meta/query/PhabricatorApplicationQuery.php', - 'PhabricatorApplicationReleeph' => 'applications/releeph/application/PhabricatorApplicationReleeph.php', - 'PhabricatorApplicationReleephConfigOptions' => 'applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php', - 'PhabricatorApplicationRepositories' => 'applications/repository/application/PhabricatorApplicationRepositories.php', - 'PhabricatorApplicationSearch' => 'applications/search/application/PhabricatorApplicationSearch.php', 'PhabricatorApplicationSearchController' => 'applications/search/controller/PhabricatorApplicationSearchController.php', 'PhabricatorApplicationSearchEngine' => 'applications/search/engine/PhabricatorApplicationSearchEngine.php', 'PhabricatorApplicationSearchResultsControllerInterface' => 'applications/search/interface/PhabricatorApplicationSearchResultsControllerInterface.php', - 'PhabricatorApplicationSettings' => 'applications/settings/application/PhabricatorApplicationSettings.php', - 'PhabricatorApplicationSlowvote' => 'applications/slowvote/application/PhabricatorApplicationSlowvote.php', 'PhabricatorApplicationStatusView' => 'applications/meta/view/PhabricatorApplicationStatusView.php', - 'PhabricatorApplicationSubscriptions' => 'applications/subscriptions/application/PhabricatorApplicationSubscriptions.php', - 'PhabricatorApplicationSupport' => 'applications/support/application/PhabricatorApplicationSupport.php', - 'PhabricatorApplicationSystem' => 'applications/system/application/PhabricatorApplicationSystem.php', - 'PhabricatorApplicationTest' => 'applications/base/controller/__tests__/PhabricatorApplicationTest.php', - 'PhabricatorApplicationTokens' => 'applications/tokens/application/PhabricatorApplicationTokens.php', 'PhabricatorApplicationTransaction' => 'applications/transactions/storage/PhabricatorApplicationTransaction.php', 'PhabricatorApplicationTransactionComment' => 'applications/transactions/storage/PhabricatorApplicationTransactionComment.php', 'PhabricatorApplicationTransactionCommentEditController' => 'applications/transactions/controller/PhabricatorApplicationTransactionCommentEditController.php', @@ -1234,17 +1176,15 @@ phutil_register_library_map(array( 'PhabricatorApplicationTransactionValidationException' => 'applications/transactions/exception/PhabricatorApplicationTransactionValidationException.php', 'PhabricatorApplicationTransactionValueController' => 'applications/transactions/controller/PhabricatorApplicationTransactionValueController.php', 'PhabricatorApplicationTransactionView' => 'applications/transactions/view/PhabricatorApplicationTransactionView.php', - 'PhabricatorApplicationTransactions' => 'applications/transactions/application/PhabricatorApplicationTransactions.php', - 'PhabricatorApplicationTypeahead' => 'applications/typeahead/application/PhabricatorApplicationTypeahead.php', - 'PhabricatorApplicationUIExamples' => 'applications/uiexample/application/PhabricatorApplicationUIExamples.php', 'PhabricatorApplicationUninstallController' => 'applications/meta/controller/PhabricatorApplicationUninstallController.php', - 'PhabricatorApplicationXHProf' => 'applications/xhprof/application/PhabricatorApplicationXHProf.php', + 'PhabricatorApplicationsApplication' => 'applications/meta/application/PhabricatorApplicationsApplication.php', 'PhabricatorApplicationsController' => 'applications/meta/controller/PhabricatorApplicationsController.php', 'PhabricatorApplicationsListController' => 'applications/meta/controller/PhabricatorApplicationsListController.php', 'PhabricatorAsanaAuthProvider' => 'applications/auth/provider/PhabricatorAsanaAuthProvider.php', 'PhabricatorAsanaConfigOptions' => 'applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php', 'PhabricatorAuditActionConstants' => 'applications/audit/constants/PhabricatorAuditActionConstants.php', 'PhabricatorAuditAddCommentController' => 'applications/audit/controller/PhabricatorAuditAddCommentController.php', + 'PhabricatorAuditApplication' => 'applications/audit/application/PhabricatorAuditApplication.php', 'PhabricatorAuditComment' => 'applications/audit/storage/PhabricatorAuditComment.php', 'PhabricatorAuditCommentEditor' => 'applications/audit/editor/PhabricatorAuditCommentEditor.php', 'PhabricatorAuditCommitStatusConstants' => 'applications/audit/constants/PhabricatorAuditCommitStatusConstants.php', @@ -1260,6 +1200,7 @@ phutil_register_library_map(array( 'PhabricatorAuditReplyHandler' => 'applications/audit/mail/PhabricatorAuditReplyHandler.php', 'PhabricatorAuditStatusConstants' => 'applications/audit/constants/PhabricatorAuditStatusConstants.php', 'PhabricatorAuthAccountView' => 'applications/auth/view/PhabricatorAuthAccountView.php', + 'PhabricatorAuthApplication' => 'applications/auth/application/PhabricatorAuthApplication.php', 'PhabricatorAuthConfirmLinkController' => 'applications/auth/controller/PhabricatorAuthConfirmLinkController.php', 'PhabricatorAuthController' => 'applications/auth/controller/PhabricatorAuthController.php', 'PhabricatorAuthDAO' => 'applications/auth/storage/PhabricatorAuthDAO.php', @@ -1340,6 +1281,7 @@ phutil_register_library_map(array( 'PhabricatorCacheMarkupGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheMarkupGarbageCollector.php', 'PhabricatorCacheTTLGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheTTLGarbageCollector.php', 'PhabricatorCaches' => 'applications/cache/PhabricatorCaches.php', + 'PhabricatorCalendarApplication' => 'applications/calendar/application/PhabricatorCalendarApplication.php', 'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/PhabricatorCalendarBrowseController.php', 'PhabricatorCalendarController' => 'applications/calendar/controller/PhabricatorCalendarController.php', 'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php', @@ -1358,6 +1300,7 @@ phutil_register_library_map(array( 'PhabricatorCampfireProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php', 'PhabricatorChangeParserTestCase' => 'applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php', 'PhabricatorChangesetResponse' => 'infrastructure/diff/PhabricatorChangesetResponse.php', + 'PhabricatorChatLogApplication' => 'applications/chatlog/application/PhabricatorChatLogApplication.php', 'PhabricatorChatLogChannel' => 'applications/chatlog/storage/PhabricatorChatLogChannel.php', 'PhabricatorChatLogChannelListController' => 'applications/chatlog/controller/PhabricatorChatLogChannelListController.php', 'PhabricatorChatLogChannelLogController' => 'applications/chatlog/controller/PhabricatorChatLogChannelLogController.php', @@ -1374,6 +1317,7 @@ phutil_register_library_map(array( 'PhabricatorCommitTagsField' => 'applications/repository/customfield/PhabricatorCommitTagsField.php', 'PhabricatorCommonPasswords' => 'applications/auth/constants/PhabricatorCommonPasswords.php', 'PhabricatorConduitAPIController' => 'applications/conduit/controller/PhabricatorConduitAPIController.php', + 'PhabricatorConduitApplication' => 'applications/conduit/application/PhabricatorConduitApplication.php', 'PhabricatorConduitCertificateToken' => 'applications/conduit/storage/PhabricatorConduitCertificateToken.php', 'PhabricatorConduitConfigOptions' => 'applications/conduit/config/PhabricatorConduitConfigOptions.php', 'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/PhabricatorConduitConnectionLog.php', @@ -1388,6 +1332,7 @@ phutil_register_library_map(array( 'PhabricatorConduitSearchEngine' => 'applications/conduit/query/PhabricatorConduitSearchEngine.php', 'PhabricatorConduitTokenController' => 'applications/conduit/controller/PhabricatorConduitTokenController.php', 'PhabricatorConfigAllController' => 'applications/config/controller/PhabricatorConfigAllController.php', + 'PhabricatorConfigApplication' => 'applications/config/application/PhabricatorConfigApplication.php', 'PhabricatorConfigController' => 'applications/config/controller/PhabricatorConfigController.php', 'PhabricatorConfigDatabaseSource' => 'infrastructure/env/PhabricatorConfigDatabaseSource.php', 'PhabricatorConfigDefaultSource' => 'infrastructure/env/PhabricatorConfigDefaultSource.php', @@ -1422,6 +1367,7 @@ phutil_register_library_map(array( 'PhabricatorConfigTransactionQuery' => 'applications/config/query/PhabricatorConfigTransactionQuery.php', 'PhabricatorConfigValidationException' => 'applications/config/exception/PhabricatorConfigValidationException.php', 'PhabricatorConfigWelcomeController' => 'applications/config/controller/PhabricatorConfigWelcomeController.php', + 'PhabricatorConpherenceApplication' => 'applications/conpherence/application/PhabricatorConpherenceApplication.php', 'PhabricatorConpherencePHIDTypeThread' => 'applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php', 'PhabricatorContentSource' => 'applications/metamta/contentsource/PhabricatorContentSource.php', 'PhabricatorContentSourceView' => 'applications/metamta/contentsource/PhabricatorContentSourceView.php', @@ -1429,6 +1375,7 @@ phutil_register_library_map(array( 'PhabricatorCookies' => 'applications/auth/constants/PhabricatorCookies.php', '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', 'PhabricatorCountdownDAO' => 'applications/countdown/storage/PhabricatorCountdownDAO.php', @@ -1485,8 +1432,10 @@ phutil_register_library_map(array( 'PhabricatorDaemonManagementWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementWorkflow.php', 'PhabricatorDaemonReference' => 'infrastructure/daemon/control/PhabricatorDaemonReference.php', 'PhabricatorDaemonTaskGarbageCollector' => 'applications/daemon/garbagecollector/PhabricatorDaemonTaskGarbageCollector.php', + 'PhabricatorDaemonsApplication' => 'applications/daemon/application/PhabricatorDaemonsApplication.php', 'PhabricatorDashboard' => 'applications/dashboard/storage/PhabricatorDashboard.php', 'PhabricatorDashboardAddPanelController' => 'applications/dashboard/controller/PhabricatorDashboardAddPanelController.php', + 'PhabricatorDashboardApplication' => 'applications/dashboard/application/PhabricatorDashboardApplication.php', 'PhabricatorDashboardController' => 'applications/dashboard/controller/PhabricatorDashboardController.php', 'PhabricatorDashboardCopyController' => 'applications/dashboard/controller/PhabricatorDashboardCopyController.php', 'PhabricatorDashboardDAO' => 'applications/dashboard/storage/PhabricatorDashboardDAO.php', @@ -1539,14 +1488,19 @@ phutil_register_library_map(array( 'PhabricatorDestructionEngine' => 'applications/system/engine/PhabricatorDestructionEngine.php', 'PhabricatorDeveloperConfigOptions' => 'applications/config/option/PhabricatorDeveloperConfigOptions.php', 'PhabricatorDifferenceEngine' => 'infrastructure/diff/PhabricatorDifferenceEngine.php', + 'PhabricatorDifferentialApplication' => 'applications/differential/application/PhabricatorDifferentialApplication.php', 'PhabricatorDifferentialConfigOptions' => 'applications/differential/config/PhabricatorDifferentialConfigOptions.php', 'PhabricatorDifferentialRevisionTestDataGenerator' => 'applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php', + 'PhabricatorDiffusionApplication' => 'applications/diffusion/application/PhabricatorDiffusionApplication.php', 'PhabricatorDiffusionConfigOptions' => 'applications/diffusion/config/PhabricatorDiffusionConfigOptions.php', 'PhabricatorDisabledUserController' => 'applications/auth/controller/PhabricatorDisabledUserController.php', 'PhabricatorDisqusAuthProvider' => 'applications/auth/provider/PhabricatorDisqusAuthProvider.php', 'PhabricatorDisqusConfigOptions' => 'applications/config/option/PhabricatorDisqusConfigOptions.php', + 'PhabricatorDivinerApplication' => 'applications/diviner/application/PhabricatorDivinerApplication.php', + 'PhabricatorDoorkeeperApplication' => 'applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php', 'PhabricatorDraft' => 'applications/draft/storage/PhabricatorDraft.php', 'PhabricatorDraftDAO' => 'applications/draft/storage/PhabricatorDraftDAO.php', + 'PhabricatorDrydockApplication' => 'applications/drydock/application/PhabricatorDrydockApplication.php', 'PhabricatorEdgeConfig' => 'infrastructure/edges/constants/PhabricatorEdgeConfig.php', 'PhabricatorEdgeConstants' => 'infrastructure/edges/constants/PhabricatorEdgeConstants.php', 'PhabricatorEdgeCycleException' => 'infrastructure/edges/exception/PhabricatorEdgeCycleException.php', @@ -1573,6 +1527,7 @@ phutil_register_library_map(array( 'PhabricatorExternalAccountQuery' => 'applications/auth/query/PhabricatorExternalAccountQuery.php', 'PhabricatorFacebookAuthProvider' => 'applications/auth/provider/PhabricatorFacebookAuthProvider.php', 'PhabricatorFactAggregate' => 'applications/fact/storage/PhabricatorFactAggregate.php', + 'PhabricatorFactApplication' => 'applications/fact/application/PhabricatorFactApplication.php', 'PhabricatorFactChartController' => 'applications/fact/controller/PhabricatorFactChartController.php', 'PhabricatorFactController' => 'applications/fact/controller/PhabricatorFactController.php', 'PhabricatorFactCountEngine' => 'applications/fact/engine/PhabricatorFactCountEngine.php', @@ -1592,6 +1547,7 @@ phutil_register_library_map(array( 'PhabricatorFactSimpleSpec' => 'applications/fact/spec/PhabricatorFactSimpleSpec.php', 'PhabricatorFactSpec' => 'applications/fact/spec/PhabricatorFactSpec.php', 'PhabricatorFactUpdateIterator' => 'applications/fact/extract/PhabricatorFactUpdateIterator.php', + 'PhabricatorFeedApplication' => 'applications/feed/application/PhabricatorFeedApplication.php', 'PhabricatorFeedBuilder' => 'applications/feed/builder/PhabricatorFeedBuilder.php', 'PhabricatorFeedConfigOptions' => 'applications/feed/config/PhabricatorFeedConfigOptions.php', 'PhabricatorFeedConstants' => 'applications/feed/constants/PhabricatorFeedConstants.php', @@ -1651,6 +1607,7 @@ phutil_register_library_map(array( 'PhabricatorFileUploadController' => 'applications/files/controller/PhabricatorFileUploadController.php', 'PhabricatorFileUploadDialogController' => 'applications/files/controller/PhabricatorFileUploadDialogController.php', 'PhabricatorFileUploadException' => 'applications/files/exception/PhabricatorFileUploadException.php', + 'PhabricatorFilesApplication' => 'applications/files/application/PhabricatorFilesApplication.php', 'PhabricatorFilesConfigOptions' => 'applications/files/config/PhabricatorFilesConfigOptions.php', 'PhabricatorFilesManagementEnginesWorkflow' => 'applications/files/management/PhabricatorFilesManagementEnginesWorkflow.php', 'PhabricatorFilesManagementMigrateWorkflow' => 'applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php', @@ -1669,6 +1626,7 @@ phutil_register_library_map(array( 'PhabricatorFlagSearchEngine' => 'applications/flag/query/PhabricatorFlagSearchEngine.php', 'PhabricatorFlagSelectControl' => 'applications/flag/view/PhabricatorFlagSelectControl.php', 'PhabricatorFlaggableInterface' => 'applications/flag/interface/PhabricatorFlaggableInterface.php', + 'PhabricatorFlagsApplication' => 'applications/flag/application/PhabricatorFlagsApplication.php', 'PhabricatorFlagsUIEventListener' => 'applications/flag/events/PhabricatorFlagsUIEventListener.php', 'PhabricatorFormExample' => 'applications/uiexample/examples/PhabricatorFormExample.php', 'PhabricatorGarbageCollector' => 'infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php', @@ -1682,12 +1640,16 @@ phutil_register_library_map(array( 'PhabricatorGoogleAuthProvider' => 'applications/auth/provider/PhabricatorGoogleAuthProvider.php', 'PhabricatorHandleObjectSelectorDataView' => 'applications/phid/handle/view/PhabricatorHandleObjectSelectorDataView.php', 'PhabricatorHandleQuery' => 'applications/phid/query/PhabricatorHandleQuery.php', + 'PhabricatorHarbormasterApplication' => 'applications/harbormaster/application/PhabricatorHarbormasterApplication.php', 'PhabricatorHarbormasterConfigOptions' => 'applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php', 'PhabricatorHash' => 'infrastructure/util/PhabricatorHash.php', 'PhabricatorHashTestCase' => 'infrastructure/util/__tests__/PhabricatorHashTestCase.php', + 'PhabricatorHelpApplication' => 'applications/help/application/PhabricatorHelpApplication.php', 'PhabricatorHelpController' => 'applications/help/controller/PhabricatorHelpController.php', 'PhabricatorHelpEditorProtocolController' => 'applications/help/controller/PhabricatorHelpEditorProtocolController.php', 'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/PhabricatorHelpKeyboardShortcutController.php', + 'PhabricatorHeraldApplication' => 'applications/herald/application/PhabricatorHeraldApplication.php', + 'PhabricatorHomeApplication' => 'applications/home/application/PhabricatorHomeApplication.php', 'PhabricatorHomeController' => 'applications/home/controller/PhabricatorHomeController.php', 'PhabricatorHomeMainController' => 'applications/home/controller/PhabricatorHomeMainController.php', 'PhabricatorHomeQuickCreateController' => 'applications/home/controller/PhabricatorHomeQuickCreateController.php', @@ -1711,6 +1673,7 @@ phutil_register_library_map(array( 'PhabricatorKeyValueDatabaseCache' => 'applications/cache/PhabricatorKeyValueDatabaseCache.php', 'PhabricatorLDAPAuthProvider' => 'applications/auth/provider/PhabricatorLDAPAuthProvider.php', 'PhabricatorLegacyEdgeType' => 'infrastructure/edges/type/PhabricatorLegacyEdgeType.php', + 'PhabricatorLegalpadApplication' => 'applications/legalpad/application/PhabricatorLegalpadApplication.php', 'PhabricatorLegalpadConfigOptions' => 'applications/legalpad/config/PhabricatorLegalpadConfigOptions.php', 'PhabricatorLegalpadPHIDTypeDocument' => 'applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php', 'PhabricatorLipsumArtist' => 'applications/lipsum/image/PhabricatorLipsumArtist.php', @@ -1721,6 +1684,7 @@ phutil_register_library_map(array( 'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php', 'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php', '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', @@ -1767,6 +1731,7 @@ phutil_register_library_map(array( 'PhabricatorMailingListPHIDTypeList' => 'applications/mailinglists/phid/PhabricatorMailingListPHIDTypeList.php', 'PhabricatorMailingListQuery' => 'applications/mailinglists/query/PhabricatorMailingListQuery.php', 'PhabricatorMailingListSearchEngine' => 'applications/mailinglists/query/PhabricatorMailingListSearchEngine.php', + 'PhabricatorMailingListsApplication' => 'applications/mailinglists/application/PhabricatorMailingListsApplication.php', 'PhabricatorMailingListsController' => 'applications/mailinglists/controller/PhabricatorMailingListsController.php', 'PhabricatorMailingListsEditController' => 'applications/mailinglists/controller/PhabricatorMailingListsEditController.php', 'PhabricatorMailingListsListController' => 'applications/mailinglists/controller/PhabricatorMailingListsListController.php', @@ -1775,6 +1740,7 @@ phutil_register_library_map(array( 'PhabricatorMainMenuSearchView' => 'view/page/menu/PhabricatorMainMenuSearchView.php', 'PhabricatorMainMenuView' => 'view/page/menu/PhabricatorMainMenuView.php', 'PhabricatorManagementWorkflow' => 'infrastructure/management/PhabricatorManagementWorkflow.php', + 'PhabricatorManiphestApplication' => 'applications/maniphest/application/PhabricatorManiphestApplication.php', 'PhabricatorManiphestConfigOptions' => 'applications/maniphest/config/PhabricatorManiphestConfigOptions.php', 'PhabricatorManiphestTaskTestDataGenerator' => 'applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php', 'PhabricatorMarkupCache' => 'applications/cache/storage/PhabricatorMarkupCache.php', @@ -1785,6 +1751,7 @@ phutil_register_library_map(array( 'PhabricatorMercurialGraphStream' => 'applications/repository/daemon/PhabricatorMercurialGraphStream.php', 'PhabricatorMetaMTAActor' => 'applications/metamta/query/PhabricatorMetaMTAActor.php', 'PhabricatorMetaMTAActorQuery' => 'applications/metamta/query/PhabricatorMetaMTAActorQuery.php', + 'PhabricatorMetaMTAApplication' => 'applications/metamta/application/PhabricatorMetaMTAApplication.php', 'PhabricatorMetaMTAAttachment' => 'applications/metamta/storage/PhabricatorMetaMTAAttachment.php', 'PhabricatorMetaMTAConfigOptions' => 'applications/config/option/PhabricatorMetaMTAConfigOptions.php', 'PhabricatorMetaMTAController' => 'applications/metamta/controller/PhabricatorMetaMTAController.php', @@ -1821,10 +1788,12 @@ phutil_register_library_map(array( 'PhabricatorNotificationIndividualController' => 'applications/notification/controller/PhabricatorNotificationIndividualController.php', 'PhabricatorNotificationListController' => 'applications/notification/controller/PhabricatorNotificationListController.php', 'PhabricatorNotificationPanelController' => 'applications/notification/controller/PhabricatorNotificationPanelController.php', - 'PhabricatorNotificationQuery' => 'applications/notification/PhabricatorNotificationQuery.php', + 'PhabricatorNotificationQuery' => 'applications/notification/query/PhabricatorNotificationQuery.php', 'PhabricatorNotificationStatusController' => 'applications/notification/controller/PhabricatorNotificationStatusController.php', 'PhabricatorNotificationStatusView' => 'applications/notification/view/PhabricatorNotificationStatusView.php', 'PhabricatorNotificationTestController' => 'applications/notification/controller/PhabricatorNotificationTestController.php', + 'PhabricatorNotificationsApplication' => 'applications/notification/application/PhabricatorNotificationsApplication.php', + 'PhabricatorNuanceApplication' => 'applications/nuance/application/PhabricatorNuanceApplication.php', 'PhabricatorOAuth1AuthProvider' => 'applications/auth/provider/PhabricatorOAuth1AuthProvider.php', 'PhabricatorOAuth2AuthProvider' => 'applications/auth/provider/PhabricatorOAuth2AuthProvider.php', 'PhabricatorOAuthAuthProvider' => 'applications/auth/provider/PhabricatorOAuthAuthProvider.php', @@ -1838,6 +1807,7 @@ phutil_register_library_map(array( 'PhabricatorOAuthResponse' => 'applications/oauthserver/PhabricatorOAuthResponse.php', 'PhabricatorOAuthServer' => 'applications/oauthserver/PhabricatorOAuthServer.php', 'PhabricatorOAuthServerAccessToken' => 'applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php', + 'PhabricatorOAuthServerApplication' => 'applications/oauthserver/application/PhabricatorOAuthServerApplication.php', 'PhabricatorOAuthServerAuthController' => 'applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php', 'PhabricatorOAuthServerAuthorizationCode' => 'applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php', 'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php', @@ -1864,6 +1834,7 @@ phutil_register_library_map(array( 'PhabricatorObjectSelectorDialog' => 'view/control/PhabricatorObjectSelectorDialog.php', 'PhabricatorOffsetPagedQuery' => 'infrastructure/query/PhabricatorOffsetPagedQuery.php', 'PhabricatorOwnerPathQuery' => 'applications/owners/query/PhabricatorOwnerPathQuery.php', + 'PhabricatorOwnersApplication' => 'applications/owners/application/PhabricatorOwnersApplication.php', 'PhabricatorOwnersConfigOptions' => 'applications/owners/config/PhabricatorOwnersConfigOptions.php', 'PhabricatorOwnersController' => 'applications/owners/controller/PhabricatorOwnersController.php', 'PhabricatorOwnersDAO' => 'applications/owners/storage/PhabricatorOwnersDAO.php', @@ -1884,13 +1855,16 @@ phutil_register_library_map(array( 'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php', 'PhabricatorPHIDInterface' => 'applications/phid/interface/PhabricatorPHIDInterface.php', 'PhabricatorPHIDType' => 'applications/phid/type/PhabricatorPHIDType.php', + 'PhabricatorPHPASTApplication' => 'applications/phpast/application/PhabricatorPHPASTApplication.php', 'PhabricatorPHPMailerConfigOptions' => 'applications/config/option/PhabricatorPHPMailerConfigOptions.php', 'PhabricatorPagedFormExample' => 'applications/uiexample/examples/PhabricatorPagedFormExample.php', + 'PhabricatorPassphraseApplication' => 'applications/passphrase/application/PhabricatorPassphraseApplication.php', 'PhabricatorPasswordAuthProvider' => 'applications/auth/provider/PhabricatorPasswordAuthProvider.php', 'PhabricatorPasswordHasher' => 'infrastructure/util/password/PhabricatorPasswordHasher.php', 'PhabricatorPasswordHasherTestCase' => 'infrastructure/util/password/__tests__/PhabricatorPasswordHasherTestCase.php', 'PhabricatorPasswordHasherUnavailableException' => 'infrastructure/util/password/PhabricatorPasswordHasherUnavailableException.php', 'PhabricatorPaste' => 'applications/paste/storage/PhabricatorPaste.php', + 'PhabricatorPasteApplication' => 'applications/paste/application/PhabricatorPasteApplication.php', 'PhabricatorPasteCommentController' => 'applications/paste/controller/PhabricatorPasteCommentController.php', 'PhabricatorPasteConfigOptions' => 'applications/paste/config/PhabricatorPasteConfigOptions.php', 'PhabricatorPasteController' => 'applications/paste/controller/PhabricatorPasteController.php', @@ -1907,6 +1881,7 @@ phutil_register_library_map(array( 'PhabricatorPasteTransactionComment' => 'applications/paste/storage/PhabricatorPasteTransactionComment.php', 'PhabricatorPasteTransactionQuery' => 'applications/paste/query/PhabricatorPasteTransactionQuery.php', 'PhabricatorPasteViewController' => 'applications/paste/controller/PhabricatorPasteViewController.php', + 'PhabricatorPeopleApplication' => 'applications/people/application/PhabricatorPeopleApplication.php', 'PhabricatorPeopleApproveController' => 'applications/people/controller/PhabricatorPeopleApproveController.php', 'PhabricatorPeopleCalendarController' => 'applications/people/controller/PhabricatorPeopleCalendarController.php', 'PhabricatorPeopleController' => 'applications/people/controller/PhabricatorPeopleController.php', @@ -1933,16 +1908,24 @@ phutil_register_library_map(array( 'PhabricatorPeopleTestDataGenerator' => 'applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php', 'PhabricatorPeopleWelcomeController' => 'applications/people/controller/PhabricatorPeopleWelcomeController.php', 'PhabricatorPersonaAuthProvider' => 'applications/auth/provider/PhabricatorPersonaAuthProvider.php', + 'PhabricatorPhameApplication' => 'applications/phame/application/PhabricatorPhameApplication.php', 'PhabricatorPhameConfigOptions' => 'applications/phame/config/PhabricatorPhameConfigOptions.php', 'PhabricatorPhamePHIDTypeBlog' => 'applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php', 'PhabricatorPhamePHIDTypePost' => 'applications/phame/phid/PhabricatorPhamePHIDTypePost.php', + 'PhabricatorPhluxApplication' => 'applications/phlux/application/PhabricatorPhluxApplication.php', + 'PhabricatorPholioApplication' => 'applications/pholio/application/PhabricatorPholioApplication.php', 'PhabricatorPholioConfigOptions' => 'applications/pholio/config/PhabricatorPholioConfigOptions.php', 'PhabricatorPholioMockTestDataGenerator' => 'applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php', + 'PhabricatorPhortuneApplication' => 'applications/phortune/application/PhabricatorPhortuneApplication.php', 'PhabricatorPhortuneConfigOptions' => 'applications/phortune/option/PhabricatorPhortuneConfigOptions.php', + 'PhabricatorPhragmentApplication' => 'applications/phragment/application/PhabricatorPhragmentApplication.php', + 'PhabricatorPhrequentApplication' => 'applications/phrequent/application/PhabricatorPhrequentApplication.php', 'PhabricatorPhrequentConfigOptions' => 'applications/phrequent/config/PhabricatorPhrequentConfigOptions.php', + 'PhabricatorPhrictionApplication' => 'applications/phriction/application/PhabricatorPhrictionApplication.php', 'PhabricatorPhrictionConfigOptions' => 'applications/phriction/config/PhabricatorPhrictionConfigOptions.php', 'PhabricatorPolicies' => 'applications/policy/constants/PhabricatorPolicies.php', 'PhabricatorPolicy' => 'applications/policy/storage/PhabricatorPolicy.php', + 'PhabricatorPolicyApplication' => 'applications/policy/application/PhabricatorPolicyApplication.php', 'PhabricatorPolicyAwareQuery' => 'infrastructure/query/policy/PhabricatorPolicyAwareQuery.php', 'PhabricatorPolicyAwareTestQuery' => 'applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php', 'PhabricatorPolicyCapability' => 'applications/policy/capability/PhabricatorPolicyCapability.php', @@ -1973,7 +1956,9 @@ phutil_register_library_map(array( 'PhabricatorPolicyTestCase' => 'applications/policy/__tests__/PhabricatorPolicyTestCase.php', 'PhabricatorPolicyTestObject' => 'applications/policy/__tests__/PhabricatorPolicyTestObject.php', 'PhabricatorPolicyType' => 'applications/policy/constants/PhabricatorPolicyType.php', + 'PhabricatorPonderApplication' => 'applications/ponder/application/PhabricatorPonderApplication.php', 'PhabricatorProject' => 'applications/project/storage/PhabricatorProject.php', + 'PhabricatorProjectApplication' => 'applications/project/application/PhabricatorProjectApplication.php', 'PhabricatorProjectArchiveController' => 'applications/project/controller/PhabricatorProjectArchiveController.php', 'PhabricatorProjectBoardController' => 'applications/project/controller/PhabricatorProjectBoardController.php', 'PhabricatorProjectBoardDeleteController' => 'applications/project/controller/PhabricatorProjectBoardDeleteController.php', @@ -2034,6 +2019,8 @@ phutil_register_library_map(array( 'PhabricatorRedirectController' => 'applications/base/controller/PhabricatorRedirectController.php', 'PhabricatorRefreshCSRFController' => 'applications/auth/controller/PhabricatorRefreshCSRFController.php', 'PhabricatorRegistrationProfile' => 'applications/people/storage/PhabricatorRegistrationProfile.php', + 'PhabricatorReleephApplication' => 'applications/releeph/application/PhabricatorReleephApplication.php', + 'PhabricatorReleephApplicationConfigOptions' => 'applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php', 'PhabricatorRemarkupBlockInterpreterCowsay' => 'infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterCowsay.php', 'PhabricatorRemarkupBlockInterpreterFiglet' => 'infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterFiglet.php', 'PhabricatorRemarkupBlockInterpreterGraphviz' => 'infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterGraphviz.php', @@ -2048,6 +2035,7 @@ phutil_register_library_map(array( 'PhabricatorRemarkupRuleMention' => 'applications/people/remarkup/PhabricatorRemarkupRuleMention.php', 'PhabricatorRemarkupRuleObject' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php', 'PhabricatorRemarkupRuleYoutube' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php', + 'PhabricatorRepositoriesApplication' => 'applications/repository/application/PhabricatorRepositoriesApplication.php', 'PhabricatorRepository' => 'applications/repository/storage/PhabricatorRepository.php', 'PhabricatorRepositoryArcanistProject' => 'applications/repository/storage/PhabricatorRepositoryArcanistProject.php', 'PhabricatorRepositoryArcanistProjectDeleteController' => 'applications/repository/controller/PhabricatorRepositoryArcanistProjectDeleteController.php', @@ -2150,6 +2138,7 @@ phutil_register_library_map(array( 'PhabricatorSavedQueryQuery' => 'applications/search/query/PhabricatorSavedQueryQuery.php', 'PhabricatorScopedEnv' => 'infrastructure/env/PhabricatorScopedEnv.php', 'PhabricatorSearchAbstractDocument' => 'applications/search/index/PhabricatorSearchAbstractDocument.php', + 'PhabricatorSearchApplication' => 'applications/search/application/PhabricatorSearchApplication.php', 'PhabricatorSearchApplicationSearchEngine' => 'applications/search/query/PhabricatorSearchApplicationSearchEngine.php', 'PhabricatorSearchAttachController' => 'applications/search/controller/PhabricatorSearchAttachController.php', 'PhabricatorSearchBaseController' => 'applications/search/controller/PhabricatorSearchBaseController.php', @@ -2183,6 +2172,7 @@ phutil_register_library_map(array( 'PhabricatorSendGridConfigOptions' => 'applications/config/option/PhabricatorSendGridConfigOptions.php', 'PhabricatorSettingsAddEmailAction' => 'applications/settings/action/PhabricatorSettingsAddEmailAction.php', 'PhabricatorSettingsAdjustController' => 'applications/settings/controller/PhabricatorSettingsAdjustController.php', + 'PhabricatorSettingsApplication' => 'applications/settings/application/PhabricatorSettingsApplication.php', 'PhabricatorSettingsMainController' => 'applications/settings/controller/PhabricatorSettingsMainController.php', 'PhabricatorSettingsPanel' => 'applications/settings/panel/PhabricatorSettingsPanel.php', 'PhabricatorSettingsPanelAccount' => 'applications/settings/panel/PhabricatorSettingsPanelAccount.php', @@ -2226,6 +2216,7 @@ phutil_register_library_map(array( 'PhabricatorSetupIssue' => 'applications/config/issue/PhabricatorSetupIssue.php', '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', @@ -2276,11 +2267,13 @@ phutil_register_library_map(array( 'PhabricatorStoragePatch' => 'infrastructure/storage/management/PhabricatorStoragePatch.php', 'PhabricatorSubscribableInterface' => 'applications/subscriptions/interface/PhabricatorSubscribableInterface.php', 'PhabricatorSubscribersQuery' => 'applications/subscriptions/query/PhabricatorSubscribersQuery.php', + 'PhabricatorSubscriptionsApplication' => 'applications/subscriptions/application/PhabricatorSubscriptionsApplication.php', 'PhabricatorSubscriptionsEditController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php', 'PhabricatorSubscriptionsEditor' => 'applications/subscriptions/editor/PhabricatorSubscriptionsEditor.php', 'PhabricatorSubscriptionsListController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsListController.php', 'PhabricatorSubscriptionsTransactionController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsTransactionController.php', 'PhabricatorSubscriptionsUIEventListener' => 'applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php', + 'PhabricatorSupportApplication' => 'applications/support/application/PhabricatorSupportApplication.php', 'PhabricatorSymbolNameLinter' => 'infrastructure/lint/hook/PhabricatorSymbolNameLinter.php', 'PhabricatorSyntaxHighlighter' => 'infrastructure/markup/PhabricatorSyntaxHighlighter.php', 'PhabricatorSyntaxHighlightingConfigOptions' => 'applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php', @@ -2289,6 +2282,7 @@ phutil_register_library_map(array( 'PhabricatorSystemActionGarbageCollector' => 'applications/system/garbagecollector/PhabricatorSystemActionGarbageCollector.php', 'PhabricatorSystemActionLog' => 'applications/system/storage/PhabricatorSystemActionLog.php', 'PhabricatorSystemActionRateLimitException' => 'applications/system/exception/PhabricatorSystemActionRateLimitException.php', + 'PhabricatorSystemApplication' => 'applications/system/application/PhabricatorSystemApplication.php', 'PhabricatorSystemDAO' => 'applications/system/storage/PhabricatorSystemDAO.php', 'PhabricatorSystemDestructionGarbageCollector' => 'applications/system/garbagecollector/PhabricatorSystemDestructionGarbageCollector.php', 'PhabricatorSystemDestructionLog' => 'applications/system/storage/PhabricatorSystemDestructionLog.php', @@ -2298,6 +2292,7 @@ phutil_register_library_map(array( 'PhabricatorSystemSelectEncodingController' => 'applications/system/controller/PhabricatorSystemSelectEncodingController.php', 'PhabricatorSystemSelectHighlightController' => 'applications/system/controller/PhabricatorSystemSelectHighlightController.php', 'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php', + 'PhabricatorTestApplication' => 'applications/base/controller/__tests__/PhabricatorTestApplication.php', 'PhabricatorTestCase' => 'infrastructure/testing/PhabricatorTestCase.php', 'PhabricatorTestController' => 'applications/base/controller/__tests__/PhabricatorTestController.php', 'PhabricatorTestDataGenerator' => 'applications/lipsum/generator/PhabricatorTestDataGenerator.php', @@ -2323,8 +2318,10 @@ phutil_register_library_map(array( 'PhabricatorTokenReceiverInterface' => 'applications/tokens/interface/PhabricatorTokenReceiverInterface.php', 'PhabricatorTokenReceiverQuery' => 'applications/tokens/query/PhabricatorTokenReceiverQuery.php', 'PhabricatorTokenUIEventListener' => 'applications/tokens/event/PhabricatorTokenUIEventListener.php', + 'PhabricatorTokensApplication' => 'applications/tokens/application/PhabricatorTokensApplication.php', 'PhabricatorTransactionView' => 'view/layout/PhabricatorTransactionView.php', 'PhabricatorTransactions' => 'applications/transactions/constants/PhabricatorTransactions.php', + 'PhabricatorTransactionsApplication' => 'applications/transactions/application/PhabricatorTransactionsApplication.php', 'PhabricatorTransformedFile' => 'applications/files/storage/PhabricatorTransformedFile.php', 'PhabricatorTranslation' => 'infrastructure/internationalization/translation/PhabricatorTranslation.php', 'PhabricatorTranslationsConfigOptions' => 'applications/config/option/PhabricatorTranslationsConfigOptions.php', @@ -2332,6 +2329,7 @@ phutil_register_library_map(array( 'PhabricatorTwitchAuthProvider' => 'applications/auth/provider/PhabricatorTwitchAuthProvider.php', 'PhabricatorTwitterAuthProvider' => 'applications/auth/provider/PhabricatorTwitterAuthProvider.php', 'PhabricatorTwoColumnExample' => 'applications/uiexample/examples/PhabricatorTwoColumnExample.php', + 'PhabricatorTypeaheadApplication' => 'applications/typeahead/application/PhabricatorTypeaheadApplication.php', 'PhabricatorTypeaheadCompositeDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadCompositeDatasource.php', 'PhabricatorTypeaheadDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php', 'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/PhabricatorTypeaheadDatasourceController.php', @@ -2344,6 +2342,7 @@ phutil_register_library_map(array( 'PhabricatorUIConfigOptions' => 'applications/config/option/PhabricatorUIConfigOptions.php', 'PhabricatorUIExample' => 'applications/uiexample/examples/PhabricatorUIExample.php', 'PhabricatorUIExampleRenderController' => 'applications/uiexample/controller/PhabricatorUIExampleRenderController.php', + 'PhabricatorUIExamplesApplication' => 'applications/uiexample/application/PhabricatorUIExamplesApplication.php', 'PhabricatorUIListFilterExample' => 'applications/uiexample/examples/PhabricatorUIListFilterExample.php', 'PhabricatorUINotificationExample' => 'applications/uiexample/examples/PhabricatorUINotificationExample.php', 'PhabricatorUIPagerExample' => 'applications/uiexample/examples/PhabricatorUIPagerExample.php', @@ -2404,6 +2403,7 @@ phutil_register_library_map(array( 'PhabricatorXHPASTViewRunController' => 'applications/phpast/controller/PhabricatorXHPASTViewRunController.php', 'PhabricatorXHPASTViewStreamController' => 'applications/phpast/controller/PhabricatorXHPASTViewStreamController.php', 'PhabricatorXHPASTViewTreeController' => 'applications/phpast/controller/PhabricatorXHPASTViewTreeController.php', + 'PhabricatorXHProfApplication' => 'applications/xhprof/application/PhabricatorXHProfApplication.php', 'PhabricatorXHProfController' => 'applications/xhprof/controller/PhabricatorXHProfController.php', 'PhabricatorXHProfDAO' => 'applications/xhprof/storage/PhabricatorXHProfDAO.php', 'PhabricatorXHProfProfileController' => 'applications/xhprof/controller/PhabricatorXHProfProfileController.php', @@ -3918,73 +3918,15 @@ phutil_register_library_map(array( 'PhabricatorAphrontViewTestCase' => 'PhabricatorTestCase', 'PhabricatorAppSearchEngine' => 'PhabricatorApplicationSearchEngine', 'PhabricatorApplication' => 'PhabricatorPolicyInterface', - 'PhabricatorApplicationApplications' => 'PhabricatorApplication', - 'PhabricatorApplicationAudit' => 'PhabricatorApplication', - 'PhabricatorApplicationAuth' => 'PhabricatorApplication', - 'PhabricatorApplicationCalendar' => 'PhabricatorApplication', - 'PhabricatorApplicationChatLog' => 'PhabricatorApplication', - 'PhabricatorApplicationConduit' => 'PhabricatorApplication', - 'PhabricatorApplicationConfig' => 'PhabricatorApplication', 'PhabricatorApplicationConfigOptions' => 'Phobject', - 'PhabricatorApplicationConpherence' => 'PhabricatorApplication', - 'PhabricatorApplicationCountdown' => 'PhabricatorApplication', - 'PhabricatorApplicationDaemons' => 'PhabricatorApplication', - 'PhabricatorApplicationDashboard' => 'PhabricatorApplication', 'PhabricatorApplicationDatasource' => 'PhabricatorTypeaheadDatasource', 'PhabricatorApplicationDetailViewController' => 'PhabricatorApplicationsController', - 'PhabricatorApplicationDifferential' => 'PhabricatorApplication', - 'PhabricatorApplicationDiffusion' => 'PhabricatorApplication', - 'PhabricatorApplicationDiviner' => 'PhabricatorApplication', - 'PhabricatorApplicationDoorkeeper' => 'PhabricatorApplication', - 'PhabricatorApplicationDrydock' => 'PhabricatorApplication', 'PhabricatorApplicationEditController' => 'PhabricatorApplicationsController', - 'PhabricatorApplicationFact' => 'PhabricatorApplication', - 'PhabricatorApplicationFeed' => 'PhabricatorApplication', - 'PhabricatorApplicationFiles' => 'PhabricatorApplication', - 'PhabricatorApplicationFlags' => 'PhabricatorApplication', - 'PhabricatorApplicationHarbormaster' => 'PhabricatorApplication', - 'PhabricatorApplicationHelp' => 'PhabricatorApplication', - 'PhabricatorApplicationHerald' => 'PhabricatorApplication', - 'PhabricatorApplicationHome' => 'PhabricatorApplication', 'PhabricatorApplicationLaunchView' => 'AphrontTagView', - 'PhabricatorApplicationLegalpad' => 'PhabricatorApplication', - 'PhabricatorApplicationMacro' => 'PhabricatorApplication', - 'PhabricatorApplicationMailingLists' => 'PhabricatorApplication', - 'PhabricatorApplicationManiphest' => 'PhabricatorApplication', - 'PhabricatorApplicationMetaMTA' => 'PhabricatorApplication', - 'PhabricatorApplicationNotifications' => 'PhabricatorApplication', - 'PhabricatorApplicationNuance' => 'PhabricatorApplication', - 'PhabricatorApplicationOAuthServer' => 'PhabricatorApplication', - 'PhabricatorApplicationOwners' => 'PhabricatorApplication', 'PhabricatorApplicationPHIDTypeApplication' => 'PhabricatorPHIDType', - 'PhabricatorApplicationPHPAST' => 'PhabricatorApplication', - 'PhabricatorApplicationPassphrase' => 'PhabricatorApplication', - 'PhabricatorApplicationPaste' => 'PhabricatorApplication', - 'PhabricatorApplicationPeople' => 'PhabricatorApplication', - 'PhabricatorApplicationPhame' => 'PhabricatorApplication', - 'PhabricatorApplicationPhlux' => 'PhabricatorApplication', - 'PhabricatorApplicationPholio' => 'PhabricatorApplication', - 'PhabricatorApplicationPhortune' => 'PhabricatorApplication', - 'PhabricatorApplicationPhragment' => 'PhabricatorApplication', - 'PhabricatorApplicationPhrequent' => 'PhabricatorApplication', - 'PhabricatorApplicationPhriction' => 'PhabricatorApplication', - 'PhabricatorApplicationPolicy' => 'PhabricatorApplication', - 'PhabricatorApplicationPonder' => 'PhabricatorApplication', - 'PhabricatorApplicationProject' => 'PhabricatorApplication', 'PhabricatorApplicationQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', - 'PhabricatorApplicationReleeph' => 'PhabricatorApplication', - 'PhabricatorApplicationReleephConfigOptions' => 'PhabricatorApplicationConfigOptions', - 'PhabricatorApplicationRepositories' => 'PhabricatorApplication', - 'PhabricatorApplicationSearch' => 'PhabricatorApplication', 'PhabricatorApplicationSearchController' => 'PhabricatorSearchBaseController', - 'PhabricatorApplicationSettings' => 'PhabricatorApplication', - 'PhabricatorApplicationSlowvote' => 'PhabricatorApplication', 'PhabricatorApplicationStatusView' => 'AphrontView', - 'PhabricatorApplicationSubscriptions' => 'PhabricatorApplication', - 'PhabricatorApplicationSupport' => 'PhabricatorApplication', - 'PhabricatorApplicationSystem' => 'PhabricatorApplication', - 'PhabricatorApplicationTest' => 'PhabricatorApplication', - 'PhabricatorApplicationTokens' => 'PhabricatorApplication', 'PhabricatorApplicationTransaction' => array( 'PhabricatorLiskDAO', 'PhabricatorPolicyInterface', @@ -4018,16 +3960,14 @@ phutil_register_library_map(array( 'PhabricatorApplicationTransactionValidationException' => 'Exception', 'PhabricatorApplicationTransactionValueController' => 'PhabricatorApplicationTransactionController', 'PhabricatorApplicationTransactionView' => 'AphrontView', - 'PhabricatorApplicationTransactions' => 'PhabricatorApplication', - 'PhabricatorApplicationTypeahead' => 'PhabricatorApplication', - 'PhabricatorApplicationUIExamples' => 'PhabricatorApplication', 'PhabricatorApplicationUninstallController' => 'PhabricatorApplicationsController', - 'PhabricatorApplicationXHProf' => 'PhabricatorApplication', + 'PhabricatorApplicationsApplication' => 'PhabricatorApplication', 'PhabricatorApplicationsController' => 'PhabricatorController', 'PhabricatorApplicationsListController' => 'PhabricatorApplicationsController', 'PhabricatorAsanaAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorAsanaConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorAuditAddCommentController' => 'PhabricatorAuditController', + 'PhabricatorAuditApplication' => 'PhabricatorApplication', 'PhabricatorAuditComment' => array( 'PhabricatorAuditDAO', 'PhabricatorMarkupInterface', @@ -4047,6 +3987,7 @@ phutil_register_library_map(array( 'PhabricatorAuditPreviewController' => 'PhabricatorAuditController', 'PhabricatorAuditReplyHandler' => 'PhabricatorMailReplyHandler', 'PhabricatorAuthAccountView' => 'AphrontView', + 'PhabricatorAuthApplication' => 'PhabricatorApplication', 'PhabricatorAuthConfirmLinkController' => 'PhabricatorAuthController', 'PhabricatorAuthController' => 'PhabricatorController', 'PhabricatorAuthDAO' => 'PhabricatorLiskDAO', @@ -4129,6 +4070,7 @@ phutil_register_library_map(array( 'PhabricatorCacheManagementWorkflow' => 'PhabricatorManagementWorkflow', 'PhabricatorCacheMarkupGarbageCollector' => 'PhabricatorGarbageCollector', 'PhabricatorCacheTTLGarbageCollector' => 'PhabricatorGarbageCollector', + 'PhabricatorCalendarApplication' => 'PhabricatorApplication', 'PhabricatorCalendarBrowseController' => 'PhabricatorCalendarController', 'PhabricatorCalendarController' => 'PhabricatorController', 'PhabricatorCalendarDAO' => 'PhabricatorLiskDAO', @@ -4150,6 +4092,7 @@ phutil_register_library_map(array( 'PhabricatorCampfireProtocolAdapter' => 'PhabricatorBotBaseStreamingProtocolAdapter', 'PhabricatorChangeParserTestCase' => 'PhabricatorWorkingCopyTestCase', 'PhabricatorChangesetResponse' => 'AphrontProxyResponse', + 'PhabricatorChatLogApplication' => 'PhabricatorApplication', 'PhabricatorChatLogChannel' => array( 'PhabricatorChatLogDAO', 'PhabricatorPolicyInterface', @@ -4171,6 +4114,7 @@ phutil_register_library_map(array( 'PhabricatorCommitTagsField' => 'PhabricatorCommitCustomField', 'PhabricatorCommonPasswords' => 'Phobject', 'PhabricatorConduitAPIController' => 'PhabricatorConduitController', + 'PhabricatorConduitApplication' => 'PhabricatorApplication', 'PhabricatorConduitCertificateToken' => 'PhabricatorConduitDAO', 'PhabricatorConduitConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO', @@ -4188,6 +4132,7 @@ phutil_register_library_map(array( 'PhabricatorConduitSearchEngine' => 'PhabricatorApplicationSearchEngine', 'PhabricatorConduitTokenController' => 'PhabricatorConduitController', 'PhabricatorConfigAllController' => 'PhabricatorConfigController', + 'PhabricatorConfigApplication' => 'PhabricatorApplication', 'PhabricatorConfigController' => 'PhabricatorController', 'PhabricatorConfigDatabaseSource' => 'PhabricatorConfigProxySource', 'PhabricatorConfigDefaultSource' => 'PhabricatorConfigProxySource', @@ -4225,6 +4170,7 @@ phutil_register_library_map(array( 'PhabricatorConfigTransactionQuery' => 'PhabricatorApplicationTransactionQuery', 'PhabricatorConfigValidationException' => 'Exception', 'PhabricatorConfigWelcomeController' => 'PhabricatorConfigController', + 'PhabricatorConpherenceApplication' => 'PhabricatorApplication', 'PhabricatorConpherencePHIDTypeThread' => 'PhabricatorPHIDType', 'PhabricatorContentSourceView' => 'AphrontView', 'PhabricatorController' => 'AphrontController', @@ -4234,6 +4180,7 @@ phutil_register_library_map(array( 'PhabricatorCountdownDAO', 'PhabricatorPolicyInterface', ), + 'PhabricatorCountdownApplication' => 'PhabricatorApplication', 'PhabricatorCountdownCapabilityDefaultView' => 'PhabricatorPolicyCapability', 'PhabricatorCountdownController' => 'PhabricatorController', 'PhabricatorCountdownDAO' => 'PhabricatorLiskDAO', @@ -4289,11 +4236,13 @@ phutil_register_library_map(array( 'PhabricatorDaemonManagementStopWorkflow' => 'PhabricatorDaemonManagementWorkflow', 'PhabricatorDaemonManagementWorkflow' => 'PhabricatorManagementWorkflow', 'PhabricatorDaemonTaskGarbageCollector' => 'PhabricatorGarbageCollector', + 'PhabricatorDaemonsApplication' => 'PhabricatorApplication', 'PhabricatorDashboard' => array( 'PhabricatorDashboardDAO', 'PhabricatorPolicyInterface', ), 'PhabricatorDashboardAddPanelController' => 'PhabricatorDashboardController', + 'PhabricatorDashboardApplication' => 'PhabricatorApplication', 'PhabricatorDashboardController' => 'PhabricatorController', 'PhabricatorDashboardCopyController' => 'PhabricatorDashboardController', 'PhabricatorDashboardDAO' => 'PhabricatorLiskDAO', @@ -4350,14 +4299,19 @@ phutil_register_library_map(array( 'PhabricatorDefaultSearchEngineSelector' => 'PhabricatorSearchEngineSelector', 'PhabricatorDestructionEngine' => 'Phobject', 'PhabricatorDeveloperConfigOptions' => 'PhabricatorApplicationConfigOptions', + 'PhabricatorDifferentialApplication' => 'PhabricatorApplication', 'PhabricatorDifferentialConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorDifferentialRevisionTestDataGenerator' => 'PhabricatorTestDataGenerator', + 'PhabricatorDiffusionApplication' => 'PhabricatorApplication', 'PhabricatorDiffusionConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorDisabledUserController' => 'PhabricatorAuthController', 'PhabricatorDisqusAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorDisqusConfigOptions' => 'PhabricatorApplicationConfigOptions', + 'PhabricatorDivinerApplication' => 'PhabricatorApplication', + 'PhabricatorDoorkeeperApplication' => 'PhabricatorApplication', 'PhabricatorDraft' => 'PhabricatorDraftDAO', 'PhabricatorDraftDAO' => 'PhabricatorLiskDAO', + 'PhabricatorDrydockApplication' => 'PhabricatorApplication', 'PhabricatorEdgeConfig' => 'PhabricatorEdgeConstants', 'PhabricatorEdgeCycleException' => 'Exception', 'PhabricatorEdgeEditor' => 'Phobject', @@ -4384,6 +4338,7 @@ phutil_register_library_map(array( 'PhabricatorExternalAccountQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'PhabricatorFacebookAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorFactAggregate' => 'PhabricatorFactDAO', + 'PhabricatorFactApplication' => 'PhabricatorApplication', 'PhabricatorFactChartController' => 'PhabricatorFactController', 'PhabricatorFactController' => 'PhabricatorController', 'PhabricatorFactCountEngine' => 'PhabricatorFactEngine', @@ -4401,6 +4356,7 @@ phutil_register_library_map(array( 'PhabricatorFactRaw' => 'PhabricatorFactDAO', 'PhabricatorFactSimpleSpec' => 'PhabricatorFactSpec', 'PhabricatorFactUpdateIterator' => 'PhutilBufferedIterator', + 'PhabricatorFeedApplication' => 'PhabricatorApplication', 'PhabricatorFeedConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorFeedController' => 'PhabricatorController', 'PhabricatorFeedDAO' => 'PhabricatorLiskDAO', @@ -4466,6 +4422,7 @@ phutil_register_library_map(array( 'PhabricatorFileUploadController' => 'PhabricatorFileController', 'PhabricatorFileUploadDialogController' => 'PhabricatorFileController', 'PhabricatorFileUploadException' => 'Exception', + 'PhabricatorFilesApplication' => 'PhabricatorApplication', 'PhabricatorFilesConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorFilesManagementEnginesWorkflow' => 'PhabricatorFilesManagementWorkflow', 'PhabricatorFilesManagementMigrateWorkflow' => 'PhabricatorFilesManagementWorkflow', @@ -4486,6 +4443,7 @@ phutil_register_library_map(array( 'PhabricatorFlagSearchEngine' => 'PhabricatorApplicationSearchEngine', 'PhabricatorFlagSelectControl' => 'AphrontFormControl', 'PhabricatorFlaggableInterface' => 'PhabricatorPHIDInterface', + 'PhabricatorFlagsApplication' => 'PhabricatorApplication', 'PhabricatorFlagsUIEventListener' => 'PhabricatorEventListener', 'PhabricatorFormExample' => 'PhabricatorUIExample', 'PhabricatorGarbageCollector' => 'Phobject', @@ -4498,11 +4456,15 @@ phutil_register_library_map(array( 'PhabricatorGlobalUploadTargetView' => 'AphrontView', 'PhabricatorGoogleAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorHandleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'PhabricatorHarbormasterApplication' => 'PhabricatorApplication', 'PhabricatorHarbormasterConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorHashTestCase' => 'PhabricatorTestCase', + 'PhabricatorHelpApplication' => 'PhabricatorApplication', 'PhabricatorHelpController' => 'PhabricatorController', 'PhabricatorHelpEditorProtocolController' => 'PhabricatorHelpController', 'PhabricatorHelpKeyboardShortcutController' => 'PhabricatorHelpController', + 'PhabricatorHeraldApplication' => 'PhabricatorApplication', + 'PhabricatorHomeApplication' => 'PhabricatorApplication', 'PhabricatorHomeController' => 'PhabricatorController', 'PhabricatorHomeMainController' => 'PhabricatorHomeController', 'PhabricatorHomeQuickCreateController' => 'PhabricatorHomeController', @@ -4524,6 +4486,7 @@ phutil_register_library_map(array( 'PhabricatorKeyValueDatabaseCache' => 'PhutilKeyValueCache', 'PhabricatorLDAPAuthProvider' => 'PhabricatorAuthProvider', 'PhabricatorLegacyEdgeType' => 'PhabricatorEdgeType', + 'PhabricatorLegalpadApplication' => 'PhabricatorApplication', 'PhabricatorLegalpadConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorLegalpadPHIDTypeDocument' => 'PhabricatorPHIDType', 'PhabricatorLipsumGenerateWorkflow' => 'PhabricatorLipsumManagementWorkflow', @@ -4533,6 +4496,7 @@ phutil_register_library_map(array( 'PhabricatorLocalDiskFileStorageEngine' => 'PhabricatorFileStorageEngine', 'PhabricatorLocalTimeTestCase' => 'PhabricatorTestCase', 'PhabricatorLogoutController' => 'PhabricatorAuthController', + 'PhabricatorMacroApplication' => 'PhabricatorApplication', 'PhabricatorMacroAudioController' => 'PhabricatorMacroController', 'PhabricatorMacroCapabilityManage' => 'PhabricatorPolicyCapability', 'PhabricatorMacroCommentController' => 'PhabricatorMacroController', @@ -4574,6 +4538,7 @@ phutil_register_library_map(array( 'PhabricatorMailingListPHIDTypeList' => 'PhabricatorPHIDType', 'PhabricatorMailingListQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'PhabricatorMailingListSearchEngine' => 'PhabricatorApplicationSearchEngine', + 'PhabricatorMailingListsApplication' => 'PhabricatorApplication', 'PhabricatorMailingListsController' => 'PhabricatorController', 'PhabricatorMailingListsEditController' => 'PhabricatorMailingListsController', 'PhabricatorMailingListsListController' => 'PhabricatorMailingListsController', @@ -4582,6 +4547,7 @@ phutil_register_library_map(array( 'PhabricatorMainMenuSearchView' => 'AphrontView', 'PhabricatorMainMenuView' => 'AphrontView', 'PhabricatorManagementWorkflow' => 'PhutilArgumentWorkflow', + 'PhabricatorManiphestApplication' => 'PhabricatorApplication', 'PhabricatorManiphestConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorManiphestTaskTestDataGenerator' => 'PhabricatorTestDataGenerator', 'PhabricatorMarkupCache' => 'PhabricatorCacheDAO', @@ -4589,6 +4555,7 @@ phutil_register_library_map(array( 'PhabricatorMarkupPreviewController' => 'PhabricatorController', 'PhabricatorMercurialGraphStream' => 'PhabricatorRepositoryGraphStream', 'PhabricatorMetaMTAActorQuery' => 'PhabricatorQuery', + 'PhabricatorMetaMTAApplication' => 'PhabricatorApplication', 'PhabricatorMetaMTAConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorMetaMTAController' => 'PhabricatorController', 'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO', @@ -4631,6 +4598,8 @@ phutil_register_library_map(array( 'PhabricatorNotificationStatusController' => 'PhabricatorNotificationController', 'PhabricatorNotificationStatusView' => 'AphrontTagView', 'PhabricatorNotificationTestController' => 'PhabricatorNotificationController', + 'PhabricatorNotificationsApplication' => 'PhabricatorApplication', + 'PhabricatorNuanceApplication' => 'PhabricatorApplication', 'PhabricatorOAuth1AuthProvider' => 'PhabricatorOAuthAuthProvider', 'PhabricatorOAuth2AuthProvider' => 'PhabricatorOAuthAuthProvider', 'PhabricatorOAuthAuthProvider' => 'PhabricatorAuthProvider', @@ -4646,6 +4615,7 @@ phutil_register_library_map(array( 'PhabricatorOAuthClientViewController' => 'PhabricatorOAuthClientController', 'PhabricatorOAuthResponse' => 'AphrontResponse', 'PhabricatorOAuthServerAccessToken' => 'PhabricatorOAuthServerDAO', + 'PhabricatorOAuthServerApplication' => 'PhabricatorApplication', 'PhabricatorOAuthServerAuthController' => 'PhabricatorAuthController', 'PhabricatorOAuthServerAuthorizationCode' => 'PhabricatorOAuthServerDAO', 'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'PhabricatorSettingsPanel', @@ -4670,6 +4640,7 @@ phutil_register_library_map(array( 'PhabricatorObjectMailReceiverTestCase' => 'PhabricatorTestCase', 'PhabricatorObjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'PhabricatorOffsetPagedQuery' => 'PhabricatorQuery', + 'PhabricatorOwnersApplication' => 'PhabricatorApplication', 'PhabricatorOwnersConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorOwnersController' => 'PhabricatorController', 'PhabricatorOwnersDAO' => 'PhabricatorLiskDAO', @@ -4688,8 +4659,10 @@ phutil_register_library_map(array( 'PhabricatorOwnersPackageTestCase' => 'PhabricatorTestCase', 'PhabricatorOwnersPath' => 'PhabricatorOwnersDAO', 'PhabricatorPHDConfigOptions' => 'PhabricatorApplicationConfigOptions', + 'PhabricatorPHPASTApplication' => 'PhabricatorApplication', 'PhabricatorPHPMailerConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorPagedFormExample' => 'PhabricatorUIExample', + 'PhabricatorPassphraseApplication' => 'PhabricatorApplication', 'PhabricatorPasswordAuthProvider' => 'PhabricatorAuthProvider', 'PhabricatorPasswordHasher' => 'Phobject', 'PhabricatorPasswordHasherTestCase' => 'PhabricatorTestCase', @@ -4702,6 +4675,7 @@ phutil_register_library_map(array( 'PhabricatorPolicyInterface', 'PhabricatorProjectInterface', ), + 'PhabricatorPasteApplication' => 'PhabricatorApplication', 'PhabricatorPasteCommentController' => 'PhabricatorPasteController', 'PhabricatorPasteConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorPasteController' => 'PhabricatorController', @@ -4718,6 +4692,7 @@ phutil_register_library_map(array( 'PhabricatorPasteTransactionComment' => 'PhabricatorApplicationTransactionComment', 'PhabricatorPasteTransactionQuery' => 'PhabricatorApplicationTransactionQuery', 'PhabricatorPasteViewController' => 'PhabricatorPasteController', + 'PhabricatorPeopleApplication' => 'PhabricatorApplication', 'PhabricatorPeopleApproveController' => 'PhabricatorPeopleController', 'PhabricatorPeopleCalendarController' => 'PhabricatorPeopleController', 'PhabricatorPeopleController' => 'PhabricatorController', @@ -4744,19 +4719,27 @@ phutil_register_library_map(array( 'PhabricatorPeopleTestDataGenerator' => 'PhabricatorTestDataGenerator', 'PhabricatorPeopleWelcomeController' => 'PhabricatorPeopleController', 'PhabricatorPersonaAuthProvider' => 'PhabricatorAuthProvider', + 'PhabricatorPhameApplication' => 'PhabricatorApplication', 'PhabricatorPhameConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorPhamePHIDTypeBlog' => 'PhabricatorPHIDType', 'PhabricatorPhamePHIDTypePost' => 'PhabricatorPHIDType', + 'PhabricatorPhluxApplication' => 'PhabricatorApplication', + 'PhabricatorPholioApplication' => 'PhabricatorApplication', 'PhabricatorPholioConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorPholioMockTestDataGenerator' => 'PhabricatorTestDataGenerator', + 'PhabricatorPhortuneApplication' => 'PhabricatorApplication', 'PhabricatorPhortuneConfigOptions' => 'PhabricatorApplicationConfigOptions', + 'PhabricatorPhragmentApplication' => 'PhabricatorApplication', + 'PhabricatorPhrequentApplication' => 'PhabricatorApplication', 'PhabricatorPhrequentConfigOptions' => 'PhabricatorApplicationConfigOptions', + 'PhabricatorPhrictionApplication' => 'PhabricatorApplication', 'PhabricatorPhrictionConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorPolicies' => 'PhabricatorPolicyConstants', 'PhabricatorPolicy' => array( 'PhabricatorPolicyDAO', 'PhabricatorPolicyInterface', ), + 'PhabricatorPolicyApplication' => 'PhabricatorApplication', 'PhabricatorPolicyAwareQuery' => 'PhabricatorOffsetPagedQuery', 'PhabricatorPolicyAwareTestQuery' => 'PhabricatorPolicyAwareQuery', 'PhabricatorPolicyCapability' => 'Phobject', @@ -4784,6 +4767,7 @@ phutil_register_library_map(array( 'PhabricatorPolicyTestCase' => 'PhabricatorTestCase', 'PhabricatorPolicyTestObject' => 'PhabricatorPolicyInterface', 'PhabricatorPolicyType' => 'PhabricatorPolicyConstants', + 'PhabricatorPonderApplication' => 'PhabricatorApplication', 'PhabricatorProject' => array( 'PhabricatorProjectDAO', 'PhabricatorFlaggableInterface', @@ -4792,6 +4776,7 @@ phutil_register_library_map(array( 'PhabricatorCustomFieldInterface', 'PhabricatorDestructibleInterface', ), + 'PhabricatorProjectApplication' => 'PhabricatorApplication', 'PhabricatorProjectArchiveController' => 'PhabricatorProjectController', 'PhabricatorProjectBoardController' => 'PhabricatorProjectController', 'PhabricatorProjectBoardDeleteController' => 'PhabricatorProjectBoardController', @@ -4858,6 +4843,8 @@ phutil_register_library_map(array( 'PhabricatorRedirectController' => 'PhabricatorController', 'PhabricatorRefreshCSRFController' => 'PhabricatorAuthController', 'PhabricatorRegistrationProfile' => 'Phobject', + 'PhabricatorReleephApplication' => 'PhabricatorApplication', + 'PhabricatorReleephApplicationConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorRemarkupBlockInterpreterCowsay' => 'PhutilRemarkupBlockInterpreter', 'PhabricatorRemarkupBlockInterpreterFiglet' => 'PhutilRemarkupBlockInterpreter', 'PhabricatorRemarkupBlockInterpreterGraphviz' => 'PhutilRemarkupBlockInterpreter', @@ -4872,6 +4859,7 @@ phutil_register_library_map(array( 'PhabricatorRemarkupRuleMention' => 'PhutilRemarkupRule', 'PhabricatorRemarkupRuleObject' => 'PhutilRemarkupRule', 'PhabricatorRemarkupRuleYoutube' => 'PhutilRemarkupRule', + 'PhabricatorRepositoriesApplication' => 'PhabricatorApplication', 'PhabricatorRepository' => array( 'PhabricatorRepositoryDAO', 'PhabricatorPolicyInterface', @@ -5002,6 +4990,7 @@ phutil_register_library_map(array( 'PhabricatorPolicyInterface', ), 'PhabricatorSavedQueryQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', + 'PhabricatorSearchApplication' => 'PhabricatorApplication', 'PhabricatorSearchApplicationSearchEngine' => 'PhabricatorApplicationSearchEngine', 'PhabricatorSearchAttachController' => 'PhabricatorSearchBaseController', 'PhabricatorSearchBaseController' => 'PhabricatorController', @@ -5029,6 +5018,7 @@ phutil_register_library_map(array( 'PhabricatorSendGridConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorSettingsAddEmailAction' => 'PhabricatorSystemAction', 'PhabricatorSettingsAdjustController' => 'PhabricatorController', + 'PhabricatorSettingsApplication' => 'PhabricatorApplication', 'PhabricatorSettingsMainController' => 'PhabricatorController', 'PhabricatorSettingsPanelAccount' => 'PhabricatorSettingsPanel', 'PhabricatorSettingsPanelActivity' => 'PhabricatorSettingsPanel', @@ -5069,6 +5059,7 @@ phutil_register_library_map(array( 'PhabricatorSetupCheckTimezone' => 'PhabricatorSetupCheck', 'PhabricatorSetupIssueExample' => 'PhabricatorUIExample', 'PhabricatorSetupIssueView' => 'AphrontView', + 'PhabricatorSlowvoteApplication' => 'PhabricatorApplication', 'PhabricatorSlowvoteCapabilityDefaultView' => 'PhabricatorPolicyCapability', 'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO', 'PhabricatorSlowvoteCloseController' => 'PhabricatorSlowvoteController', @@ -5120,17 +5111,20 @@ phutil_register_library_map(array( 'PhabricatorStorageManagementUpgradeWorkflow' => 'PhabricatorStorageManagementWorkflow', 'PhabricatorStorageManagementWorkflow' => 'PhabricatorManagementWorkflow', 'PhabricatorSubscribersQuery' => 'PhabricatorQuery', + 'PhabricatorSubscriptionsApplication' => 'PhabricatorApplication', 'PhabricatorSubscriptionsEditController' => 'PhabricatorController', 'PhabricatorSubscriptionsEditor' => 'PhabricatorEditor', 'PhabricatorSubscriptionsListController' => 'PhabricatorController', 'PhabricatorSubscriptionsTransactionController' => 'PhabricatorController', 'PhabricatorSubscriptionsUIEventListener' => 'PhabricatorEventListener', + 'PhabricatorSupportApplication' => 'PhabricatorApplication', 'PhabricatorSymbolNameLinter' => 'ArcanistXHPASTLintNamingHook', 'PhabricatorSyntaxHighlightingConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorSystemActionEngine' => 'Phobject', 'PhabricatorSystemActionGarbageCollector' => 'PhabricatorGarbageCollector', 'PhabricatorSystemActionLog' => 'PhabricatorSystemDAO', 'PhabricatorSystemActionRateLimitException' => 'Exception', + 'PhabricatorSystemApplication' => 'PhabricatorApplication', 'PhabricatorSystemDAO' => 'PhabricatorLiskDAO', 'PhabricatorSystemDestructionGarbageCollector' => 'PhabricatorGarbageCollector', 'PhabricatorSystemDestructionLog' => 'PhabricatorSystemDAO', @@ -5140,6 +5134,7 @@ phutil_register_library_map(array( 'PhabricatorSystemSelectEncodingController' => 'PhabricatorController', 'PhabricatorSystemSelectHighlightController' => 'PhabricatorController', 'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon', + 'PhabricatorTestApplication' => 'PhabricatorApplication', 'PhabricatorTestCase' => 'ArcanistPhutilTestCase', 'PhabricatorTestController' => 'PhabricatorController', 'PhabricatorTestStorageEngine' => 'PhabricatorFileStorageEngine', @@ -5167,13 +5162,16 @@ phutil_register_library_map(array( 'PhabricatorTokenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'PhabricatorTokenReceiverQuery' => 'PhabricatorCursorPagedPolicyAwareQuery', 'PhabricatorTokenUIEventListener' => 'PhabricatorEventListener', + 'PhabricatorTokensApplication' => 'PhabricatorApplication', 'PhabricatorTransactionView' => 'AphrontView', + 'PhabricatorTransactionsApplication' => 'PhabricatorApplication', 'PhabricatorTransformedFile' => 'PhabricatorFileDAO', 'PhabricatorTranslationsConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorTrivialTestCase' => 'PhabricatorTestCase', 'PhabricatorTwitchAuthProvider' => 'PhabricatorOAuth2AuthProvider', 'PhabricatorTwitterAuthProvider' => 'PhabricatorOAuth1AuthProvider', 'PhabricatorTwoColumnExample' => 'PhabricatorUIExample', + 'PhabricatorTypeaheadApplication' => 'PhabricatorApplication', 'PhabricatorTypeaheadCompositeDatasource' => 'PhabricatorTypeaheadDatasource', 'PhabricatorTypeaheadDatasource' => 'Phobject', 'PhabricatorTypeaheadDatasourceController' => 'PhabricatorController', @@ -5184,6 +5182,7 @@ phutil_register_library_map(array( 'PhabricatorTypeaheadRuntimeCompositeDatasource' => 'PhabricatorTypeaheadCompositeDatasource', 'PhabricatorUIConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorUIExampleRenderController' => 'PhabricatorController', + 'PhabricatorUIExamplesApplication' => 'PhabricatorApplication', 'PhabricatorUIListFilterExample' => 'PhabricatorUIExample', 'PhabricatorUINotificationExample' => 'PhabricatorUIExample', 'PhabricatorUIPagerExample' => 'PhabricatorUIExample', @@ -5255,6 +5254,7 @@ phutil_register_library_map(array( 'PhabricatorXHPASTViewRunController' => 'PhabricatorXHPASTViewController', 'PhabricatorXHPASTViewStreamController' => 'PhabricatorXHPASTViewPanelController', 'PhabricatorXHPASTViewTreeController' => 'PhabricatorXHPASTViewPanelController', + 'PhabricatorXHProfApplication' => 'PhabricatorApplication', 'PhabricatorXHProfController' => 'PhabricatorController', 'PhabricatorXHProfDAO' => 'PhabricatorLiskDAO', 'PhabricatorXHProfProfileController' => 'PhabricatorXHProfController', diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php index 895db41e5c..95b124c5e8 100644 --- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php @@ -8,9 +8,7 @@ class AphrontDefaultApplicationConfiguration extends AphrontApplicationConfiguration { - public function __construct() { - - } + public function __construct() {} public function getApplicationName() { return 'aphront-default'; @@ -172,7 +170,6 @@ class AphrontDefaultApplicationConfiguration } if ($ex instanceof PhabricatorPolicyException) { - if (!$user->isLoggedIn()) { // If the user isn't logged in, just give them a login form. This is // probably a generally more useful response than a policy dialog that @@ -182,7 +179,7 @@ class AphrontDefaultApplicationConfiguration // the thing you are trying to look at". $login_controller = new PhabricatorAuthStartController($request); - $auth_app_class = 'PhabricatorApplicationAuth'; + $auth_app_class = 'PhabricatorAuthApplication'; $auth_app = PhabricatorApplication::getByClass($auth_app_class); $login_controller->setCurrentApplication($auth_app); @@ -247,7 +244,6 @@ class AphrontDefaultApplicationConfiguration return $response; } - // Always log the unhandled exception. phlog($ex); diff --git a/src/applications/audit/application/PhabricatorApplicationAudit.php b/src/applications/audit/application/PhabricatorAuditApplication.php similarity index 95% rename from src/applications/audit/application/PhabricatorApplicationAudit.php rename to src/applications/audit/application/PhabricatorAuditApplication.php index e09d8a6db5..b3f8db1f83 100644 --- a/src/applications/audit/application/PhabricatorApplicationAudit.php +++ b/src/applications/audit/application/PhabricatorAuditApplication.php @@ -1,6 +1,6 @@ 'PhabricatorAuthNewController', 'new/(?P[^/]+)/' => 'PhabricatorAuthEditController', 'edit/(?P\d+)/' => 'PhabricatorAuthEditController', - '(?Penable|disable)/(?P\d+)/' => - 'PhabricatorAuthDisableController', + '(?Penable|disable)/(?P\d+)/' + => 'PhabricatorAuthDisableController', ), - 'login/(?P[^/]+)/(?:(?P[^/]+)/)?' => - 'PhabricatorAuthLoginController', + 'login/(?P[^/]+)/(?:(?P[^/]+)/)?' + => 'PhabricatorAuthLoginController', 'register/(?:(?P[^/]+)/)?' => 'PhabricatorAuthRegisterController', 'start/' => 'PhabricatorAuthStartController', 'validate/' => 'PhabricatorAuthValidateController', @@ -120,8 +120,8 @@ final class PhabricatorApplicationAuth extends PhabricatorApplication { 'mustverify/' => 'PhabricatorMustVerifyEmailController', ), - '/emailverify/(?P[^/]+)/' => - 'PhabricatorEmailVerificationController', + '/emailverify/(?P[^/]+)/' + => 'PhabricatorEmailVerificationController', '/logout/' => 'PhabricatorLogoutController', ); diff --git a/src/applications/auth/provider/PhabricatorAuthProvider.php b/src/applications/auth/provider/PhabricatorAuthProvider.php index 380ac89a8e..0c7948ed1b 100644 --- a/src/applications/auth/provider/PhabricatorAuthProvider.php +++ b/src/applications/auth/provider/PhabricatorAuthProvider.php @@ -93,8 +93,7 @@ abstract class PhabricatorAuthProvider { throw new Exception( pht( "Two authentication providers use the same provider key ". - "('%s'). Each provider must be identified by a unique ". - "key.", + "('%s'). Each provider must be identified by a unique key.", $key)); } $providers[$key] = $object; @@ -147,24 +146,22 @@ abstract class PhabricatorAuthProvider { } /** - * Should we allow the adapter to be marked as "trusted" - * This is true for all adapters except those that allow the user to type in - * emails (@see PhabricatorPasswordAuthProvider) + * Should we allow the adapter to be marked as "trusted". This is true for + * all adapters except those that allow the user to type in emails (see + * @{class:PhabricatorPasswordAuthProvider}). */ public function shouldAllowEmailTrustConfiguration() { return true; } - public function buildLoginForm( - PhabricatorAuthStartController $controller) { + public function buildLoginForm(PhabricatorAuthStartController $controller) { return $this->renderLoginForm($controller->getRequest(), $mode = 'start'); } abstract public function processLoginRequest( PhabricatorAuthLoginController $controller); - public function buildLinkForm( - PhabricatorAuthLinkController $controller) { + public function buildLinkForm(PhabricatorAuthLinkController $controller) { return $this->renderLoginForm($controller->getRequest(), $mode = 'link'); } @@ -177,9 +174,7 @@ abstract class PhabricatorAuthProvider { return $this->renderLoginForm($controller->getRequest(), $mode = 'refresh'); } - protected function renderLoginForm( - AphrontRequest $request, - $mode) { + protected function renderLoginForm(AphrontRequest $request, $mode) { throw new PhutilMethodNotImplementedException(); } @@ -197,8 +192,7 @@ abstract class PhabricatorAuthProvider { protected function loadOrCreateAccount($account_id) { if (!strlen($account_id)) { - throw new Exception( - 'loadOrCreateAccount(...): empty account ID!'); + throw new Exception('loadOrCreateAccount(...): empty account ID!'); } $adapter = $this->getAdapter(); @@ -265,14 +259,14 @@ abstract class PhabricatorAuthProvider { $this->willSaveAccount($account); $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites(); - $account->save(); + $account->save(); unset($unguarded); return $account; } public function getLoginURI() { - $app = PhabricatorApplication::getByClass('PhabricatorApplicationAuth'); + $app = PhabricatorApplication::getByClass('PhabricatorAuthApplication'); return $app->getApplicationURI('/login/'.$this->getProviderKey().'/'); } @@ -281,7 +275,7 @@ abstract class PhabricatorAuthProvider { } public function getStartURI() { - $app = PhabricatorApplication::getByClass('PhabricatorApplicationAuth'); + $app = PhabricatorApplication::getByClass('PhabricatorAuthApplication'); $uri = $app->getApplicationURI('/start/'); return $uri; } @@ -339,6 +333,7 @@ abstract class PhabricatorAuthProvider { AphrontFormView $form, array $values, array $issues) { + return; } @@ -360,7 +355,6 @@ abstract class PhabricatorAuthProvider { $account_view)); } - /** * Return true to use a two-step configuration (setup, configure) instead of * the default single-step configuration. In practice, this means that @@ -373,7 +367,6 @@ abstract class PhabricatorAuthProvider { return false; } - /** * Render a standard login/register button element. * diff --git a/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php b/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php index 46b1c51211..028108c2cc 100644 --- a/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php +++ b/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php @@ -97,7 +97,7 @@ final class PhabricatorAuthProviderConfigQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationAuth'; + return 'PhabricatorAuthApplication'; } } diff --git a/src/applications/auth/query/PhabricatorAuthSessionQuery.php b/src/applications/auth/query/PhabricatorAuthSessionQuery.php index e451e1a3a3..966bb946c4 100644 --- a/src/applications/auth/query/PhabricatorAuthSessionQuery.php +++ b/src/applications/auth/query/PhabricatorAuthSessionQuery.php @@ -106,7 +106,7 @@ final class PhabricatorAuthSessionQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationAuth'; + return 'PhabricatorAuthApplication'; } } diff --git a/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php b/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php index 2e8407103a..aecd92a4a7 100644 --- a/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php +++ b/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php @@ -100,7 +100,7 @@ final class PhabricatorAuthTemporaryTokenQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationAuth'; + return 'PhabricatorAuthApplication'; } } diff --git a/src/applications/auth/query/PhabricatorExternalAccountQuery.php b/src/applications/auth/query/PhabricatorExternalAccountQuery.php index 36f63f78a5..3d1bff2888 100644 --- a/src/applications/auth/query/PhabricatorExternalAccountQuery.php +++ b/src/applications/auth/query/PhabricatorExternalAccountQuery.php @@ -1,9 +1,9 @@ delegateToController($checker_controller); } - $auth_class = 'PhabricatorApplicationAuth'; + $auth_class = 'PhabricatorAuthApplication'; $auth_application = PhabricatorApplication::getByClass($auth_class); // Require partial sessions to finish login before doing anything. @@ -231,7 +231,6 @@ abstract class PhabricatorController extends AphrontController { if ($this->shouldRequireAdmin() && !$user->getIsAdmin()) { return new Aphront403Response(); } - } public function buildStandardPageView() { @@ -319,7 +318,6 @@ abstract class PhabricatorController extends AphrontController { $seen = array(); while ($response instanceof AphrontProxyResponse) { - $hash = spl_object_hash($response); if (isset($seen[$hash])) { $seen[] = get_class($response); @@ -403,7 +401,6 @@ abstract class PhabricatorController extends AphrontController { ->execute(); } - /** * Render a list of links to handles, identified by PHIDs. The handles must * already be loaded. @@ -433,7 +430,6 @@ abstract class PhabricatorController extends AphrontController { } protected function buildApplicationCrumbs() { - $crumbs = array(); $application = $this->getCurrentApplication(); @@ -516,7 +512,6 @@ abstract class PhabricatorController extends AphrontController { return 'phabricator'; } - /** * Create a new @{class:AphrontDialogView} with defaults filled in. * diff --git a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php index dc6b0713dd..94249f502d 100644 --- a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php +++ b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php @@ -1,7 +1,6 @@ overrideEnvConfig('policy.allow-public', false); - $app = PhabricatorApplication::getByClass('PhabricatorApplicationTest'); + $app = PhabricatorApplication::getByClass('PhabricatorTestApplication'); $app->reset(); $app->setPolicy( PhabricatorPolicyCapability::CAN_VIEW, diff --git a/src/applications/base/controller/__tests__/PhabricatorApplicationTest.php b/src/applications/base/controller/__tests__/PhabricatorTestApplication.php similarity index 86% rename from src/applications/base/controller/__tests__/PhabricatorApplicationTest.php rename to src/applications/base/controller/__tests__/PhabricatorTestApplication.php index 7366b68fc1..81a4bafbc5 100644 --- a/src/applications/base/controller/__tests__/PhabricatorApplicationTest.php +++ b/src/applications/base/controller/__tests__/PhabricatorTestApplication.php @@ -1,6 +1,6 @@ 'PhabricatorCalendarViewController', 'all/' => 'PhabricatorCalendarBrowseController', 'event/' => array( - '(?:query/(?P[^/]+)/)?' => - 'PhabricatorCalendarEventListController', - 'create/' => - 'PhabricatorCalendarEventEditController', - 'edit/(?P[1-9]\d*)/' => - 'PhabricatorCalendarEventEditController', - 'delete/(?P[1-9]\d*)/' => - 'PhabricatorCalendarEventDeleteController', - 'view/(?P[1-9]\d*)/' => - 'PhabricatorCalendarEventViewController', + '(?:query/(?P[^/]+)/)?' + => 'PhabricatorCalendarEventListController', + 'create/' + => 'PhabricatorCalendarEventEditController', + 'edit/(?P[1-9]\d*)/' + => 'PhabricatorCalendarEventEditController', + 'delete/(?P[1-9]\d*)/' + => 'PhabricatorCalendarEventDeleteController', + 'view/(?P[1-9]\d*)/' + => 'PhabricatorCalendarEventViewController', ), ), ); diff --git a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php index 76d99b941b..f6feea5041 100644 --- a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php +++ b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php @@ -105,7 +105,7 @@ final class PhabricatorCalendarEventQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationCalendar'; + return 'PhabricatorCalendarApplication'; } } diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php index ccb340653e..258d95c77c 100644 --- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php +++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorCalendarEventSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationCalendar'; + return 'PhabricatorCalendarApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -137,7 +137,6 @@ final class PhabricatorCalendarEventSearchEngine 1, pht('Show only upcoming events.'), $upcoming)); - } protected function getURI($path) { @@ -147,14 +146,13 @@ final class PhabricatorCalendarEventSearchEngine public function getBuiltinQueryNames() { $names = array( 'upcoming' => pht('Upcoming Events'), - 'all' => pht('All Events'), + 'all' => pht('All Events'), ); return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php b/src/applications/chatlog/application/PhabricatorChatLogApplication.php similarity index 69% rename from src/applications/chatlog/applications/PhabricatorApplicationChatLog.php rename to src/applications/chatlog/application/PhabricatorChatLogApplication.php index 9ef90f6d33..f0c2f332bd 100644 --- a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php +++ b/src/applications/chatlog/application/PhabricatorChatLogApplication.php @@ -1,6 +1,6 @@ array( - '' => 'PhabricatorChatLogChannelListController', - 'channel/(?P[^/]+)/' => - 'PhabricatorChatLogChannelLogController', + '' => 'PhabricatorChatLogChannelListController', + 'channel/(?P[^/]+)/' + => 'PhabricatorChatLogChannelLogController', ), - ); } diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php b/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php index cc5b61659a..7e8fba8ea9 100644 --- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php +++ b/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php @@ -3,7 +3,7 @@ abstract class ConduitAPI_chatlog_Method extends ConduitAPIMethod { public function getApplication() { - return PhabricatorApplication::getByClass('PhabricatorApplicationChatLog'); + return PhabricatorApplication::getByClass('PhabricatorChatLogApplication'); } } diff --git a/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php b/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php index 093bb0283d..4dcc4a16a9 100644 --- a/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php +++ b/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php @@ -57,7 +57,7 @@ final class PhabricatorChatLogChannelQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationChatLog'; + return 'PhabricatorChatLogApplication'; } } diff --git a/src/applications/chatlog/query/PhabricatorChatLogQuery.php b/src/applications/chatlog/query/PhabricatorChatLogQuery.php index 8cb4185a21..a077c0c69e 100644 --- a/src/applications/chatlog/query/PhabricatorChatLogQuery.php +++ b/src/applications/chatlog/query/PhabricatorChatLogQuery.php @@ -78,7 +78,7 @@ final class PhabricatorChatLogQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationChatLog'; + return 'PhabricatorChatLogApplication'; } } diff --git a/src/applications/conduit/application/PhabricatorApplicationConduit.php b/src/applications/conduit/application/PhabricatorConduitApplication.php similarity index 94% rename from src/applications/conduit/application/PhabricatorApplicationConduit.php rename to src/applications/conduit/application/PhabricatorConduitApplication.php index c73230ceee..53b591530a 100644 --- a/src/applications/conduit/application/PhabricatorApplicationConduit.php +++ b/src/applications/conduit/application/PhabricatorConduitApplication.php @@ -1,6 +1,6 @@ establishConnection('r'); @@ -41,7 +40,7 @@ final class PhabricatorConduitLogQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationConduit'; + return 'PhabricatorConduitApplication'; } } diff --git a/src/applications/conduit/query/PhabricatorConduitMethodQuery.php b/src/applications/conduit/query/PhabricatorConduitMethodQuery.php index 40c55a90c9..d427344f1e 100644 --- a/src/applications/conduit/query/PhabricatorConduitMethodQuery.php +++ b/src/applications/conduit/query/PhabricatorConduitMethodQuery.php @@ -42,9 +42,7 @@ final class PhabricatorConduitMethodQuery public function loadPage() { $methods = $this->getAllMethods(); - $methods = $this->filterMethods($methods); - return $methods; } @@ -71,9 +69,9 @@ final class PhabricatorConduitMethodQuery } $status = array( - ConduitAPIMethod::METHOD_STATUS_STABLE => $this->isStable, + ConduitAPIMethod::METHOD_STATUS_STABLE => $this->isStable, ConduitAPIMethod::METHOD_STATUS_DEPRECATED => $this->isDeprecated, - ConduitAPIMethod::METHOD_STATUS_UNSTABLE => $this->isUnstable, + ConduitAPIMethod::METHOD_STATUS_UNSTABLE => $this->isUnstable, ); // Only apply status filters if any of them are set. @@ -122,7 +120,7 @@ final class PhabricatorConduitMethodQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationConduit'; + return 'PhabricatorConduitApplication'; } } diff --git a/src/applications/conduit/query/PhabricatorConduitSearchEngine.php b/src/applications/conduit/query/PhabricatorConduitSearchEngine.php index 6a62e1e56f..7699294b84 100644 --- a/src/applications/conduit/query/PhabricatorConduitSearchEngine.php +++ b/src/applications/conduit/query/PhabricatorConduitSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorConduitSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationConduit'; + return 'PhabricatorConduitApplication'; } public function getPageSize(PhabricatorSavedQuery $saved) { @@ -106,8 +106,6 @@ final class PhabricatorConduitSearchEngine 'Show old methods which will be deleted in a future '. 'version of Phabricator.')), $is_deprecated)); - - } protected function getURI($path) { @@ -115,16 +113,13 @@ final class PhabricatorConduitSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'modern' => pht('Modern Methods'), 'all' => pht('All Methods'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/config/application/PhabricatorApplicationConfig.php b/src/applications/config/application/PhabricatorConfigApplication.php similarity index 73% rename from src/applications/config/application/PhabricatorApplicationConfig.php rename to src/applications/config/application/PhabricatorConfigApplication.php index cd2b3c80e9..4985c32926 100644 --- a/src/applications/config/application/PhabricatorApplicationConfig.php +++ b/src/applications/config/application/PhabricatorConfigApplication.php @@ -1,6 +1,6 @@ array( - '' => 'PhabricatorConfigListController', - 'all/' => 'PhabricatorConfigAllController', - 'edit/(?P[\w\.\-]+)/' => 'PhabricatorConfigEditController', - 'group/(?P[^/]+)/' => 'PhabricatorConfigGroupController', + '' => 'PhabricatorConfigListController', + 'all/' => 'PhabricatorConfigAllController', + 'edit/(?P[\w\.\-]+)/' => 'PhabricatorConfigEditController', + 'group/(?P[^/]+)/' => 'PhabricatorConfigGroupController', 'welcome/' => 'PhabricatorConfigWelcomeController', '(?Pignore|unignore)/(?P[^/]+)/' => 'PhabricatorConfigIgnoreController', diff --git a/src/applications/config/controller/PhabricatorConfigWelcomeController.php b/src/applications/config/controller/PhabricatorConfigWelcomeController.php index 191acceb3f..352d4d50b4 100644 --- a/src/applications/config/controller/PhabricatorConfigWelcomeController.php +++ b/src/applications/config/controller/PhabricatorConfigWelcomeController.php @@ -157,8 +157,8 @@ final class PhabricatorConfigWelcomeController $dashboard_href = PhabricatorEnv::getURI('/dashboard/'); $have_dashboard = (bool)PhabricatorDashboardInstall::getDashboard( $viewer, - PhabricatorApplicationHome::DASHBOARD_DEFAULT, - 'PhabricatorApplicationHome'); + PhabricatorHomeApplication::DASHBOARD_DEFAULT, + 'PhabricatorHomeApplication'); if ($have_dashboard) { $content = pht( "You've installed a default dashboard to replace this welcome screen ". diff --git a/src/applications/config/query/PhabricatorConfigEntryQuery.php b/src/applications/config/query/PhabricatorConfigEntryQuery.php index b23174bcd3..9d140b047f 100644 --- a/src/applications/config/query/PhabricatorConfigEntryQuery.php +++ b/src/applications/config/query/PhabricatorConfigEntryQuery.php @@ -54,7 +54,7 @@ final class PhabricatorConfigEntryQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationConfig'; + return 'PhabricatorConfigApplication'; } } diff --git a/src/applications/conpherence/application/PhabricatorApplicationConpherence.php b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php similarity index 95% rename from src/applications/conpherence/application/PhabricatorApplicationConpherence.php rename to src/applications/conpherence/application/PhabricatorConpherenceApplication.php index 671066f011..76c283a6eb 100644 --- a/src/applications/conpherence/application/PhabricatorApplicationConpherence.php +++ b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php @@ -1,6 +1,6 @@ array( '(?:query/(?P[^/]+)/)?' => 'PhabricatorCountdownListController', - '(?P[1-9]\d*)/' - => 'PhabricatorCountdownViewController', - 'edit/(?:(?P[1-9]\d*)/)?' - => 'PhabricatorCountdownEditController', - 'delete/(?P[1-9]\d*)/' - => 'PhabricatorCountdownDeleteController' + '(?P[1-9]\d*)/' => 'PhabricatorCountdownViewController', + 'edit/(?:(?P[1-9]\d*)/)?' => 'PhabricatorCountdownEditController', + 'delete/(?P[1-9]\d*)/' => 'PhabricatorCountdownDeleteController' ), ); } diff --git a/src/applications/countdown/query/PhabricatorCountdownQuery.php b/src/applications/countdown/query/PhabricatorCountdownQuery.php index ed05648d02..5d04dfde6a 100644 --- a/src/applications/countdown/query/PhabricatorCountdownQuery.php +++ b/src/applications/countdown/query/PhabricatorCountdownQuery.php @@ -82,7 +82,7 @@ final class PhabricatorCountdownQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationCountdown'; + return 'PhabricatorCountdownApplication'; } } diff --git a/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php b/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php index b6e255134c..2a99a429c1 100644 --- a/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php +++ b/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorCountdownSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationCountdown'; + return 'PhabricatorCountdownApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -62,7 +62,6 @@ final class PhabricatorCountdownSearchEngine 1, pht('Show only countdowns that are still counting down.'), $upcoming)); - } protected function getURI($path) { @@ -83,7 +82,6 @@ final class PhabricatorCountdownSearchEngine } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); @@ -101,10 +99,10 @@ final class PhabricatorCountdownSearchEngine return parent::buildSavedQueryFromBuiltin($query_key); } - protected function getRequiredHandlePHIDsForResultList( array $countdowns, PhabricatorSavedQuery $query) { + return mpull($countdowns, 'getAuthorPHID'); } @@ -112,6 +110,7 @@ final class PhabricatorCountdownSearchEngine array $countdowns, PhabricatorSavedQuery $query, array $handles) { + assert_instances_of($countdowns, 'PhabricatorCountdown'); $viewer = $this->requireViewer(); @@ -147,4 +146,5 @@ final class PhabricatorCountdownSearchEngine return $list; } + } diff --git a/src/applications/countdown/storage/PhabricatorCountdown.php b/src/applications/countdown/storage/PhabricatorCountdown.php index b69a9d50c9..870a40b010 100644 --- a/src/applications/countdown/storage/PhabricatorCountdown.php +++ b/src/applications/countdown/storage/PhabricatorCountdown.php @@ -12,7 +12,7 @@ final class PhabricatorCountdown public static function initializeNewCountdown(PhabricatorUser $actor) { $app = id(new PhabricatorApplicationQuery()) ->setViewer($actor) - ->withClasses(array('PhabricatorApplicationCountdown')) + ->withClasses(array('PhabricatorCountdownApplication')) ->executeOne(); $view_policy = $app->getPolicy( diff --git a/src/applications/daemon/application/PhabricatorApplicationDaemons.php b/src/applications/daemon/application/PhabricatorDaemonsApplication.php similarity index 95% rename from src/applications/daemon/application/PhabricatorApplicationDaemons.php rename to src/applications/daemon/application/PhabricatorDaemonsApplication.php index 4ceec3a4cb..e51bba8f4a 100644 --- a/src/applications/daemon/application/PhabricatorApplicationDaemons.php +++ b/src/applications/daemon/application/PhabricatorDaemonsApplication.php @@ -1,6 +1,6 @@ 'PhabricatorDashboardPanelEditController', 'edit/(?:(?P\d+)/)?' => 'PhabricatorDashboardPanelEditController', 'render/(?P\d+)/' => 'PhabricatorDashboardPanelRenderController', - 'archive/(?P\d+)/' => - 'PhabricatorDashboardPanelArchiveController', + 'archive/(?P\d+)/' + => 'PhabricatorDashboardPanelArchiveController', ), ), ); diff --git a/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php b/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php index 47e492a305..e9632d8949 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php @@ -24,7 +24,7 @@ final class PhabricatorDashboardInstallController $object_phid = $request->getStr('objectPHID', $viewer->getPHID()); switch ($object_phid) { - case PhabricatorApplicationHome::DASHBOARD_DEFAULT: + case PhabricatorHomeApplication::DASHBOARD_DEFAULT: if (!$viewer->getIsAdmin()) { return new Aphront404Response(); } @@ -48,7 +48,7 @@ final class PhabricatorDashboardInstallController $installer_phid = $viewer->getPHID(); $application_class = $request->getStr( 'applicationClass', - 'PhabricatorApplicationHome'); + 'PhabricatorHomeApplication'); $handles = $this->loadHandles(array( $object_phid, @@ -80,7 +80,7 @@ final class PhabricatorDashboardInstallController ->addSubmitButton(pht('Install Dashboard')); switch ($application_class) { - case 'PhabricatorApplicationHome': + case 'PhabricatorHomeApplication': if ($viewer->getPHID() == $object_phid) { if ($viewer->getIsAdmin()) { $dialog->setWidth(AphrontDialogView::WIDTH_FORM); @@ -92,9 +92,9 @@ final class PhabricatorDashboardInstallController ->appendChild( id(new AphrontFormRadioButtonControl()) ->setName('objectPHID') - ->setValue(PhabricatorApplicationHome::DASHBOARD_DEFAULT) + ->setValue(PhabricatorHomeApplication::DASHBOARD_DEFAULT) ->addButton( - PhabricatorApplicationHome::DASHBOARD_DEFAULT, + PhabricatorHomeApplication::DASHBOARD_DEFAULT, pht('Default Dashboard for All Users'), pht( 'Install this dashboard as the global default dashboard '. @@ -133,11 +133,10 @@ final class PhabricatorDashboardInstallController return $dialog; } - private function getCancelURI($application_class, $object_phid) { $uri = null; switch ($application_class) { - case 'PhabricatorApplicationHome': + case 'PhabricatorHomeApplication': $uri = '/dashboard/view/'.$this->id.'/'; break; } @@ -147,7 +146,7 @@ final class PhabricatorDashboardInstallController private function getRedirectURI($application_class, $object_phid) { $uri = null; switch ($application_class) { - case 'PhabricatorApplicationHome': + case 'PhabricatorHomeApplication': $uri = '/'; break; } diff --git a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php index 5cceb9c46c..f4c08f5555 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php @@ -125,7 +125,7 @@ final class PhabricatorDashboardManageController ->loadOneWhere( 'objectPHID = %s AND applicationClass = %s', $viewer->getPHID(), - 'PhabricatorApplicationHome'); + 'PhabricatorHomeApplication'); if ($installed_dashboard && $installed_dashboard->getDashboardPHID() == $dashboard->getPHID()) { $title_install = pht('Uninstall Dashboard'); @@ -174,4 +174,5 @@ final class PhabricatorDashboardManageController return $properties; } + } diff --git a/src/applications/dashboard/controller/PhabricatorDashboardUninstallController.php b/src/applications/dashboard/controller/PhabricatorDashboardUninstallController.php index 2b36fbee92..ff97c00d5e 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardUninstallController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardUninstallController.php @@ -38,7 +38,7 @@ final class PhabricatorDashboardUninstallController $application_class = $request->getStr( 'applicationClass', - 'PhabricatorApplicationHome'); + 'PhabricatorHomeApplication'); $dashboard_install = id(new PhabricatorDashboardInstall()) ->loadOneWhere( @@ -85,7 +85,7 @@ final class PhabricatorDashboardUninstallController $body = array(); switch ($application_class) { - case 'PhabricatorApplicationHome': + case 'PhabricatorHomeApplication': if ($installer_phid == $object_phid) { $body[] = phutil_tag( 'p', @@ -116,7 +116,7 @@ final class PhabricatorDashboardUninstallController private function getCancelURI($application_class, $object_phid) { $uri = null; switch ($application_class) { - case 'PhabricatorApplicationHome': + case 'PhabricatorHomeApplication': $uri = '/dashboard/view/'.$this->id.'/'; break; } @@ -126,7 +126,7 @@ final class PhabricatorDashboardUninstallController private function getRedirectURI($application_class, $object_phid) { $uri = null; switch ($application_class) { - case 'PhabricatorApplicationHome': + case 'PhabricatorHomeApplication': $uri = '/'; break; } diff --git a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php index 7ba1a43ea4..242e4d22bc 100644 --- a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php +++ b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php @@ -67,7 +67,7 @@ final class PhabricatorDashboardPanelQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationDashboard'; + return 'PhabricatorDashboardApplication'; } } diff --git a/src/applications/dashboard/query/PhabricatorDashboardPanelSearchEngine.php b/src/applications/dashboard/query/PhabricatorDashboardPanelSearchEngine.php index c36425729c..89c78d0b0a 100644 --- a/src/applications/dashboard/query/PhabricatorDashboardPanelSearchEngine.php +++ b/src/applications/dashboard/query/PhabricatorDashboardPanelSearchEngine.php @@ -8,14 +8,12 @@ final class PhabricatorDashboardPanelSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationDashboard'; + return 'PhabricatorDashboardApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { $saved = new PhabricatorSavedQuery(); - $saved->setParameter('status', $request->getStr('status')); - return $saved; } @@ -62,16 +60,13 @@ final class PhabricatorDashboardPanelSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'active' => pht('Active Panels'), - 'all' => pht('All Panels'), + 'all' => pht('All Panels'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/dashboard/query/PhabricatorDashboardQuery.php b/src/applications/dashboard/query/PhabricatorDashboardQuery.php index f236fb0066..2c4ab38c92 100644 --- a/src/applications/dashboard/query/PhabricatorDashboardQuery.php +++ b/src/applications/dashboard/query/PhabricatorDashboardQuery.php @@ -96,7 +96,7 @@ final class PhabricatorDashboardQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationDashboard'; + return 'PhabricatorDashboardApplication'; } } diff --git a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php index 0aa6246902..f592c15f37 100644 --- a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php +++ b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php @@ -8,19 +8,15 @@ final class PhabricatorDashboardSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationDashboard'; + return 'PhabricatorDashboardApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { - $saved = new PhabricatorSavedQuery(); - - return $saved; + return new PhabricatorSavedQuery(); } public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) { - $query = id(new PhabricatorDashboardQuery()); - - return $query; + return new PhabricatorDashboardQuery(); } public function buildSearchForm( @@ -34,11 +30,9 @@ final class PhabricatorDashboardSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'all' => pht('All Dashboards'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { @@ -54,7 +48,6 @@ final class PhabricatorDashboardSearchEngine return parent::buildSavedQueryFromBuiltin($query_key); } - protected function renderResultList( array $dashboards, PhabricatorSavedQuery $query, diff --git a/src/applications/differential/application/PhabricatorApplicationDifferential.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php similarity index 96% rename from src/applications/differential/application/PhabricatorApplicationDifferential.php rename to src/applications/differential/application/PhabricatorDifferentialApplication.php index 2e6f07cdad..fef4325f65 100644 --- a/src/applications/differential/application/PhabricatorApplicationDifferential.php +++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php @@ -1,6 +1,6 @@ array( - 'caption' => pht( - 'Default view policy for newly created revisions.') + 'caption' => pht('Default view policy for newly created revisions.'), ), ); } diff --git a/src/applications/differential/conduit/ConduitAPI_differential_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_Method.php index c6f7eb4595..b0812f7109 100644 --- a/src/applications/differential/conduit/ConduitAPI_differential_Method.php +++ b/src/applications/differential/conduit/ConduitAPI_differential_Method.php @@ -4,7 +4,7 @@ abstract class ConduitAPI_differential_Method extends ConduitAPIMethod { public function getApplication() { return PhabricatorApplication::getByClass( - 'PhabricatorApplicationDifferential'); + 'PhabricatorDifferentialApplication'); } protected function buildDiffInfoDictionary(DifferentialDiff $diff) { diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index a4efd83c41..9d789a7040 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -179,7 +179,6 @@ final class DifferentialRevisionViewController extends DifferentialController { } } } - } else { $warning = null; $visible_changesets = $changesets; @@ -519,7 +518,7 @@ final class DifferentialRevisionViewController extends DifferentialController { ->setWorkflow(true) ->setDisabled(!$can_edit); - $maniphest = 'PhabricatorApplicationManiphest'; + $maniphest = 'PhabricatorManiphestApplication'; if (PhabricatorApplication::isClassInstalled($maniphest)) { $actions[] = id(new PhabricatorActionView()) ->setIcon('fa-anchor') @@ -539,7 +538,6 @@ final class DifferentialRevisionViewController extends DifferentialController { } private function getRevisionCommentActions(DifferentialRevision $revision) { - $actions = array( DifferentialAction::ACTION_COMMENT => true, ); @@ -921,7 +919,6 @@ final class DifferentialRevisionViewController extends DifferentialController { unset($unguarded); return id(new AphrontRedirectResponse())->setURI($file->getBestURI()); - } private function buildTransactions( @@ -929,6 +926,7 @@ final class DifferentialRevisionViewController extends DifferentialController { DifferentialDiff $left_diff, DifferentialDiff $right_diff, array $changesets) { + $viewer = $this->getRequest()->getUser(); $xactions = id(new DifferentialTransactionQuery()) diff --git a/src/applications/differential/customfield/DifferentialRequiredSignaturesField.php b/src/applications/differential/customfield/DifferentialRequiredSignaturesField.php index 0daddf40cb..85dcc32d5a 100644 --- a/src/applications/differential/customfield/DifferentialRequiredSignaturesField.php +++ b/src/applications/differential/customfield/DifferentialRequiredSignaturesField.php @@ -28,7 +28,7 @@ final class DifferentialRequiredSignaturesField } public static function loadForRevision($revision) { - $app_legalpad = 'PhabricatorApplicationLegalpad'; + $app_legalpad = 'PhabricatorLegalpadApplication'; if (!PhabricatorApplication::isClassInstalled($app_legalpad)) { return array(); } @@ -142,5 +142,4 @@ final class DifferentialRequiredSignaturesField ); } - } diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php index 10f64f5328..0fb2c53176 100644 --- a/src/applications/differential/editor/DifferentialTransactionEditor.php +++ b/src/applications/differential/editor/DifferentialTransactionEditor.php @@ -167,7 +167,6 @@ final class DifferentialTransactionEditor return parent::transactionHasEffect($object, $xaction); } - protected function applyCustomInternalTransaction( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { @@ -350,7 +349,7 @@ final class DifferentialTransactionEditor // "T123" or similar, automatically associate the commit with the // task that the branch names. - $maniphest = 'PhabricatorApplicationManiphest'; + $maniphest = 'PhabricatorManiphestApplication'; if (PhabricatorApplication::isClassInstalled($maniphest)) { $diff = $this->requireDiff($xaction->getNewValue()); $branch = $diff->getBranch(); @@ -572,8 +571,6 @@ final class DifferentialTransactionEditor return $result; } - - protected function applyFinalEffects( PhabricatorLiskDAO $object, array $xactions) { @@ -693,7 +690,6 @@ final class DifferentialTransactionEditor return $xactions; } - protected function validateTransaction( PhabricatorLiskDAO $object, $type, @@ -1205,8 +1201,7 @@ final class DifferentialTransactionEditor PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { - switch ($xaction->getTransactionType()) { - } + switch ($xaction->getTransactionType()) {} return parent::extractFilePHIDsFromCustomTransaction($object, $xaction); } @@ -1217,7 +1212,6 @@ final class DifferentialTransactionEditor $blocks, PhutilMarkupEngine $engine) { - $flat_blocks = array_mergev($blocks); $huge_block = implode("\n\n", $flat_blocks); @@ -1649,7 +1643,6 @@ final class DifferentialTransactionEditor } } - /** * Update the table connecting revisions to DVCS local hashes, so we can * identify revisions by commit/tree hashes. diff --git a/src/applications/differential/mail/DifferentialRevisionMailReceiver.php b/src/applications/differential/mail/DifferentialRevisionMailReceiver.php index 619e8eb523..5e3e1fbf8c 100644 --- a/src/applications/differential/mail/DifferentialRevisionMailReceiver.php +++ b/src/applications/differential/mail/DifferentialRevisionMailReceiver.php @@ -4,7 +4,7 @@ final class DifferentialRevisionMailReceiver extends PhabricatorObjectMailReceiver { public function isEnabled() { - $app_class = 'PhabricatorApplicationDifferential'; + $app_class = 'PhabricatorDifferentialApplication'; return PhabricatorApplication::isClassInstalled($app_class); } diff --git a/src/applications/differential/parser/DifferentialCommitMessageParser.php b/src/applications/differential/parser/DifferentialCommitMessageParser.php index 9b20e6ecf4..adb5fd2d76 100644 --- a/src/applications/differential/parser/DifferentialCommitMessageParser.php +++ b/src/applications/differential/parser/DifferentialCommitMessageParser.php @@ -1,7 +1,7 @@ changesets, null, 'getID'); foreach ($hunks as $key => $hunk) { $changeset = idx($changesets, $hunk->getChangesetID()); @@ -110,7 +109,7 @@ final class DifferentialHunkQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationDifferential'; + return 'PhabricatorDifferentialApplication'; } protected function getReversePaging() { diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php index dd6854302f..4bc002ca27 100644 --- a/src/applications/differential/query/DifferentialRevisionQuery.php +++ b/src/applications/differential/query/DifferentialRevisionQuery.php @@ -99,7 +99,7 @@ final class DifferentialRevisionQuery } /** - * Filter results to revisions with comments authored bythe given PHIDs + * Filter results to revisions with comments authored by the given PHIDs. * * @param array List of PHIDs of authors * @return this @@ -155,7 +155,7 @@ final class DifferentialRevisionQuery /** * Filter results to revisions with a given status. Provide a class constant, - * such as ##DifferentialRevisionQuery::STATUS_OPEN##. + * such as `DifferentialRevisionQuery::STATUS_OPEN`. * * @param const Class STATUS constant, like STATUS_OPEN. * @return this @@ -241,7 +241,7 @@ final class DifferentialRevisionQuery /** * Set result ordering. Provide a class constant, such as - * ##DifferentialRevisionQuery::ORDER_CREATED##. + * `DifferentialRevisionQuery::ORDER_CREATED`. * * @task config */ @@ -749,7 +749,7 @@ final class DifferentialRevisionQuery $conn_r, 'r.status IN (%Ld)', array( - ArcanistDifferentialRevisionStatus::NEEDS_REVIEW, + ArcanistDifferentialRevisionStatus::NEEDS_REVIEW, )); break; case self::STATUS_NEEDS_REVISION: @@ -757,7 +757,7 @@ final class DifferentialRevisionQuery $conn_r, 'r.status IN (%Ld)', array( - ArcanistDifferentialRevisionStatus::NEEDS_REVISION, + ArcanistDifferentialRevisionStatus::NEEDS_REVISION, )); break; case self::STATUS_ACCEPTED: @@ -1068,7 +1068,6 @@ final class DifferentialRevisionQuery $revision->attachReviewerStatus($reviewers); } - } @@ -1164,7 +1163,7 @@ final class DifferentialRevisionQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationDifferential'; + return 'PhabricatorDifferentialApplication'; } } diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php index f47665fc85..0cd7773d54 100644 --- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php +++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php @@ -8,7 +8,7 @@ final class DifferentialRevisionSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationDifferential'; + return 'PhabricatorDifferentialApplication'; } public function getPageSize(PhabricatorSavedQuery $saved) { @@ -194,7 +194,6 @@ final class DifferentialRevisionSearchEngine ->setName('order') ->setOptions($this->getOrderOptions()) ->setValue($saved->getParameter('order'))); - } protected function getURI($path) { diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php index a7146a8ccb..7544b8e8d4 100644 --- a/src/applications/differential/storage/DifferentialRevision.php +++ b/src/applications/differential/storage/DifferentialRevision.php @@ -53,7 +53,7 @@ final class DifferentialRevision extends DifferentialDAO public static function initializeNewRevision(PhabricatorUser $actor) { $app = id(new PhabricatorApplicationQuery()) ->setViewer($actor) - ->withClasses(array('PhabricatorApplicationDifferential')) + ->withClasses(array('PhabricatorDifferentialApplication')) ->executeOne(); $view_policy = $app->getPolicy( @@ -269,7 +269,6 @@ final class DifferentialRevision extends DifferentialDAO } public function hasAutomaticCapability($capability, PhabricatorUser $user) { - // A revision's author (which effectively means "owner" after we added // commandeering) can always view and edit it. $author_phid = $this->getAuthorPHID(); diff --git a/src/applications/diffusion/application/PhabricatorApplicationDiffusion.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php similarity index 93% rename from src/applications/diffusion/application/PhabricatorApplicationDiffusion.php rename to src/applications/diffusion/application/PhabricatorDiffusionApplication.php index ad6cb18992..f599f16076 100644 --- a/src/applications/diffusion/application/PhabricatorApplicationDiffusion.php +++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php @@ -1,6 +1,6 @@ [A-Z]+)(/|$).*' => 'DiffusionRepositoryDefaultController', 'inline/' => array( - 'edit/(?P[^/]+)/' => 'DiffusionInlineCommentController', - 'preview/(?P[^/]+)/' => - 'DiffusionInlineCommentPreviewController', + 'edit/(?P[^/]+)/' => 'DiffusionInlineCommentController', + 'preview/(?P[^/]+)/' + => 'DiffusionInlineCommentPreviewController', ), 'services/' => array( 'path/' => array( @@ -126,13 +126,11 @@ final class PhabricatorApplicationDiffusion extends PhabricatorApplication { protected function getCustomCapabilities() { return array( - DiffusionCapabilityDefaultView::CAPABILITY => array( - ), + DiffusionCapabilityDefaultView::CAPABILITY => array(), DiffusionCapabilityDefaultEdit::CAPABILITY => array( 'default' => PhabricatorPolicies::POLICY_ADMIN, ), - DiffusionCapabilityDefaultPush::CAPABILITY => array( - ), + DiffusionCapabilityDefaultPush::CAPABILITY => array(), DiffusionCapabilityCreateRepositories::CAPABILITY => array( 'default' => PhabricatorPolicies::POLICY_ADMIN, ), diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php index 3db8cbeaf9..581d041eb5 100644 --- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php +++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php @@ -4,7 +4,7 @@ abstract class ConduitAPI_diffusion_Method extends ConduitAPIMethod { public function getApplication() { return PhabricatorApplication::getByClass( - 'PhabricatorApplicationDiffusion'); + 'PhabricatorDiffusionApplication'); } } diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php index 8f89aaa7cb..e7785ad267 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseController.php @@ -37,11 +37,9 @@ abstract class DiffusionBrowseController extends DiffusionController { break; } - $filter = new AphrontListFilterView(); $filter->appendChild($forms); - if ($collapsed) { $filter->setCollapsed( pht('Show Search'), @@ -112,7 +110,7 @@ abstract class DiffusionBrowseController extends DiffusionController { // TODO: Ideally, this should live in Owners and be event-triggered, but // there's no reasonable object for it to react to right now. - $owners = 'PhabricatorApplicationOwners'; + $owners = 'PhabricatorOwnersApplication'; if (PhabricatorApplication::isClassInstalled($owners)) { $owners_uri = id(new PhutilURI('/owners/view/search/')) ->setQueryParams( @@ -220,7 +218,6 @@ abstract class DiffusionBrowseController extends DiffusionController { return id(new PHUIObjectBoxView()) ->setHeaderText(pht('Pending Differential Revisions')) ->appendChild($view); - } } diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php index 86f3996135..3f0b4179dc 100644 --- a/src/applications/diffusion/controller/DiffusionCommitController.php +++ b/src/applications/diffusion/controller/DiffusionCommitController.php @@ -999,7 +999,7 @@ final class DiffusionCommitController extends DiffusionController { require_celerity_resource('phabricator-object-selector-css'); require_celerity_resource('javelin-behavior-phabricator-object-selector'); - $maniphest = 'PhabricatorApplicationManiphest'; + $maniphest = 'PhabricatorManiphestApplication'; if (PhabricatorApplication::isClassInstalled($maniphest)) { $action = id(new PhabricatorActionView()) ->setName(pht('Edit Maniphest Tasks')) @@ -1176,5 +1176,4 @@ final class DiffusionCommitController extends DiffusionController { return $parser->processCorpus($corpus); } - } diff --git a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php index d78de6be0b..15832a08eb 100644 --- a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php +++ b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php @@ -21,7 +21,7 @@ abstract class HeraldPreCommitAdapter extends HeraldAdapter { } public function getAdapterApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } public function getObject() { @@ -56,8 +56,7 @@ abstract class HeraldPreCommitAdapter extends HeraldAdapter { } public function explainValidTriggerObjects() { - return pht( - 'This rule can trigger for **repositories** or **projects**.'); + return pht('This rule can trigger for **repositories** or **projects**.'); } public function getTriggerObjectPHIDs() { diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php index 0e28479040..7539090c2b 100644 --- a/src/applications/diffusion/query/DiffusionCommitQuery.php +++ b/src/applications/diffusion/query/DiffusionCommitQuery.php @@ -16,6 +16,7 @@ final class DiffusionCommitQuery private $auditorPHIDs; private $auditAwaitingUser; private $auditStatus; + const AUDIT_STATUS_ANY = 'audit-status-any'; const AUDIT_STATUS_OPEN = 'audit-status-open'; const AUDIT_STATUS_CONCERN = 'audit-status-concern'; @@ -88,16 +89,15 @@ final class DiffusionCommitQuery } /** - * Retuns true if we should join the audit table, either because we're - * interested in the information if it's available or because matching - * rows must always have it. + * Returns true if we should join the audit table, either because we're + * interested in the information if it's available or because matching rows + * must always have it. */ private function shouldJoinAudits() { return $this->auditStatus || $this->rowsMustHaveAudits(); } - /** * Return true if we should `JOIN` (vs `LEFT JOIN`) the audit table, because * matching commits will always have audit rows. @@ -194,7 +194,7 @@ final class DiffusionCommitQuery $result[$prefix.$suffix][] = $commit; } } else { - // This awkward contruction is so we can link the commits up in O(N) + // This awkward construction is so we can link the commits up in O(N) // time instead of O(N^2). for ($ii = $min_qualified; $ii <= strlen($suffix); $ii++) { $part = substr($suffix, 0, $ii); @@ -225,7 +225,6 @@ final class DiffusionCommitQuery } protected function didFilterPage(array $commits) { - if ($this->needCommitData) { $data = id(new PhabricatorRepositoryCommitData())->loadAllWhere( 'commitID in (%Ld)', @@ -508,7 +507,7 @@ final class DiffusionCommitQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } } diff --git a/src/applications/diffusion/typeahead/DiffusionArcanistProjectDatasource.php b/src/applications/diffusion/typeahead/DiffusionArcanistProjectDatasource.php index b255cb112c..963c0b2ca9 100644 --- a/src/applications/diffusion/typeahead/DiffusionArcanistProjectDatasource.php +++ b/src/applications/diffusion/typeahead/DiffusionArcanistProjectDatasource.php @@ -8,7 +8,7 @@ final class DiffusionArcanistProjectDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } public function loadResults() { diff --git a/src/applications/diffusion/typeahead/DiffusionAuditorDatasource.php b/src/applications/diffusion/typeahead/DiffusionAuditorDatasource.php index ae0eff9138..471c8a15b7 100644 --- a/src/applications/diffusion/typeahead/DiffusionAuditorDatasource.php +++ b/src/applications/diffusion/typeahead/DiffusionAuditorDatasource.php @@ -8,7 +8,7 @@ final class DiffusionAuditorDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } public function getComponentDatasources() { diff --git a/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php b/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php index 3cbf202eb6..ca90766640 100644 --- a/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php +++ b/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php @@ -8,7 +8,7 @@ final class DiffusionRepositoryDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } public function loadResults() { diff --git a/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php b/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php index bfc34806f9..25886ccf44 100644 --- a/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php +++ b/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php @@ -8,7 +8,7 @@ final class DiffusionSymbolDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } public function loadResults() { diff --git a/src/applications/diffusion/view/DiffusionHistoryTableView.php b/src/applications/diffusion/view/DiffusionHistoryTableView.php index 68a94b122d..b631a95f14 100644 --- a/src/applications/diffusion/view/DiffusionHistoryTableView.php +++ b/src/applications/diffusion/view/DiffusionHistoryTableView.php @@ -95,7 +95,7 @@ final class DiffusionHistoryTableView extends DiffusionView { } $show_builds = PhabricatorApplication::isClassInstalledForViewer( - 'PhabricatorApplicationHarbormaster', + 'PhabricatorHarbormasterApplication', $this->getUser()); $rows = array(); @@ -254,13 +254,12 @@ final class DiffusionHistoryTableView extends DiffusionView { * |o * o * - * ...which form an ASCII representation of the graph we eventaully want to + * ...which form an ASCII representation of the graph we eventually want to * draw. * * NOTE: The actual implementation is black magic. */ private function renderGraph() { - // This keeps our accumulated information about each line of the // merge/branch graph. $graph = array(); diff --git a/src/applications/diviner/application/PhabricatorApplicationDiviner.php b/src/applications/diviner/application/PhabricatorDivinerApplication.php similarity index 93% rename from src/applications/diviner/application/PhabricatorApplicationDiviner.php rename to src/applications/diviner/application/PhabricatorDivinerApplication.php index da2fd4bcb8..9e5fa519b1 100644 --- a/src/applications/diviner/application/PhabricatorApplicationDiviner.php +++ b/src/applications/diviner/application/PhabricatorDivinerApplication.php @@ -1,6 +1,6 @@ needExtends = $need; return $this; @@ -415,7 +413,7 @@ final class DivinerAtomQuery * Attach child atoms to existing atoms. In recursive mode, also attach child * atoms to atoms that these atoms extend. * - * @param list List of symbols to attach childeren to. + * @param list List of symbols to attach children to. * @param map Map of symbols, keyed by node hash. * @param bool True to attach children to extended atoms, as well. * @return void @@ -443,7 +441,7 @@ final class DivinerAtomQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationDiviner'; + return 'PhabricatorDivinerApplication'; } } diff --git a/src/applications/diviner/query/DivinerAtomSearchEngine.php b/src/applications/diviner/query/DivinerAtomSearchEngine.php index 4d22b32dc5..014ac3ad5e 100644 --- a/src/applications/diviner/query/DivinerAtomSearchEngine.php +++ b/src/applications/diviner/query/DivinerAtomSearchEngine.php @@ -1,14 +1,13 @@ setName('name') ->setValue($saved->getParameter('name'))) ->appendChild($type_control); - } protected function getURI($path) { @@ -76,15 +74,12 @@ final class DivinerAtomSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'all' => pht('All'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/diviner/query/DivinerBookQuery.php b/src/applications/diviner/query/DivinerBookQuery.php index 062bc524ca..31e6f336a9 100644 --- a/src/applications/diviner/query/DivinerBookQuery.php +++ b/src/applications/diviner/query/DivinerBookQuery.php @@ -1,7 +1,6 @@ formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationDiviner'; + return 'PhabricatorDivinerApplication'; } } diff --git a/src/applications/doorkeeper/application/PhabricatorApplicationDoorkeeper.php b/src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php similarity index 89% rename from src/applications/doorkeeper/application/PhabricatorApplicationDoorkeeper.php rename to src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php index ed8ab32444..185a4a47a0 100644 --- a/src/applications/doorkeeper/application/PhabricatorApplicationDoorkeeper.php +++ b/src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php @@ -1,6 +1,6 @@ array( - ), + DrydockCapabilityDefaultView::CAPABILITY => array(), DrydockCapabilityDefaultEdit::CAPABILITY => array( 'default' => PhabricatorPolicies::POLICY_ADMIN, ), @@ -74,5 +73,4 @@ final class PhabricatorApplicationDrydock extends PhabricatorApplication { ); } - } diff --git a/src/applications/drydock/query/DrydockBlueprintSearchEngine.php b/src/applications/drydock/query/DrydockBlueprintSearchEngine.php index a40bc3f47d..0e7202a4ab 100644 --- a/src/applications/drydock/query/DrydockBlueprintSearchEngine.php +++ b/src/applications/drydock/query/DrydockBlueprintSearchEngine.php @@ -8,19 +8,15 @@ final class DrydockBlueprintSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationDrydock'; + return 'PhabricatorDrydockApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { - $saved = new PhabricatorSavedQuery(); - - return $saved; + return new PhabricatorSavedQuery(); } public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) { - $query = id(new DrydockBlueprintQuery()); - - return $query; + return new DrydockBlueprintQuery(); } public function buildSearchForm( @@ -34,11 +30,9 @@ final class DrydockBlueprintSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'all' => pht('All Blueprints'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { diff --git a/src/applications/drydock/query/DrydockLeaseSearchEngine.php b/src/applications/drydock/query/DrydockLeaseSearchEngine.php index 8339669a6a..16b606e83a 100644 --- a/src/applications/drydock/query/DrydockLeaseSearchEngine.php +++ b/src/applications/drydock/query/DrydockLeaseSearchEngine.php @@ -8,7 +8,7 @@ final class DrydockLeaseSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationDrydock'; + return 'PhabricatorDrydockApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -58,12 +58,10 @@ final class DrydockLeaseSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'active' => pht('Active Leases'), 'all' => pht('All Leases'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { diff --git a/src/applications/drydock/query/DrydockLogSearchEngine.php b/src/applications/drydock/query/DrydockLogSearchEngine.php index e3f83731f3..4d846d1c09 100644 --- a/src/applications/drydock/query/DrydockLogSearchEngine.php +++ b/src/applications/drydock/query/DrydockLogSearchEngine.php @@ -1,26 +1,21 @@ pht('All Logs'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { diff --git a/src/applications/drydock/query/DrydockQuery.php b/src/applications/drydock/query/DrydockQuery.php index 68fe919858..4f3f768d37 100644 --- a/src/applications/drydock/query/DrydockQuery.php +++ b/src/applications/drydock/query/DrydockQuery.php @@ -1,10 +1,9 @@ appendChild($status_control); - } protected function getURI($path) { @@ -58,12 +57,10 @@ final class DrydockResourceSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'active' => pht('Active Resources'), 'all' => pht('All Resources'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { diff --git a/src/applications/drydock/storage/DrydockBlueprint.php b/src/applications/drydock/storage/DrydockBlueprint.php index 499097445f..4fc2e17352 100644 --- a/src/applications/drydock/storage/DrydockBlueprint.php +++ b/src/applications/drydock/storage/DrydockBlueprint.php @@ -14,7 +14,7 @@ final class DrydockBlueprint extends DrydockDAO public static function initializeNewBlueprint(PhabricatorUser $actor) { $app = id(new PhabricatorApplicationQuery()) ->setViewer($actor) - ->withClasses(array('PhabricatorApplicationDrydock')) + ->withClasses(array('PhabricatorDrydockApplication')) ->executeOne(); $view_policy = $app->getPolicy( @@ -85,4 +85,5 @@ final class DrydockBlueprint extends DrydockDAO public function describeAutomaticCapability($capability) { return null; } + } diff --git a/src/applications/fact/application/PhabricatorApplicationFact.php b/src/applications/fact/application/PhabricatorFactApplication.php similarity index 90% rename from src/applications/fact/application/PhabricatorApplicationFact.php rename to src/applications/fact/application/PhabricatorFactApplication.php index 3a3439c7bc..0cf6c1bc92 100644 --- a/src/applications/fact/application/PhabricatorApplicationFact.php +++ b/src/applications/fact/application/PhabricatorFactApplication.php @@ -1,6 +1,6 @@ establishConnection('r'); @@ -104,9 +103,8 @@ final class PhabricatorFeedQuery return $item['chronologicalKey']; } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationFeed'; + return 'PhabricatorFeedApplication'; } } diff --git a/src/applications/files/application/PhabricatorApplicationFiles.php b/src/applications/files/application/PhabricatorFilesApplication.php similarity index 96% rename from src/applications/files/application/PhabricatorApplicationFiles.php rename to src/applications/files/application/PhabricatorFilesApplication.php index 2ef01c7789..0c57f29dd3 100644 --- a/src/applications/files/application/PhabricatorApplicationFiles.php +++ b/src/applications/files/application/PhabricatorFilesApplication.php @@ -1,6 +1,6 @@ [1-9]\d*)' => 'PhabricatorFileShortcutController', diff --git a/src/applications/files/conduit/ConduitAPI_file_Method.php b/src/applications/files/conduit/ConduitAPI_file_Method.php index 45f525221d..0b77ce84e5 100644 --- a/src/applications/files/conduit/ConduitAPI_file_Method.php +++ b/src/applications/files/conduit/ConduitAPI_file_Method.php @@ -3,8 +3,7 @@ abstract class ConduitAPI_file_Method extends ConduitAPIMethod { public function getApplication() { - return PhabricatorApplication::getByClass( - 'PhabricatorApplicationFiles'); + return PhabricatorApplication::getByClass('PhabricatorFilesApplication'); } } diff --git a/src/applications/files/mail/FileCreateMailReceiver.php b/src/applications/files/mail/FileCreateMailReceiver.php index 955c4db547..0c29aad61f 100644 --- a/src/applications/files/mail/FileCreateMailReceiver.php +++ b/src/applications/files/mail/FileCreateMailReceiver.php @@ -3,7 +3,7 @@ final class FileCreateMailReceiver extends PhabricatorMailReceiver { public function isEnabled() { - $app_class = 'PhabricatorApplicationFiles'; + $app_class = 'PhabricatorFilesApplication'; return PhabricatorApplication::isClassInstalled($app_class); } @@ -38,9 +38,7 @@ final class FileCreateMailReceiver extends PhabricatorMailReceiver { $attachment_count = count($attachment_phids); if ($attachment_count > 1) { - $subject = pht( - 'You successfully uploaded %d files.', - $attachment_count); + $subject = pht('You successfully uploaded %d files.', $attachment_count); } else { $subject = pht('You successfully uploaded a file.'); } diff --git a/src/applications/files/mail/FileMailReceiver.php b/src/applications/files/mail/FileMailReceiver.php index 0ddb913745..074bbe6051 100644 --- a/src/applications/files/mail/FileMailReceiver.php +++ b/src/applications/files/mail/FileMailReceiver.php @@ -3,7 +3,7 @@ final class FileMailReceiver extends PhabricatorObjectMailReceiver { public function isEnabled() { - $app_class = 'PhabricatorApplicationFiles'; + $app_class = 'PhabricatorFilesApplication'; return PhabricatorApplication::isClassInstalled($app_class); } diff --git a/src/applications/files/query/PhabricatorFileQuery.php b/src/applications/files/query/PhabricatorFileQuery.php index f4af58646f..bce7becda4 100644 --- a/src/applications/files/query/PhabricatorFileQuery.php +++ b/src/applications/files/query/PhabricatorFileQuery.php @@ -245,9 +245,8 @@ final class PhabricatorFileQuery return 'f.id'; } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationFiles'; + return 'PhabricatorFilesApplication'; } } diff --git a/src/applications/files/query/PhabricatorFileSearchEngine.php b/src/applications/files/query/PhabricatorFileSearchEngine.php index d91110f8b9..1811630f45 100644 --- a/src/applications/files/query/PhabricatorFileSearchEngine.php +++ b/src/applications/files/query/PhabricatorFileSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorFileSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationFiles'; + return 'PhabricatorFilesApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -94,14 +94,13 @@ final class PhabricatorFileSearchEngine } $names += array( - 'all' => pht('All'), + 'all' => pht('All'), ); return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/flag/application/PhabricatorApplicationFlags.php b/src/applications/flag/application/PhabricatorFlagsApplication.php similarity index 95% rename from src/applications/flag/application/PhabricatorApplicationFlags.php rename to src/applications/flag/application/PhabricatorFlagsApplication.php index 008aced856..deba0586ad 100644 --- a/src/applications/flag/application/PhabricatorApplicationFlags.php +++ b/src/applications/flag/application/PhabricatorFlagsApplication.php @@ -1,6 +1,6 @@ PhabricatorFlagColor::getColorName($color), 'note' => $flag->getNote(), 'handle' => array( - 'uri' => $uri, - 'name' => $flag->getHandle()->getName(), - 'fullname' => $flag->getHandle()->getFullName(), + 'uri' => $uri, + 'name' => $flag->getHandle()->getName(), + 'fullname' => $flag->getHandle()->getFullName(), ), 'dateCreated' => $flag->getDateCreated(), 'dateModified' => $flag->getDateModified(), diff --git a/src/applications/flag/query/PhabricatorFlagQuery.php b/src/applications/flag/query/PhabricatorFlagQuery.php index c31e4a02c7..d7950f3008 100644 --- a/src/applications/flag/query/PhabricatorFlagQuery.php +++ b/src/applications/flag/query/PhabricatorFlagQuery.php @@ -36,7 +36,7 @@ final class PhabricatorFlagQuery } /** - * Note this is done in php and not in mySQL, which means its inappropriate + * NOTE: this is done in PHP and not in MySQL, which means its inappropriate * for large datasets. Pragmatically, this is fine for user flags which are * typically well under 100 flags per user. */ @@ -65,7 +65,6 @@ final class PhabricatorFlagQuery ->executeOne(); } - public function loadPage() { $table = new PhabricatorFlag(); $conn_r = $table->establishConnection('r'); @@ -82,7 +81,6 @@ final class PhabricatorFlagQuery } public function willFilterPage(array $flags) { - if ($this->needObjects) { $objects = id(new PhabricatorObjectQuery()) ->setViewer($this->getViewer()) @@ -160,9 +158,8 @@ final class PhabricatorFlagQuery return $this->formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationFlags'; + return 'PhabricatorFlagsApplication'; } } diff --git a/src/applications/flag/query/PhabricatorFlagSearchEngine.php b/src/applications/flag/query/PhabricatorFlagSearchEngine.php index d5b14fa05b..8dff52e47c 100644 --- a/src/applications/flag/query/PhabricatorFlagSearchEngine.php +++ b/src/applications/flag/query/PhabricatorFlagSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorFlagSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationFlags'; + return 'PhabricatorFlagsApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { diff --git a/src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php similarity index 97% rename from src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php rename to src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php index 5b28a6eb28..aba6b442ad 100644 --- a/src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php +++ b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php @@ -1,6 +1,6 @@ setOldValue($old_status) ->setNewValue($new_status); - $harbormaster_phid = id(new PhabricatorApplicationHarbormaster()) + $harbormaster_phid = id(new PhabricatorHarbormasterApplication()) ->getPHID(); $daemon_source = PhabricatorContentSource::newForSource( @@ -448,7 +448,6 @@ final class HarbormasterBuildEngine extends Phobject { } } } - } } diff --git a/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php b/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php index 44a5e7dcda..79cee61a1b 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php @@ -113,7 +113,7 @@ final class HarbormasterBuildArtifactQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } } diff --git a/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php b/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php index d04fa251a5..2c82588940 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php @@ -54,7 +54,7 @@ final class HarbormasterBuildItemQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } } diff --git a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php index f25597f48e..461697a1e4 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php @@ -92,7 +92,7 @@ final class HarbormasterBuildLogQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } } diff --git a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php index b792b9d06b..816bafc1ad 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php @@ -92,7 +92,7 @@ final class HarbormasterBuildMessageQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } } diff --git a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php index e3863a438a..e9395d867c 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php @@ -37,7 +37,6 @@ final class HarbormasterBuildPlanQuery return $table->loadAllFromArray($data); } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); @@ -68,7 +67,7 @@ final class HarbormasterBuildPlanQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } } diff --git a/src/applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php index 130d5a45b8..70d5b867d1 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php +++ b/src/applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php @@ -8,7 +8,7 @@ final class HarbormasterBuildPlanSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -52,7 +52,6 @@ final class HarbormasterBuildPlanSearchEngine HarbormasterBuildPlan::STATUS_DISABLED, pht('Disabled'), in_array(HarbormasterBuildPlan::STATUS_DISABLED, $status))); - } protected function getURI($path) { @@ -60,16 +59,13 @@ final class HarbormasterBuildPlanSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'active' => pht('Active Plans'), 'all' => pht('All Plans'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/harbormaster/query/HarbormasterBuildQuery.php b/src/applications/harbormaster/query/HarbormasterBuildQuery.php index 0ff11798ae..bfa18f14c3 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildQuery.php @@ -173,7 +173,7 @@ final class HarbormasterBuildQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } } diff --git a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php index db452da20b..dc458b72db 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php @@ -100,7 +100,7 @@ final class HarbormasterBuildStepQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } } diff --git a/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php b/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php index aff82090ba..652ef56282 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php @@ -92,7 +92,7 @@ final class HarbormasterBuildTargetQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } } diff --git a/src/applications/harbormaster/query/HarbormasterBuildableQuery.php b/src/applications/harbormaster/query/HarbormasterBuildableQuery.php index 01f1fb4e65..5b5972fa2f 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildableQuery.php +++ b/src/applications/harbormaster/query/HarbormasterBuildableQuery.php @@ -216,7 +216,7 @@ final class HarbormasterBuildableQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } } diff --git a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php index fb1894a2b9..701fde3de7 100644 --- a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php +++ b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php @@ -8,7 +8,7 @@ final class HarbormasterBuildableSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -160,15 +160,12 @@ final class HarbormasterBuildableSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'all' => pht('All Buildables'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); @@ -220,4 +217,5 @@ final class HarbormasterBuildableSearchEngine return $list; } + } diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php index 1a4c8b3267..ec7a688823 100644 --- a/src/applications/harbormaster/storage/HarbormasterBuildable.php +++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php @@ -58,7 +58,7 @@ final class HarbormasterBuildable extends HarbormasterDAO return 'bluegrey'; } } - + public static function initializeNewBuildable(PhabricatorUser $actor) { return id(new HarbormasterBuildable()) ->setIsManualBuildable(0) @@ -110,7 +110,7 @@ final class HarbormasterBuildable extends HarbormasterDAO // Skip all of this logic if the Harbormaster application // isn't currently installed. - $harbormaster_app = 'PhabricatorApplicationHarbormaster'; + $harbormaster_app = 'PhabricatorHarbormasterApplication'; if (!PhabricatorApplication::isClassInstalled($harbormaster_app)) { return; } diff --git a/src/applications/harbormaster/typeahead/HarbormasterBuildPlanDatasource.php b/src/applications/harbormaster/typeahead/HarbormasterBuildPlanDatasource.php index 57c9f870ab..ff24094a6b 100644 --- a/src/applications/harbormaster/typeahead/HarbormasterBuildPlanDatasource.php +++ b/src/applications/harbormaster/typeahead/HarbormasterBuildPlanDatasource.php @@ -8,7 +8,7 @@ final class HarbormasterBuildPlanDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationHarbormaster'; + return 'PhabricatorHarbormasterApplication'; } public function loadResults() { diff --git a/src/applications/help/application/PhabricatorApplicationHelp.php b/src/applications/help/application/PhabricatorHelpApplication.php similarity index 94% rename from src/applications/help/application/PhabricatorApplicationHelp.php rename to src/applications/help/application/PhabricatorHelpApplication.php index 4994d19e69..bc7c2b374f 100644 --- a/src/applications/help/application/PhabricatorApplicationHelp.php +++ b/src/applications/help/application/PhabricatorHelpApplication.php @@ -1,6 +1,6 @@ 'HeraldNewController', 'rule/(?P[1-9]\d*)/' => 'HeraldRuleViewController', 'edit/(?:(?P[1-9]\d*)/)?' => 'HeraldRuleController', - 'disable/(?P[1-9]\d*)/(?P\w+)/' => - 'HeraldDisableController', + 'disable/(?P[1-9]\d*)/(?P\w+)/' + => 'HeraldDisableController', 'history/(?:(?P[1-9]\d*)/)?' => 'HeraldRuleEditHistoryController', 'test/' => 'HeraldTestConsoleController', 'transcript/' => array( '' => 'HeraldTranscriptListController', '(?:query/(?P[^/]+)/)?' => 'HeraldTranscriptListController', '(?P[1-9]\d*)/(?:(?P\w+)/)?' - => 'HeraldTranscriptController', + => 'HeraldTranscriptController', ) ) ); @@ -66,5 +66,4 @@ final class PhabricatorApplicationHerald extends PhabricatorApplication { ); } - } diff --git a/src/applications/herald/query/HeraldRuleQuery.php b/src/applications/herald/query/HeraldRuleQuery.php index c509c62023..512557399d 100644 --- a/src/applications/herald/query/HeraldRuleQuery.php +++ b/src/applications/herald/query/HeraldRuleQuery.php @@ -1,7 +1,6 @@ $rule) { if ($rule->isGlobalRule() || $rule->isObjectRule()) { @@ -271,9 +269,8 @@ final class HeraldRuleQuery } } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationHerald'; + return 'PhabricatorHeraldApplication'; } } diff --git a/src/applications/herald/query/HeraldRuleSearchEngine.php b/src/applications/herald/query/HeraldRuleSearchEngine.php index 90fc510b62..fe12ba7187 100644 --- a/src/applications/herald/query/HeraldRuleSearchEngine.php +++ b/src/applications/herald/query/HeraldRuleSearchEngine.php @@ -1,14 +1,13 @@ newSavedQuery(); $query->setQueryKey($query_key); @@ -163,6 +161,7 @@ final class HeraldRuleSearchEngine protected function getRequiredHandlePHIDsForResultList( array $rules, PhabricatorSavedQuery $query) { + return mpull($rules, 'getAuthorPHID'); } diff --git a/src/applications/herald/query/HeraldTranscriptQuery.php b/src/applications/herald/query/HeraldTranscriptQuery.php index 64b999a027..2f4a6ff954 100644 --- a/src/applications/herald/query/HeraldTranscriptQuery.php +++ b/src/applications/herald/query/HeraldTranscriptQuery.php @@ -108,7 +108,7 @@ final class HeraldTranscriptQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationHerald'; + return 'PhabricatorHeraldApplication'; } } diff --git a/src/applications/herald/query/HeraldTranscriptSearchEngine.php b/src/applications/herald/query/HeraldTranscriptSearchEngine.php index ade6fc959c..8074b3d613 100644 --- a/src/applications/herald/query/HeraldTranscriptSearchEngine.php +++ b/src/applications/herald/query/HeraldTranscriptSearchEngine.php @@ -8,7 +8,7 @@ final class HeraldTranscriptSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationHerald'; + return 'PhabricatorHeraldApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -75,15 +75,12 @@ final class HeraldTranscriptSearchEngine } public function getBuiltinQueryNames() { - $names = array(); - - $names['all'] = pht('All'); - - return $names; + return array( + 'all' => pht('All'), + ); } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/herald/storage/HeraldRule.php b/src/applications/herald/storage/HeraldRule.php index 6245f70d8f..806eaab967 100644 --- a/src/applications/herald/storage/HeraldRule.php +++ b/src/applications/herald/storage/HeraldRule.php @@ -20,7 +20,7 @@ final class HeraldRule extends HeraldDAO protected $configVersion = 37; - // phids for which this rule has been applied + // PHIDs for which this rule has been applied private $ruleApplied = self::ATTACHABLE; private $validAuthor = self::ATTACHABLE; private $author = self::ATTACHABLE; @@ -221,7 +221,7 @@ final class HeraldRule extends HeraldDAO case PhabricatorPolicyCapability::CAN_VIEW: return PhabricatorPolicies::POLICY_USER; case PhabricatorPolicyCapability::CAN_EDIT: - $app = 'PhabricatorApplicationHerald'; + $app = 'PhabricatorHeraldApplication'; $herald = PhabricatorApplication::getByClass($app); $global = HeraldCapabilityManageGlobalRules::CAPABILITY; return $herald->getPolicy($global); diff --git a/src/applications/home/application/PhabricatorApplicationHome.php b/src/applications/home/application/PhabricatorHomeApplication.php similarity index 97% rename from src/applications/home/application/PhabricatorApplicationHome.php rename to src/applications/home/application/PhabricatorHomeApplication.php index bfcdd6c01f..709bd91bd1 100644 --- a/src/applications/home/application/PhabricatorApplicationHome.php +++ b/src/applications/home/application/PhabricatorHomeApplication.php @@ -1,6 +1,6 @@ setApplication($home_app) diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php index abec1abcec..9fa032d566 100644 --- a/src/applications/home/controller/PhabricatorHomeMainController.php +++ b/src/applications/home/controller/PhabricatorHomeMainController.php @@ -1,7 +1,6 @@ getCurrentApplication())); } @@ -65,15 +64,15 @@ final class PhabricatorHomeMainController $viewer = $this->getRequest()->getUser(); $has_maniphest = PhabricatorApplication::isClassInstalledForViewer( - 'PhabricatorApplicationManiphest', + 'PhabricatorManiphestApplication', $viewer); $has_audit = PhabricatorApplication::isClassInstalledForViewer( - 'PhabricatorApplicationAudit', + 'PhabricatorAuditApplication', $viewer); $has_differential = PhabricatorApplication::isClassInstalledForViewer( - 'PhabricatorApplicationDifferential', + 'PhabricatorDifferentialApplication', $viewer); if ($has_maniphest) { diff --git a/src/applications/legalpad/application/PhabricatorApplicationLegalpad.php b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php similarity index 81% rename from src/applications/legalpad/application/PhabricatorApplicationLegalpad.php rename to src/applications/legalpad/application/PhabricatorLegalpadApplication.php index f1dbb435bd..8465ba7ae3 100644 --- a/src/applications/legalpad/application/PhabricatorApplicationLegalpad.php +++ b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php @@ -1,6 +1,6 @@ \d+)/' => 'LegalpadDocumentCommentController', 'view/(?P\d+)/' => 'LegalpadDocumentManageController', 'done/' => 'LegalpadDocumentDoneController', - 'verify/(?P[^/]+)/' => - 'LegalpadDocumentSignatureVerificationController', - 'signatures/(?:(?P\d+)/)?(?:query/(?P[^/]+)/)?' => - 'LegalpadDocumentSignatureListController', + 'verify/(?P[^/]+)/' + => 'LegalpadDocumentSignatureVerificationController', + 'signatures/(?:(?P\d+)/)?(?:query/(?P[^/]+)/)?' + => 'LegalpadDocumentSignatureListController', 'addsignature/(?P\d+)/' => 'LegalpadDocumentSignatureAddController', 'signature/(?P\d+)/' => 'LegalpadDocumentSignatureViewController', 'document/' => array( @@ -64,12 +64,9 @@ final class PhabricatorApplicationLegalpad extends PhabricatorApplication { protected function getCustomCapabilities() { return array( - LegalpadCapabilityCreateDocuments::CAPABILITY => array( - ), - LegalpadCapabilityDefaultView::CAPABILITY => array( - ), - LegalpadCapabilityDefaultEdit::CAPABILITY => array( - ), + LegalpadCapabilityCreateDocuments::CAPABILITY => array(), + LegalpadCapabilityDefaultView::CAPABILITY => array(), + LegalpadCapabilityDefaultEdit::CAPABILITY => array(), ); } diff --git a/src/applications/legalpad/mail/LegalpadMockMailReceiver.php b/src/applications/legalpad/mail/LegalpadMockMailReceiver.php index e6739049a9..9f270e198b 100644 --- a/src/applications/legalpad/mail/LegalpadMockMailReceiver.php +++ b/src/applications/legalpad/mail/LegalpadMockMailReceiver.php @@ -3,7 +3,7 @@ final class LegalpadMockMailReceiver extends PhabricatorObjectMailReceiver { public function isEnabled() { - $app_class = 'PhabricatorApplicationLegalpad'; + $app_class = 'PhabricatorLegalpadApplication'; return PhabricatorApplication::isClassInstalled($app_class); } diff --git a/src/applications/legalpad/query/LegalpadDocumentQuery.php b/src/applications/legalpad/query/LegalpadDocumentQuery.php index 2d7c4ffa09..2a396ccaf2 100644 --- a/src/applications/legalpad/query/LegalpadDocumentQuery.php +++ b/src/applications/legalpad/query/LegalpadDocumentQuery.php @@ -259,7 +259,7 @@ final class LegalpadDocumentQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationLegalpad'; + return 'PhabricatorLegalpadApplication'; } } diff --git a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php index d80386b815..d65327a903 100644 --- a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php +++ b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php @@ -8,7 +8,7 @@ final class LegalpadDocumentSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationLegalpad'; + return 'PhabricatorLegalpadApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -133,7 +133,6 @@ final class LegalpadDocumentSearchEngine } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php b/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php index 9a4ba46776..3bb3628c99 100644 --- a/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php +++ b/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php @@ -144,7 +144,7 @@ final class LegalpadDocumentSignatureQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationLegalpad'; + return 'PhabricatorLegalpadApplication'; } } diff --git a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php index da1d792998..4eae91f7b5 100644 --- a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php +++ b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php @@ -10,7 +10,7 @@ final class LegalpadDocumentSignatureSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationLegalpad'; + return 'PhabricatorLegalpadApplication'; } public function setDocument(LegalpadDocument $document) { diff --git a/src/applications/legalpad/storage/LegalpadDocument.php b/src/applications/legalpad/storage/LegalpadDocument.php index 77f2be7cc4..265731b899 100644 --- a/src/applications/legalpad/storage/LegalpadDocument.php +++ b/src/applications/legalpad/storage/LegalpadDocument.php @@ -30,7 +30,7 @@ final class LegalpadDocument extends LegalpadDAO public static function initializeNewDocument(PhabricatorUser $actor) { $app = id(new PhabricatorApplicationQuery()) ->setViewer($actor) - ->withClasses(array('PhabricatorApplicationLegalpad')) + ->withClasses(array('PhabricatorLegalpadApplication')) ->executeOne(); $view_policy = $app->getPolicy(LegalpadCapabilityDefaultView::CAPABILITY); diff --git a/src/applications/legalpad/typeahead/LegalpadDocumentDatasource.php b/src/applications/legalpad/typeahead/LegalpadDocumentDatasource.php index ccb527dfa0..853d775184 100644 --- a/src/applications/legalpad/typeahead/LegalpadDocumentDatasource.php +++ b/src/applications/legalpad/typeahead/LegalpadDocumentDatasource.php @@ -1,14 +1,13 @@ array( - 'caption' => pht('Allows creating and editing macros.') + 'caption' => pht('Allows creating and editing macros.'), ), ); } diff --git a/src/applications/macro/conduit/ConduitAPI_macro_Method.php b/src/applications/macro/conduit/ConduitAPI_macro_Method.php index df48df3426..acdca57167 100644 --- a/src/applications/macro/conduit/ConduitAPI_macro_Method.php +++ b/src/applications/macro/conduit/ConduitAPI_macro_Method.php @@ -3,8 +3,7 @@ abstract class ConduitAPI_macro_Method extends ConduitAPIMethod { public function getApplication() { - return PhabricatorApplication::getByClass( - 'PhabricatorApplicationMacro'); + return PhabricatorApplication::getByClass('PhabricatorMacroApplication'); } } diff --git a/src/applications/macro/mail/PhabricatorMacroMailReceiver.php b/src/applications/macro/mail/PhabricatorMacroMailReceiver.php index 3901388e3d..15b8dc1c84 100644 --- a/src/applications/macro/mail/PhabricatorMacroMailReceiver.php +++ b/src/applications/macro/mail/PhabricatorMacroMailReceiver.php @@ -3,7 +3,7 @@ final class PhabricatorMacroMailReceiver extends PhabricatorObjectMailReceiver { public function isEnabled() { - $app_class = 'PhabricatorApplicationManiphest'; + $app_class = 'PhabricatorManiphestApplication'; return PhabricatorApplication::isClassInstalled($app_class); } @@ -11,7 +11,6 @@ final class PhabricatorMacroMailReceiver extends PhabricatorObjectMailReceiver { return 'MCRO[1-9]\d*'; } - protected function loadObject($pattern, PhabricatorUser $viewer) { $id = (int)substr($pattern, 4); @@ -30,5 +29,4 @@ final class PhabricatorMacroMailReceiver extends PhabricatorObjectMailReceiver { } - } diff --git a/src/applications/macro/query/PhabricatorMacroQuery.php b/src/applications/macro/query/PhabricatorMacroQuery.php index 7a38db48d5..c769e5c329 100644 --- a/src/applications/macro/query/PhabricatorMacroQuery.php +++ b/src/applications/macro/query/PhabricatorMacroQuery.php @@ -221,7 +221,7 @@ final class PhabricatorMacroQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationMacro'; + return 'PhabricatorMacroApplication'; } } diff --git a/src/applications/macro/query/PhabricatorMacroSearchEngine.php b/src/applications/macro/query/PhabricatorMacroSearchEngine.php index 9abf99d3aa..48d2a2c5b7 100644 --- a/src/applications/macro/query/PhabricatorMacroSearchEngine.php +++ b/src/applications/macro/query/PhabricatorMacroSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorMacroSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationMacro'; + return 'PhabricatorMacroApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -141,7 +141,6 @@ final class PhabricatorMacroSearchEngine } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/macro/typeahead/PhabricatorMacroDatasource.php b/src/applications/macro/typeahead/PhabricatorMacroDatasource.php index 6b7078b410..339be08fa7 100644 --- a/src/applications/macro/typeahead/PhabricatorMacroDatasource.php +++ b/src/applications/macro/typeahead/PhabricatorMacroDatasource.php @@ -1,14 +1,13 @@ pht('All Lists'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/mailinglists/typeahead/PhabricatorMailingListDatasource.php b/src/applications/mailinglists/typeahead/PhabricatorMailingListDatasource.php index 48f5b83da7..53f7d82e0e 100644 --- a/src/applications/mailinglists/typeahead/PhabricatorMailingListDatasource.php +++ b/src/applications/mailinglists/typeahead/PhabricatorMailingListDatasource.php @@ -8,7 +8,7 @@ final class PhabricatorMailingListDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationMailingLists'; + return 'PhabricatorMailingListsApplication'; } public function loadResults() { diff --git a/src/applications/maniphest/application/PhabricatorApplicationManiphest.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php similarity index 79% rename from src/applications/maniphest/application/PhabricatorApplicationManiphest.php rename to src/applications/maniphest/application/PhabricatorManiphestApplication.php index d88570a634..234098c72a 100644 --- a/src/applications/maniphest/application/PhabricatorApplicationManiphest.php +++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php @@ -1,6 +1,6 @@ array( 'create/' => 'ManiphestTaskEditController', 'edit/(?P[1-9]\d*)/' => 'ManiphestTaskEditController', - 'descriptionpreview/' => - 'PhabricatorMarkupPreviewController', + 'descriptionpreview/' + => 'PhabricatorMarkupPreviewController', ), 'transaction/' => array( 'save/' => 'ManiphestTransactionSaveController', @@ -101,25 +101,17 @@ final class PhabricatorApplicationManiphest extends PhabricatorApplication { protected function getCustomCapabilities() { return array( ManiphestCapabilityDefaultView::CAPABILITY => array( - 'caption' => pht( - 'Default view policy for newly created tasks.'), + 'caption' => pht('Default view policy for newly created tasks.'), ), ManiphestCapabilityDefaultEdit::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( + '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(), ); } diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php index d45c42dc88..19a6963bcd 100644 --- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php +++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php @@ -4,12 +4,12 @@ abstract class ConduitAPI_maniphest_Method extends ConduitAPIMethod { public function getApplication() { return PhabricatorApplication::getByClass( - 'PhabricatorApplicationManiphest'); + 'PhabricatorManiphestApplication'); } public function defineErrorTypes() { return array( - 'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.' + 'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.', ); } @@ -23,8 +23,8 @@ abstract class ConduitAPI_maniphest_Method extends ConduitAPIMethod { if (!$is_new) { $fields += array( - 'id' => 'optional int', - 'phid' => 'optional int', + 'id' => 'optional int', + 'phid' => 'optional int', ); } @@ -279,19 +279,18 @@ abstract class ConduitAPI_maniphest_Method extends ConduitAPIMethod { } /** - * Note this is a temporary stop gap since its easy to make malformed Tasks. + * NOTE: This is a temporary stop gap since its easy to make malformed tasks. * Long-term, the values set in @{method:defineParamTypes} will be used to * validate data implicitly within the larger Conduit application. * - * TODO -- remove this in favor of generalized Conduit hotness + * TODO: Remove this in favor of generalized Conduit hotness. */ private function validatePHIDList(array $phid_list, $phid_type, $field) { $phid_groups = phid_group_by_type($phid_list); unset($phid_groups[$phid_type]); if (!empty($phid_groups)) { throw id(new ConduitException('ERR-INVALID-PARAMETER')) - ->setErrorDescription( - 'One or more PHIDs were invalid for '.$field.'.'); + ->setErrorDescription('One or more PHIDs were invalid for '.$field.'.'); } return true; diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php index 58f3d5cda8..175c48c6f5 100644 --- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php +++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php @@ -60,7 +60,6 @@ final class ManiphestTransactionEditor case ManiphestTransaction::TYPE_SUBPRIORITY: return $object->getSubpriority(); } - } protected function getCustomTransactionNewValue( @@ -84,7 +83,6 @@ final class ManiphestTransactionEditor } } - protected function transactionHasEffect( PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { @@ -156,7 +154,6 @@ final class ManiphestTransactionEditor // these do external (edge) updates return; } - } protected function expandTransaction( @@ -286,7 +283,6 @@ final class ManiphestTransactionEditor return $xactions; } - protected function shouldSendMail( PhabricatorLiskDAO $object, array $xactions) { @@ -464,7 +460,7 @@ final class ManiphestTransactionEditor if ($app_capability) { $app = id(new PhabricatorApplicationQuery()) ->setViewer($this->getActor()) - ->withClasses(array('PhabricatorApplicationManiphest')) + ->withClasses(array('PhabricatorManiphestApplication')) ->executeOne(); PhabricatorPolicyFilter::requireCapability( $this->getActor(), @@ -492,7 +488,6 @@ final class ManiphestTransactionEditor } private function getNextSubpriority($pri, $sub, $dir = '>') { - switch ($dir) { case '>': $order = 'ASC'; diff --git a/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php b/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php index 6fe476affb..2fb98fd91a 100644 --- a/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php +++ b/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php @@ -3,7 +3,7 @@ final class ManiphestCreateMailReceiver extends PhabricatorMailReceiver { public function isEnabled() { - $app_class = 'PhabricatorApplicationManiphest'; + $app_class = 'PhabricatorManiphestApplication'; return PhabricatorApplication::isClassInstalled($app_class); } diff --git a/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php b/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php index a91f9cf86e..9aac1742ff 100644 --- a/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php +++ b/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php @@ -3,7 +3,7 @@ final class ManiphestTaskMailReceiver extends PhabricatorObjectMailReceiver { public function isEnabled() { - $app_class = 'PhabricatorApplicationManiphest'; + $app_class = 'PhabricatorManiphestApplication'; return PhabricatorApplication::isClassInstalled($app_class); } diff --git a/src/applications/maniphest/phid/ManiphestPHIDTypeTask.php b/src/applications/maniphest/phid/ManiphestPHIDTypeTask.php index 093c6aa388..2f09bd22c6 100644 --- a/src/applications/maniphest/phid/ManiphestPHIDTypeTask.php +++ b/src/applications/maniphest/phid/ManiphestPHIDTypeTask.php @@ -9,7 +9,7 @@ final class ManiphestPHIDTypeTask extends PhabricatorPHIDType { } public function getPHIDTypeApplicationClass() { - return 'PhabricatorApplicationManiphest'; + return 'PhabricatorManiphestApplication'; } public function newObject() { diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php index 90eb3a8a14..b6884723ea 100644 --- a/src/applications/maniphest/query/ManiphestTaskQuery.php +++ b/src/applications/maniphest/query/ManiphestTaskQuery.php @@ -97,7 +97,7 @@ final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery { * * This is used by boards to supplement queries. * - * @param list List of project PHIDs to add to any existing constriant. + * @param list List of project PHIDs to add to any existing constraint. * @return this */ public function addWithAllProjects(array $projects) { @@ -967,7 +967,7 @@ final class ManiphestTaskQuery extends PhabricatorCursorPagedPolicyAwareQuery { } public function getQueryApplicationClass() { - return 'PhabricatorApplicationManiphest'; + return 'PhabricatorManiphestApplication'; } } diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php index 8079a45380..4cb40b74d7 100644 --- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php +++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php @@ -35,7 +35,7 @@ final class ManiphestTaskSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationManiphest'; + return 'PhabricatorManiphestApplication'; } public function getCustomFieldObject() { @@ -499,9 +499,9 @@ final class ManiphestTaskSearchEngine private function getOrderValues() { return array( 'priority' => ManiphestTaskQuery::ORDER_PRIORITY, - 'updated' => ManiphestTaskQuery::ORDER_MODIFIED, - 'created' => ManiphestTaskQuery::ORDER_CREATED, - 'title' => ManiphestTaskQuery::ORDER_TITLE, + 'updated' => ManiphestTaskQuery::ORDER_MODIFIED, + 'created' => ManiphestTaskQuery::ORDER_CREATED, + 'title' => ManiphestTaskQuery::ORDER_TITLE, ); } @@ -509,9 +509,9 @@ final class ManiphestTaskSearchEngine return array( 'priority' => pht('Priority'), 'assigned' => pht('Assigned'), - 'status' => pht('Status'), - 'project' => pht('Project'), - 'none' => pht('None'), + 'status' => pht('Status'), + 'project' => pht('Project'), + 'none' => pht('None'), ); } @@ -519,9 +519,9 @@ final class ManiphestTaskSearchEngine return array( 'priority' => ManiphestTaskQuery::GROUP_PRIORITY, 'assigned' => ManiphestTaskQuery::GROUP_OWNER, - 'status' => ManiphestTaskQuery::GROUP_STATUS, - 'project' => ManiphestTaskQuery::GROUP_PROJECT, - 'none' => ManiphestTaskQuery::GROUP_NONE, + 'status' => ManiphestTaskQuery::GROUP_STATUS, + 'project' => ManiphestTaskQuery::GROUP_PROJECT, + 'none' => ManiphestTaskQuery::GROUP_NONE, ); } diff --git a/src/applications/maniphest/storage/ManiphestTask.php b/src/applications/maniphest/storage/ManiphestTask.php index 3ee65438fa..b6444d435b 100644 --- a/src/applications/maniphest/storage/ManiphestTask.php +++ b/src/applications/maniphest/storage/ManiphestTask.php @@ -42,7 +42,7 @@ final class ManiphestTask extends ManiphestDAO public static function initializeNewTask(PhabricatorUser $actor) { $app = id(new PhabricatorApplicationQuery()) ->setViewer($actor) - ->withClasses(array('PhabricatorApplicationManiphest')) + ->withClasses(array('PhabricatorManiphestApplication')) ->executeOne(); $view_policy = $app->getPolicy(ManiphestCapabilityDefaultView::CAPABILITY); @@ -231,7 +231,6 @@ final class ManiphestTask extends ManiphestDAO } public function hasAutomaticCapability($capability, PhabricatorUser $user) { - // The owner of a task can always view and edit it. $owner_phid = $this->getOwnerPHID(); if ($owner_phid) { @@ -245,8 +244,7 @@ final class ManiphestTask extends ManiphestDAO } public function describeAutomaticCapability($capability) { - return pht( - 'The owner of a task can always view and edit it.'); + return pht('The owner of a task can always view and edit it.'); } diff --git a/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php b/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php index a6adc0a904..172caea1a6 100644 --- a/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php +++ b/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php @@ -8,7 +8,7 @@ final class ManiphestTaskPriorityDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationManiphest'; + return 'PhabricatorManiphestApplication'; } public function loadResults() { @@ -19,7 +19,7 @@ final class ManiphestTaskPriorityDatasource $priority_map = ManiphestTaskPriority::getTaskPriorityMap(); foreach ($priority_map as $value => $name) { - // NOTE: $value is not a phid but is unique. This'll work. + // NOTE: $value is not a PHID but is unique. This'll work. $results[] = id(new PhabricatorTypeaheadResult()) ->setPHID($value) ->setName($name); diff --git a/src/applications/meta/application/PhabricatorApplicationApplications.php b/src/applications/meta/application/PhabricatorApplicationsApplication.php similarity index 58% rename from src/applications/meta/application/PhabricatorApplicationApplications.php rename to src/applications/meta/application/PhabricatorApplicationsApplication.php index fb9ffb5bf0..00556fa5f7 100644 --- a/src/applications/meta/application/PhabricatorApplicationApplications.php +++ b/src/applications/meta/application/PhabricatorApplicationsApplication.php @@ -1,6 +1,6 @@ array( - '(?:query/(?P[^/]+)/)?' => - 'PhabricatorApplicationsListController', - 'view/(?P\w+)/' => - 'PhabricatorApplicationDetailViewController', - 'edit/(?P\w+)/' => - 'PhabricatorApplicationEditController', - '(?P\w+)/(?Pinstall|uninstall)/' => - 'PhabricatorApplicationUninstallController', - ), + '(?:query/(?P[^/]+)/)?' + => 'PhabricatorApplicationsListController', + 'view/(?P\w+)/' + => 'PhabricatorApplicationDetailViewController', + 'edit/(?P\w+)/' + => 'PhabricatorApplicationEditController', + '(?P\w+)/(?Pinstall|uninstall)/' + => 'PhabricatorApplicationUninstallController', + ), ); } diff --git a/src/applications/meta/query/PhabricatorAppSearchEngine.php b/src/applications/meta/query/PhabricatorAppSearchEngine.php index c456c535ca..09cbce2044 100644 --- a/src/applications/meta/query/PhabricatorAppSearchEngine.php +++ b/src/applications/meta/query/PhabricatorAppSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorAppSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationApplications'; + return 'PhabricatorApplicationsApplication'; } public function getPageSize(PhabricatorSavedQuery $saved) { @@ -123,7 +123,6 @@ final class PhabricatorAppSearchEngine 'true' => pht('Show Launchable Applications'), 'false' => pht('Show Non-Launchable Applications'), ))); - } protected function getURI($path) { @@ -131,16 +130,13 @@ final class PhabricatorAppSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'launcher' => pht('Launcher'), 'all' => pht('All Applications'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php index f092b2a81d..5173248988 100644 --- a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php +++ b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php @@ -8,7 +8,7 @@ final class PhabricatorApplicationDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationApplications'; + return 'PhabricatorApplicationsApplication'; } public function loadResults() { diff --git a/src/applications/metamta/application/PhabricatorApplicationMetaMTA.php b/src/applications/metamta/application/PhabricatorMetaMTAApplication.php similarity index 84% rename from src/applications/metamta/application/PhabricatorApplicationMetaMTA.php rename to src/applications/metamta/application/PhabricatorMetaMTAApplication.php index 8586e91f75..0efe8a404a 100644 --- a/src/applications/metamta/application/PhabricatorApplicationMetaMTA.php +++ b/src/applications/metamta/application/PhabricatorMetaMTAApplication.php @@ -1,6 +1,6 @@ array( 'sendgrid/' => 'PhabricatorMetaMTASendGridReceiveController', - 'mailgun/' => 'PhabricatorMetaMTAMailgunReceiveController', + 'mailgun/' => 'PhabricatorMetaMTAMailgunReceiveController', ), ); } diff --git a/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableDatasource.php b/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableDatasource.php index 0a6b5ea0b4..9d7e2cda7d 100644 --- a/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableDatasource.php +++ b/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableDatasource.php @@ -8,7 +8,7 @@ final class PhabricatorMetaMTAMailableDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationMetaMTA'; + return 'PhabricatorMetaMTAApplication'; } public function getComponentDatasources() { diff --git a/src/applications/notification/application/PhabricatorApplicationNotifications.php b/src/applications/notification/application/PhabricatorNotificationsApplication.php similarity index 92% rename from src/applications/notification/application/PhabricatorApplicationNotifications.php rename to src/applications/notification/application/PhabricatorNotificationsApplication.php index 19bf254992..f90fe2acb7 100644 --- a/src/applications/notification/application/PhabricatorApplicationNotifications.php +++ b/src/applications/notification/application/PhabricatorNotificationsApplication.php @@ -1,6 +1,6 @@ getChronologicalKey(); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationNotifications'; + return 'PhabricatorNotificationsApplication'; } } diff --git a/src/applications/nuance/application/PhabricatorApplicationNuance.php b/src/applications/nuance/application/PhabricatorNuanceApplication.php similarity index 83% rename from src/applications/nuance/application/PhabricatorApplicationNuance.php rename to src/applications/nuance/application/PhabricatorNuanceApplication.php index 5543255105..07332c61ee 100644 --- a/src/applications/nuance/application/PhabricatorApplicationNuance.php +++ b/src/applications/nuance/application/PhabricatorNuanceApplication.php @@ -1,6 +1,6 @@ array( - 'caption' => pht( - 'Default view policy for newly created sources.'), + 'caption' => pht('Default view policy for newly created sources.'), ), NuanceCapabilitySourceDefaultEdit::CAPABILITY => array( - 'caption' => pht( - 'Default edit policy for newly created sources.'), - ), - NuanceCapabilitySourceManage::CAPABILITY => array( + 'caption' => pht('Default edit policy for newly created sources.'), ), + NuanceCapabilitySourceManage::CAPABILITY => array(), ); } diff --git a/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php b/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php index 374ae7e4eb..8d78371d96 100644 --- a/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php +++ b/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php @@ -3,8 +3,7 @@ abstract class ConduitAPI_nuance_Method extends ConduitAPIMethod { public function getApplication() { - return PhabricatorApplication::getByClass( - 'PhabricatorApplicationNuance'); + return PhabricatorApplication::getByClass('PhabricatorNuanceApplication'); } public function getMethodStatus() { diff --git a/src/applications/nuance/query/NuanceQuery.php b/src/applications/nuance/query/NuanceQuery.php index 617cada36d..1e72f5501e 100644 --- a/src/applications/nuance/query/NuanceQuery.php +++ b/src/applications/nuance/query/NuanceQuery.php @@ -1,10 +1,9 @@ setViewer($actor) - ->withClasses(array('PhabricatorApplicationNuance')) + ->withClasses(array('PhabricatorNuanceApplication')) ->executeOne(); $view_policy = $app->getPolicy( @@ -54,7 +52,6 @@ final class NuanceSource ->setViewPolicy($view_policy) ->setEditPolicy($edit_policy) ->setType($lucky_definition->getSourceTypeConstant()); - } public function getCapabilities() { @@ -81,5 +78,4 @@ final class NuanceSource return null; } - } diff --git a/src/applications/oauthserver/application/PhabricatorApplicationOAuthServer.php b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php similarity index 73% rename from src/applications/oauthserver/application/PhabricatorApplicationOAuthServer.php rename to src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php index 399367436f..6f183195bf 100644 --- a/src/applications/oauthserver/application/PhabricatorApplicationOAuthServer.php +++ b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php @@ -1,6 +1,6 @@ array( '(?:query/(?P[^/]+)/)?' => 'PhabricatorOAuthClientListController', - 'auth/' => 'PhabricatorOAuthServerAuthController', + 'auth/' => 'PhabricatorOAuthServerAuthController', 'test/(?P\d+)/' => 'PhabricatorOAuthServerTestController', - 'token/' => 'PhabricatorOAuthServerTokenController', + 'token/' => 'PhabricatorOAuthServerTokenController', 'client/' => array( - 'create/' => 'PhabricatorOAuthClientEditController', + 'create/' => 'PhabricatorOAuthClientEditController', 'delete/(?P[^/]+)/' => 'PhabricatorOAuthClientDeleteController', - 'edit/(?P[^/]+)/' => 'PhabricatorOAuthClientEditController', - 'view/(?P[^/]+)/' => 'PhabricatorOAuthClientViewController', + 'edit/(?P[^/]+)/' => 'PhabricatorOAuthClientEditController', + 'view/(?P[^/]+)/' => 'PhabricatorOAuthClientViewController', ), ), ); diff --git a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php index 27ddc3fb52..8504c97ce1 100644 --- a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php +++ b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php @@ -16,7 +16,7 @@ final class PhabricatorOAuthServerAuthorizationsSettingsPanel } public function isEnabled() { - $app_name = 'PhabricatorApplicationOAuthServer'; + $app_name = 'PhabricatorOAuthServerApplication'; return PhabricatorApplication::isClassInstalled($app_name); } @@ -26,7 +26,7 @@ final class PhabricatorOAuthServerAuthorizationsSettingsPanel // TODO: It would be nice to simply disable this panel, but we can't do // viewer-based checks for enabled panels right now. - $app_class = 'PhabricatorApplicationOAuthServer'; + $app_class = 'PhabricatorOAuthServerApplication'; $installed = PhabricatorApplication::isClassInstalledForViewer( $app_class, $viewer); diff --git a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php index 0001a03374..9f2c0b38b3 100644 --- a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php +++ b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php @@ -89,7 +89,7 @@ final class PhabricatorOAuthClientAuthorizationQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationOAuthServer'; + return 'PhabricatorOAuthServerApplication'; } } diff --git a/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php index 64ec0e2bbf..9f181aefe4 100644 --- a/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php +++ b/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php @@ -26,7 +26,6 @@ final class PhabricatorOAuthServerClientQuery $table = new PhabricatorOAuthServerClient(); $conn_r = $table->establishConnection('r'); - $data = queryfx_all( $conn_r, 'SELECT * FROM %T client %Q %Q %Q', @@ -68,7 +67,7 @@ final class PhabricatorOAuthServerClientQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationOAuthServer'; + return 'PhabricatorOAuthServerApplication'; } } diff --git a/src/applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php b/src/applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php index ac777c3f59..5fa7fbcefa 100644 --- a/src/applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php +++ b/src/applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorOAuthServerClientSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationOAuthServer'; + return 'PhabricatorOAuthServerApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -49,7 +49,6 @@ final class PhabricatorOAuthServerClientSearchEngine ->setName('creators') ->setLabel(pht('Creators')) ->setValue($creator_handles)); - } protected function getURI($path) { @@ -84,7 +83,6 @@ final class PhabricatorOAuthServerClientSearchEngine return parent::buildSavedQueryFromBuiltin($query_key); } - protected function getRequiredHandlePHIDsForResultList( array $clients, PhabricatorSavedQuery $query) { diff --git a/src/applications/owners/application/PhabricatorApplicationOwners.php b/src/applications/owners/application/PhabricatorOwnersApplication.php similarity index 94% rename from src/applications/owners/application/PhabricatorApplicationOwners.php rename to src/applications/owners/application/PhabricatorOwnersApplication.php index 19d3f1f6bc..e9f84f21a6 100644 --- a/src/applications/owners/application/PhabricatorApplicationOwners.php +++ b/src/applications/owners/application/PhabricatorOwnersApplication.php @@ -1,6 +1,6 @@ formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationOwners'; + return 'PhabricatorOwnersApplication'; } } diff --git a/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php b/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php index 7d681bc2cc..c0a6c92589 100644 --- a/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php +++ b/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php @@ -8,7 +8,7 @@ final class PhabricatorOwnersPackageDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationOwners'; + return 'PhabricatorOwnersApplication'; } public function loadResults() { diff --git a/src/applications/passphrase/application/PhabricatorApplicationPassphrase.php b/src/applications/passphrase/application/PhabricatorPassphraseApplication.php similarity index 95% rename from src/applications/passphrase/application/PhabricatorApplicationPassphrase.php rename to src/applications/passphrase/application/PhabricatorPassphraseApplication.php index d04e9335b8..c52d8911fb 100644 --- a/src/applications/passphrase/application/PhabricatorApplicationPassphrase.php +++ b/src/applications/passphrase/application/PhabricatorPassphraseApplication.php @@ -1,6 +1,6 @@ pht('Show Only Active Credentials'), 'true' => pht('Show Only Destroyed Credentials'), ))); - } protected function getURI($path) { @@ -55,16 +54,13 @@ final class PassphraseCredentialSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'active' => pht('Active Credentials'), 'all' => pht('All Credentials'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); @@ -116,5 +112,4 @@ final class PassphraseCredentialSearchEngine return $list; } - } diff --git a/src/applications/paste/application/PhabricatorApplicationPaste.php b/src/applications/paste/application/PhabricatorPasteApplication.php similarity index 75% rename from src/applications/paste/application/PhabricatorApplicationPaste.php rename to src/applications/paste/application/PhabricatorPasteApplication.php index 5ba1f211fc..f31618f844 100644 --- a/src/applications/paste/application/PhabricatorApplicationPaste.php +++ b/src/applications/paste/application/PhabricatorPasteApplication.php @@ -1,6 +1,6 @@ 'PhabricatorPasteViewController', '/paste/' => array( '(query/(?P[^/]+)/)?' => 'PhabricatorPasteListController', - 'create/' => 'PhabricatorPasteEditController', - 'edit/(?P[1-9]\d*)/' => 'PhabricatorPasteEditController', - 'comment/(?P[1-9]\d*)/' => 'PhabricatorPasteCommentController', + 'create/' => 'PhabricatorPasteEditController', + 'edit/(?P[1-9]\d*)/' => 'PhabricatorPasteEditController', + 'comment/(?P[1-9]\d*)/' => 'PhabricatorPasteCommentController', ), ); } @@ -44,8 +44,7 @@ final class PhabricatorApplicationPaste extends PhabricatorApplication { protected function getCustomCapabilities() { return array( PasteCapabilityDefaultView::CAPABILITY => array( - 'caption' => pht( - 'Default view policy for newly created pastes.') + 'caption' => pht('Default view policy for newly created pastes.'), ), ); } diff --git a/src/applications/paste/conduit/ConduitAPI_paste_Method.php b/src/applications/paste/conduit/ConduitAPI_paste_Method.php index 0338cf6b7c..1c6da22f94 100644 --- a/src/applications/paste/conduit/ConduitAPI_paste_Method.php +++ b/src/applications/paste/conduit/ConduitAPI_paste_Method.php @@ -3,8 +3,7 @@ abstract class ConduitAPI_paste_Method extends ConduitAPIMethod { public function getApplication() { - return PhabricatorApplication::getByClass( - 'PhabricatorApplicationPaste'); + return PhabricatorApplication::getByClass('PhabricatorPasteApplication'); } protected function buildPasteInfoDictionary(PhabricatorPaste $paste) { diff --git a/src/applications/paste/mail/PasteCreateMailReceiver.php b/src/applications/paste/mail/PasteCreateMailReceiver.php index e75f9d9606..02decaa26e 100644 --- a/src/applications/paste/mail/PasteCreateMailReceiver.php +++ b/src/applications/paste/mail/PasteCreateMailReceiver.php @@ -3,7 +3,7 @@ final class PasteCreateMailReceiver extends PhabricatorMailReceiver { public function isEnabled() { - $app_class = 'PhabricatorApplicationPaste'; + $app_class = 'PhabricatorPasteApplication'; return PhabricatorApplication::isClassInstalled($app_class); } diff --git a/src/applications/paste/mail/PasteMockMailReceiver.php b/src/applications/paste/mail/PasteMockMailReceiver.php index 94f352ce39..6a56db71d8 100644 --- a/src/applications/paste/mail/PasteMockMailReceiver.php +++ b/src/applications/paste/mail/PasteMockMailReceiver.php @@ -3,7 +3,7 @@ final class PasteMockMailReceiver extends PhabricatorObjectMailReceiver { public function isEnabled() { - $app_class = 'PhabricatorApplicationPaste'; + $app_class = 'PhabricatorPasteApplication'; return PhabricatorApplication::isClassInstalled($app_class); } diff --git a/src/applications/paste/query/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php index 934dc3d4ee..75f1f81315 100644 --- a/src/applications/paste/query/PhabricatorPasteQuery.php +++ b/src/applications/paste/query/PhabricatorPasteQuery.php @@ -252,7 +252,7 @@ final class PhabricatorPasteQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationPaste'; + return 'PhabricatorPasteApplication'; } } diff --git a/src/applications/paste/storage/PhabricatorPaste.php b/src/applications/paste/storage/PhabricatorPaste.php index edb34dd806..139177b11b 100644 --- a/src/applications/paste/storage/PhabricatorPaste.php +++ b/src/applications/paste/storage/PhabricatorPaste.php @@ -22,7 +22,7 @@ final class PhabricatorPaste extends PhabricatorPasteDAO public static function initializeNewPaste(PhabricatorUser $actor) { $app = id(new PhabricatorApplicationQuery()) ->setViewer($actor) - ->withClasses(array('PhabricatorApplicationPaste')) + ->withClasses(array('PhabricatorPasteApplication')) ->executeOne(); $view_policy = $app->getPolicy(PasteCapabilityDefaultView::CAPABILITY); @@ -131,5 +131,4 @@ final class PhabricatorPaste extends PhabricatorPasteDAO return pht('The author of a paste can always view and edit it.'); } - } diff --git a/src/applications/people/application/PhabricatorApplicationPeople.php b/src/applications/people/application/PhabricatorPeopleApplication.php similarity index 96% rename from src/applications/people/application/PhabricatorApplicationPeople.php rename to src/applications/people/application/PhabricatorPeopleApplication.php index 37a501903d..441a5a0c0d 100644 --- a/src/applications/people/application/PhabricatorApplicationPeople.php +++ b/src/applications/people/application/PhabricatorPeopleApplication.php @@ -1,6 +1,6 @@ array( - ), + PeopleCapabilityBrowseUserDirectory::CAPABILITY => array(), ); } @@ -158,5 +157,4 @@ final class PhabricatorApplicationPeople extends PhabricatorApplication { return $items; } - } diff --git a/src/applications/people/conduit/ConduitAPI_user_Method.php b/src/applications/people/conduit/ConduitAPI_user_Method.php index 3e779fcf48..d80cb60f73 100644 --- a/src/applications/people/conduit/ConduitAPI_user_Method.php +++ b/src/applications/people/conduit/ConduitAPI_user_Method.php @@ -4,7 +4,7 @@ abstract class ConduitAPI_user_Method extends ConduitAPIMethod { public function getApplication() { return PhabricatorApplication::getByClass( - 'PhabricatorApplicationPeople'); + 'PhabricatorPeopleApplication'); } protected function buildUserInformationDictionary( diff --git a/src/applications/people/customfield/PhabricatorUserStatusField.php b/src/applications/people/customfield/PhabricatorUserStatusField.php index 5ea28c84d0..9ff97054c3 100644 --- a/src/applications/people/customfield/PhabricatorUserStatusField.php +++ b/src/applications/people/customfield/PhabricatorUserStatusField.php @@ -23,7 +23,7 @@ final class PhabricatorUserStatusField public function isFieldEnabled() { return PhabricatorApplication::isClassInstalled( - 'PhabricatorApplicationCalendar'); + 'PhabricatorCalendarApplication'); } public function renderPropertyViewValue(array $handles) { diff --git a/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php b/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php index e657aecf40..b74fbf2eac 100644 --- a/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php +++ b/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php @@ -38,7 +38,7 @@ final class PhabricatorPeopleHovercardEventListener } else if (!$user->isUserActivated()) { $hovercard->addField(pht('Account'), pht('Not Activated')); } else if (PhabricatorApplication::isClassInstalledForViewer( - 'PhabricatorApplicationCalendar', + 'PhabricatorCalendarApplication', $viewer)) { $statuses = id(new PhabricatorCalendarEvent())->loadCurrentStatuses( array($user->getPHID())); diff --git a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php b/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php index 4be443a566..eac4231f84 100644 --- a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php +++ b/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php @@ -9,7 +9,7 @@ final class PhabricatorPeoplePHIDTypeUser extends PhabricatorPHIDType { } public function getPHIDTypeApplicationClass() { - return 'PhabricatorApplicationPeople'; + return 'PhabricatorPeopleApplication'; } public function getTypeIcon() { diff --git a/src/applications/people/query/PhabricatorPeopleLogQuery.php b/src/applications/people/query/PhabricatorPeopleLogQuery.php index 3ac4e6ad4e..a12a07310b 100644 --- a/src/applications/people/query/PhabricatorPeopleLogQuery.php +++ b/src/applications/people/query/PhabricatorPeopleLogQuery.php @@ -107,7 +107,7 @@ final class PhabricatorPeopleLogQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationPeople'; + return 'PhabricatorPeopleApplication'; } } diff --git a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php index 772ae6005e..301e67757d 100644 --- a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php +++ b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorPeopleLogSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationPeople'; + return 'PhabricatorPeopleApplication'; } public function getPageSize(PhabricatorSavedQuery $saved) { diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php index f1ec4376e8..f61f40ae0c 100644 --- a/src/applications/people/query/PhabricatorPeopleQuery.php +++ b/src/applications/people/query/PhabricatorPeopleQuery.php @@ -297,7 +297,7 @@ final class PhabricatorPeopleQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationPeople'; + return 'PhabricatorPeopleApplication'; } } diff --git a/src/applications/people/query/PhabricatorPeopleSearchEngine.php b/src/applications/people/query/PhabricatorPeopleSearchEngine.php index 6021815a11..2b8e2c7cf1 100644 --- a/src/applications/people/query/PhabricatorPeopleSearchEngine.php +++ b/src/applications/people/query/PhabricatorPeopleSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorPeopleSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationPeople'; + return 'PhabricatorPeopleApplication'; } public function getCustomFieldObject() { diff --git a/src/applications/people/typeahead/PhabricatorPeopleDatasource.php b/src/applications/people/typeahead/PhabricatorPeopleDatasource.php index d0f9aa2d18..c9e8381c35 100644 --- a/src/applications/people/typeahead/PhabricatorPeopleDatasource.php +++ b/src/applications/people/typeahead/PhabricatorPeopleDatasource.php @@ -20,7 +20,7 @@ final class PhabricatorPeopleDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationPeople'; + return 'PhabricatorPeopleApplication'; } public function loadResults() { diff --git a/src/applications/phame/application/PhabricatorApplicationPhame.php b/src/applications/phame/application/PhabricatorApplicationPhame.php deleted file mode 100644 index e66e02c871..0000000000 --- a/src/applications/phame/application/PhabricatorApplicationPhame.php +++ /dev/null @@ -1,62 +0,0 @@ - array( - '' => 'PhamePostListController', - 'r/(?P\d+)/(?P[^/]+)/(?P.*)' - => 'PhameResourceController', - - 'live/(?P[^/]+)/(?P.*)' => 'PhameBlogLiveController', - 'post/' => array( - '(?:(?Pdraft|all)/)?' => 'PhamePostListController', - 'blogger/(?P[\w\.-_]+)/' => 'PhamePostListController', - 'delete/(?P[^/]+)/' => 'PhamePostDeleteController', - 'edit/(?:(?P[^/]+)/)?' => 'PhamePostEditController', - 'view/(?P\d+)/' => 'PhamePostViewController', - 'publish/(?P\d+)/' => 'PhamePostPublishController', - 'unpublish/(?P\d+)/' => 'PhamePostUnpublishController', - 'notlive/(?P\d+)/' => 'PhamePostNotLiveController', - 'preview/' => 'PhamePostPreviewController', - 'framed/(?P\d+)/' => 'PhamePostFramedController', - 'new/' => 'PhamePostNewController', - 'move/(?P\d+)/' => 'PhamePostNewController' - ), - 'blog/' => array( - '(?:(?Puser|all)/)?' => 'PhameBlogListController', - 'delete/(?P[^/]+)/' => 'PhameBlogDeleteController', - 'edit/(?P[^/]+)/' => 'PhameBlogEditController', - 'view/(?P[^/]+)/' => 'PhameBlogViewController', - 'feed/(?P[^/]+)/' => 'PhameBlogFeedController', - 'new/' => 'PhameBlogEditController', - ), - ), - ); - } -} diff --git a/src/applications/phame/application/PhabricatorPhameApplication.php b/src/applications/phame/application/PhabricatorPhameApplication.php new file mode 100644 index 0000000000..060ef7723d --- /dev/null +++ b/src/applications/phame/application/PhabricatorPhameApplication.php @@ -0,0 +1,63 @@ + array( + '' => 'PhamePostListController', + 'r/(?P\d+)/(?P[^/]+)/(?P.*)' + => 'PhameResourceController', + + 'live/(?P[^/]+)/(?P.*)' => 'PhameBlogLiveController', + 'post/' => array( + '(?:(?Pdraft|all)/)?' => 'PhamePostListController', + 'blogger/(?P[\w\.-_]+)/' => 'PhamePostListController', + 'delete/(?P[^/]+)/' => 'PhamePostDeleteController', + 'edit/(?:(?P[^/]+)/)?' => 'PhamePostEditController', + 'view/(?P\d+)/' => 'PhamePostViewController', + 'publish/(?P\d+)/' => 'PhamePostPublishController', + 'unpublish/(?P\d+)/' => 'PhamePostUnpublishController', + 'notlive/(?P\d+)/' => 'PhamePostNotLiveController', + 'preview/' => 'PhamePostPreviewController', + 'framed/(?P\d+)/' => 'PhamePostFramedController', + 'new/' => 'PhamePostNewController', + 'move/(?P\d+)/' => 'PhamePostNewController' + ), + 'blog/' => array( + '(?:(?Puser|all)/)?' => 'PhameBlogListController', + 'delete/(?P[^/]+)/' => 'PhameBlogDeleteController', + 'edit/(?P[^/]+)/' => 'PhameBlogEditController', + 'view/(?P[^/]+)/' => 'PhameBlogViewController', + 'feed/(?P[^/]+)/' => 'PhameBlogFeedController', + 'new/' => 'PhameBlogEditController', + ), + ), + ); + } + +} diff --git a/src/applications/phame/conduit/ConduitAPI_phame_Method.php b/src/applications/phame/conduit/ConduitAPI_phame_Method.php index 47159513ae..93d08fdba2 100644 --- a/src/applications/phame/conduit/ConduitAPI_phame_Method.php +++ b/src/applications/phame/conduit/ConduitAPI_phame_Method.php @@ -3,7 +3,7 @@ abstract class ConduitAPI_phame_Method extends ConduitAPIMethod { public function getApplication() { - return PhabricatorApplication::getByClass('PhabricatorApplicationPhame'); + return PhabricatorApplication::getByClass('PhabricatorPhameApplication'); } } diff --git a/src/applications/phid/query/PhabricatorObjectListQuery.php b/src/applications/phid/query/PhabricatorObjectListQuery.php index 97a0c16938..ba69802ba6 100644 --- a/src/applications/phid/query/PhabricatorObjectListQuery.php +++ b/src/applications/phid/query/PhabricatorObjectListQuery.php @@ -144,7 +144,7 @@ final class PhabricatorObjectListQuery { } $mailing_list_app = PhabricatorApplication::getByClass( - 'PhabricatorApplicationMailingLists'); + 'PhabricatorMailingListsApplication'); if ($mailing_list_app->isInstalled()) { if ($names) { // We still haven't been able to resolve everything; try mailing lists diff --git a/src/applications/phlux/application/PhabricatorApplicationPhlux.php b/src/applications/phlux/application/PhabricatorPhluxApplication.php similarity index 91% rename from src/applications/phlux/application/PhabricatorApplicationPhlux.php rename to src/applications/phlux/application/PhabricatorPhluxApplication.php index c6e42598cc..097248d389 100644 --- a/src/applications/phlux/application/PhabricatorApplicationPhlux.php +++ b/src/applications/phlux/application/PhabricatorPhluxApplication.php @@ -1,6 +1,6 @@ newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/pholio/storage/PholioMock.php b/src/applications/pholio/storage/PholioMock.php index c4c1e58f67..98a99c393f 100644 --- a/src/applications/pholio/storage/PholioMock.php +++ b/src/applications/pholio/storage/PholioMock.php @@ -32,7 +32,7 @@ final class PholioMock extends PholioDAO public static function initializeNewMock(PhabricatorUser $actor) { $app = id(new PhabricatorApplicationQuery()) ->setViewer($actor) - ->withClasses(array('PhabricatorApplicationPholio')) + ->withClasses(array('PhabricatorPholioApplication')) ->executeOne(); $view_policy = $app->getPolicy(PholioCapabilityDefaultView::CAPABILITY); diff --git a/src/applications/phortune/application/PhabricatorApplicationPhortune.php b/src/applications/phortune/application/PhabricatorPhortuneApplication.php similarity index 95% rename from src/applications/phortune/application/PhabricatorApplicationPhortune.php rename to src/applications/phortune/application/PhabricatorPhortuneApplication.php index 72d6dd3c1a..c8241ae104 100644 --- a/src/applications/phortune/application/PhabricatorApplicationPhortune.php +++ b/src/applications/phortune/application/PhabricatorPhortuneApplication.php @@ -1,6 +1,6 @@ getProviderKey()); - $app = PhabricatorApplication::getByClass('PhabricatorApplicationPhortune'); + $app = PhabricatorApplication::getByClass('PhabricatorPhortuneApplication'); $path = $app->getBaseURI().'provider/'.$digest.'/'.$action.'/'; $uri = new PhutilURI($path); diff --git a/src/applications/phortune/query/PhortuneAccountQuery.php b/src/applications/phortune/query/PhortuneAccountQuery.php index 6feb7aace3..87a09d02d6 100644 --- a/src/applications/phortune/query/PhortuneAccountQuery.php +++ b/src/applications/phortune/query/PhortuneAccountQuery.php @@ -95,9 +95,8 @@ final class PhortuneAccountQuery return implode(' ', $joins); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationPhortune'; + return 'PhabricatorPhortuneApplication'; } } diff --git a/src/applications/phortune/query/PhortunePaymentMethodQuery.php b/src/applications/phortune/query/PhortunePaymentMethodQuery.php index 7623af9e1a..e165363380 100644 --- a/src/applications/phortune/query/PhortunePaymentMethodQuery.php +++ b/src/applications/phortune/query/PhortunePaymentMethodQuery.php @@ -110,9 +110,8 @@ final class PhortunePaymentMethodQuery return $this->formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationPhortune'; + return 'PhabricatorPhortuneApplication'; } } diff --git a/src/applications/phortune/query/PhortuneProductQuery.php b/src/applications/phortune/query/PhortuneProductQuery.php index 28c17ce2cf..6d05fc227c 100644 --- a/src/applications/phortune/query/PhortuneProductQuery.php +++ b/src/applications/phortune/query/PhortuneProductQuery.php @@ -54,7 +54,7 @@ final class PhortuneProductQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationPhortune'; + return 'PhabricatorPhortuneApplication'; } } diff --git a/src/applications/phpast/application/PhabricatorApplicationPHPAST.php b/src/applications/phpast/application/PhabricatorPHPASTApplication.php similarity index 93% rename from src/applications/phpast/application/PhabricatorApplicationPHPAST.php rename to src/applications/phpast/application/PhabricatorPHPASTApplication.php index 37b6258601..55673683b9 100644 --- a/src/applications/phpast/application/PhabricatorApplicationPHPAST.php +++ b/src/applications/phpast/application/PhabricatorPHPASTApplication.php @@ -1,6 +1,6 @@ array( - ), + PhragmentCapabilityCanCreate::CAPABILITY => array(), ); } diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php b/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php index 74b3d56a10..48a81fdf4f 100644 --- a/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php +++ b/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php @@ -4,7 +4,7 @@ abstract class ConduitAPI_phragment_Method extends ConduitAPIMethod { public function getApplication() { return PhabricatorApplication::getByClass( - 'PhabricatorApplicationPhragment'); + 'PhabricatorPhragmentApplication'); } } diff --git a/src/applications/phragment/query/PhragmentFragmentQuery.php b/src/applications/phragment/query/PhragmentFragmentQuery.php index 5301b2f5df..a36ebf6a41 100644 --- a/src/applications/phragment/query/PhragmentFragmentQuery.php +++ b/src/applications/phragment/query/PhragmentFragmentQuery.php @@ -125,6 +125,6 @@ final class PhragmentFragmentQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationPhragment'; + return 'PhabricatorPhragmentApplication'; } } diff --git a/src/applications/phragment/query/PhragmentFragmentVersionQuery.php b/src/applications/phragment/query/PhragmentFragmentVersionQuery.php index 264a89cf89..2bc76ae53c 100644 --- a/src/applications/phragment/query/PhragmentFragmentVersionQuery.php +++ b/src/applications/phragment/query/PhragmentFragmentVersionQuery.php @@ -118,6 +118,6 @@ final class PhragmentFragmentVersionQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationPhragment'; + return 'PhabricatorPhragmentApplication'; } } diff --git a/src/applications/phragment/query/PhragmentSnapshotChildQuery.php b/src/applications/phragment/query/PhragmentSnapshotChildQuery.php index 276510eaae..5564408bdd 100644 --- a/src/applications/phragment/query/PhragmentSnapshotChildQuery.php +++ b/src/applications/phragment/query/PhragmentSnapshotChildQuery.php @@ -169,6 +169,6 @@ final class PhragmentSnapshotChildQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationPhragment'; + return 'PhabricatorPhragmentApplication'; } } diff --git a/src/applications/phragment/query/PhragmentSnapshotQuery.php b/src/applications/phragment/query/PhragmentSnapshotQuery.php index 4a6e47c8ab..f68e16d1df 100644 --- a/src/applications/phragment/query/PhragmentSnapshotQuery.php +++ b/src/applications/phragment/query/PhragmentSnapshotQuery.php @@ -105,6 +105,7 @@ final class PhragmentSnapshotQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationPhragment'; + return 'PhabricatorPhragmentApplication'; } + } diff --git a/src/applications/phrequent/application/PhabricatorApplicationPhrequent.php b/src/applications/phrequent/application/PhabricatorPhrequentApplication.php similarity index 95% rename from src/applications/phrequent/application/PhabricatorApplicationPhrequent.php rename to src/applications/phrequent/application/PhabricatorPhrequentApplication.php index 4bcccef60d..618a00ccfc 100644 --- a/src/applications/phrequent/application/PhabricatorApplicationPhrequent.php +++ b/src/applications/phrequent/application/PhabricatorPhrequentApplication.php @@ -1,6 +1,6 @@ pht('Currently Tracking'), 'all' => pht('All Tracked'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); @@ -203,4 +199,5 @@ final class PhrequentSearchEngine return $view; } + } diff --git a/src/applications/phrequent/query/PhrequentUserTimeQuery.php b/src/applications/phrequent/query/PhrequentUserTimeQuery.php index 9fc382674b..c173741c7a 100644 --- a/src/applications/phrequent/query/PhrequentUserTimeQuery.php +++ b/src/applications/phrequent/query/PhrequentUserTimeQuery.php @@ -302,9 +302,8 @@ final class PhrequentUserTimeQuery return $sum_ended['N'] + $sum_not_ended['N']; } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationPhrequent'; + return 'PhabricatorPhrequentApplication'; } } diff --git a/src/applications/phriction/application/PhabricatorApplicationPhriction.php b/src/applications/phriction/application/PhabricatorPhrictionApplication.php similarity index 92% rename from src/applications/phriction/application/PhabricatorApplicationPhriction.php rename to src/applications/phriction/application/PhabricatorPhrictionApplication.php index b66d6c9c49..a1d4eb9034 100644 --- a/src/applications/phriction/application/PhabricatorApplicationPhriction.php +++ b/src/applications/phriction/application/PhabricatorPhrictionApplication.php @@ -1,6 +1,6 @@ [1-9]\d*)/)?' => 'PhrictionEditController', 'delete/(?P[1-9]\d*)/' => 'PhrictionDeleteController', 'new/' => 'PhrictionNewController', - 'move/(?:(?P[1-9]\d*)/)?' => 'PhrictionMoveController', + 'move/(?:(?P[1-9]\d*)/)?' => 'PhrictionMoveController', 'preview/' => 'PhabricatorMarkupPreviewController', 'diff/(?P[1-9]\d*)/' => 'PhrictionDiffController', diff --git a/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php b/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php index b6fb2bdad6..8910727569 100644 --- a/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php +++ b/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php @@ -4,7 +4,7 @@ abstract class ConduitAPI_phriction_Method extends ConduitAPIMethod { public function getApplication() { return PhabricatorApplication::getByClass( - 'PhabricatorApplicationPhriction'); + 'PhabricatorPhrictionApplication'); } final protected function buildDocumentInfoDictionary(PhrictionDocument $doc) { diff --git a/src/applications/phriction/phid/PhrictionPHIDTypeDocument.php b/src/applications/phriction/phid/PhrictionPHIDTypeDocument.php index f043db7b18..88522233e1 100644 --- a/src/applications/phriction/phid/PhrictionPHIDTypeDocument.php +++ b/src/applications/phriction/phid/PhrictionPHIDTypeDocument.php @@ -9,7 +9,7 @@ final class PhrictionPHIDTypeDocument extends PhabricatorPHIDType { } public function getPHIDTypeApplicationClass() { - return 'PhabricatorApplicationPhriction'; + return 'PhabricatorPhrictionApplication'; } public function newObject() { diff --git a/src/applications/phriction/query/PhrictionDocumentQuery.php b/src/applications/phriction/query/PhrictionDocumentQuery.php index c673f988b2..8d35430d64 100644 --- a/src/applications/phriction/query/PhrictionDocumentQuery.php +++ b/src/applications/phriction/query/PhrictionDocumentQuery.php @@ -267,9 +267,8 @@ final class PhrictionDocumentQuery } } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationPhriction'; + return 'PhabricatorPhrictionApplication'; } } diff --git a/src/applications/policy/application/PhabricatorApplicationPolicy.php b/src/applications/policy/application/PhabricatorPolicyApplication.php similarity index 86% rename from src/applications/policy/application/PhabricatorApplicationPolicy.php rename to src/applications/policy/application/PhabricatorPolicyApplication.php index 68dbbea1d6..1dba13644c 100644 --- a/src/applications/policy/application/PhabricatorApplicationPolicy.php +++ b/src/applications/policy/application/PhabricatorPolicyApplication.php @@ -1,6 +1,6 @@ \d+)/' => 'PonderQuestionCommentController', 'question/history/(?P\d+)/' => 'PonderQuestionHistoryController', 'preview/' => 'PhabricatorMarkupPreviewController', - 'question/(?Popen|close)/(?P[1-9]\d*)/' => - 'PonderQuestionStatusController', + 'question/(?Popen|close)/(?P[1-9]\d*)/' + => 'PonderQuestionStatusController', 'vote/' => 'PonderVoteSaveController', ), ); diff --git a/src/applications/ponder/mail/PonderQuestionMailReceiver.php b/src/applications/ponder/mail/PonderQuestionMailReceiver.php index 58511e1f00..1239927853 100644 --- a/src/applications/ponder/mail/PonderQuestionMailReceiver.php +++ b/src/applications/ponder/mail/PonderQuestionMailReceiver.php @@ -3,7 +3,7 @@ final class PonderQuestionMailReceiver extends PhabricatorObjectMailReceiver { public function isEnabled() { - $app_class = 'PhabricatorApplicationPonder'; + $app_class = 'PhabricatorPonderApplication'; return PhabricatorApplication::isClassInstalled($app_class); } diff --git a/src/applications/ponder/phid/PonderPHIDTypeQuestion.php b/src/applications/ponder/phid/PonderPHIDTypeQuestion.php index d057241a95..e70f5f3d76 100644 --- a/src/applications/ponder/phid/PonderPHIDTypeQuestion.php +++ b/src/applications/ponder/phid/PonderPHIDTypeQuestion.php @@ -9,7 +9,7 @@ final class PonderPHIDTypeQuestion extends PhabricatorPHIDType { } public function getPHIDTypeApplicationClass() { - return 'PhabricatorApplicationPonder'; + return 'PhabricatorPonderApplication'; } public function newObject() { diff --git a/src/applications/ponder/query/PonderAnswerQuery.php b/src/applications/ponder/query/PonderAnswerQuery.php index df6e679b5a..3877af8656 100644 --- a/src/applications/ponder/query/PonderAnswerQuery.php +++ b/src/applications/ponder/query/PonderAnswerQuery.php @@ -115,7 +115,6 @@ final class PonderAnswerQuery } } - return $answers; } @@ -123,9 +122,8 @@ final class PonderAnswerQuery return true; } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationPonder'; + return 'PhabricatorPonderApplication'; } } diff --git a/src/applications/ponder/query/PonderQuestionQuery.php b/src/applications/ponder/query/PonderQuestionQuery.php index eeec6b8071..132362a8d3 100644 --- a/src/applications/ponder/query/PonderQuestionQuery.php +++ b/src/applications/ponder/query/PonderQuestionQuery.php @@ -194,9 +194,8 @@ final class PonderQuestionQuery return implode(' ', $joins); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationPonder'; + return 'PhabricatorPonderApplication'; } } diff --git a/src/applications/ponder/query/PonderQuestionSearchEngine.php b/src/applications/ponder/query/PonderQuestionSearchEngine.php index 8be8ec1b9c..c4e22000df 100644 --- a/src/applications/ponder/query/PonderQuestionSearchEngine.php +++ b/src/applications/ponder/query/PonderQuestionSearchEngine.php @@ -8,7 +8,7 @@ final class PonderQuestionSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationPonder'; + return 'PhabricatorPonderApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { diff --git a/src/applications/project/application/PhabricatorApplicationProject.php b/src/applications/project/application/PhabricatorProjectApplication.php similarity index 83% rename from src/applications/project/application/PhabricatorApplicationProject.php rename to src/applications/project/application/PhabricatorProjectApplication.php index cd33f9cabb..e5f0333479 100644 --- a/src/applications/project/application/PhabricatorApplicationProject.php +++ b/src/applications/project/application/PhabricatorProjectApplication.php @@ -1,6 +1,6 @@ [1-9]\d*)/' => 'PhabricatorProjectEditMainController', 'details/(?P[1-9]\d*)/' => 'PhabricatorProjectEditDetailsController', - 'archive/(?P[1-9]\d*)/' => - 'PhabricatorProjectArchiveController', + 'archive/(?P[1-9]\d*)/' + => 'PhabricatorProjectArchiveController', 'members/(?P[1-9]\d*)/' => 'PhabricatorProjectMembersEditController', 'members/(?P[1-9]\d*)/remove/' => 'PhabricatorProjectMembersRemoveController', 'view/(?P[1-9]\d*)/' => 'PhabricatorProjectProfileController', - 'picture/(?P[1-9]\d*)/' => - 'PhabricatorProjectEditPictureController', - 'icon/(?P[1-9]\d*)/' => - 'PhabricatorProjectEditIconController', + 'picture/(?P[1-9]\d*)/' + => 'PhabricatorProjectEditPictureController', + 'icon/(?P[1-9]\d*)/' + => 'PhabricatorProjectEditIconController', 'create/' => 'PhabricatorProjectCreateController', 'board/(?P[1-9]\d*)/'. '(?Pfilter/)?'. - '(?:query/(?P[^/]+)/)?' => - 'PhabricatorProjectBoardViewController', + '(?:query/(?P[^/]+)/)?' + => 'PhabricatorProjectBoardViewController', 'move/(?P[1-9]\d*)/' => 'PhabricatorProjectMoveController', 'board/(?P[1-9]\d*)/' => array( 'edit/(?:(?P\d+)/)?' @@ -90,8 +90,7 @@ final class PhabricatorApplicationProject extends PhabricatorApplication { protected function getCustomCapabilities() { return array( - ProjectCapabilityCreateProjects::CAPABILITY => array( - ), + ProjectCapabilityCreateProjects::CAPABILITY => array(), ); } diff --git a/src/applications/project/conduit/ConduitAPI_project_Method.php b/src/applications/project/conduit/ConduitAPI_project_Method.php index 12c191e75c..3a55919ee5 100644 --- a/src/applications/project/conduit/ConduitAPI_project_Method.php +++ b/src/applications/project/conduit/ConduitAPI_project_Method.php @@ -3,8 +3,7 @@ abstract class ConduitAPI_project_Method extends ConduitAPIMethod { public function getApplication() { - return PhabricatorApplication::getByClass( - 'PhabricatorApplicationProject'); + return PhabricatorApplication::getByClass('PhabricatorProjectApplication'); } protected function buildProjectInfoDictionary(PhabricatorProject $project) { diff --git a/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php b/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php index 5b78350fae..73df5dad8b 100644 --- a/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php +++ b/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php @@ -9,7 +9,7 @@ final class PhabricatorProjectPHIDTypeProject extends PhabricatorPHIDType { } public function getPHIDTypeApplicationClass() { - return 'PhabricatorApplicationProject'; + return 'PhabricatorProjectApplication'; } public function getTypeIcon() { @@ -107,5 +107,4 @@ final class PhabricatorProjectPHIDTypeProject extends PhabricatorPHIDType { return phutil_utf8_strtolower($slug); } - } diff --git a/src/applications/project/query/PhabricatorProjectColumnQuery.php b/src/applications/project/query/PhabricatorProjectColumnQuery.php index 89cd8a7069..d369161fe3 100644 --- a/src/applications/project/query/PhabricatorProjectColumnQuery.php +++ b/src/applications/project/query/PhabricatorProjectColumnQuery.php @@ -106,7 +106,7 @@ final class PhabricatorProjectColumnQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationProject'; + return 'PhabricatorProjectApplication'; } } diff --git a/src/applications/project/query/PhabricatorProjectQuery.php b/src/applications/project/query/PhabricatorProjectQuery.php index 9f15c2c0ec..c0beaf2742 100644 --- a/src/applications/project/query/PhabricatorProjectQuery.php +++ b/src/applications/project/query/PhabricatorProjectQuery.php @@ -350,9 +350,8 @@ final class PhabricatorProjectQuery return implode(' ', $joins); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationProject'; + return 'PhabricatorProjectApplication'; } protected function getApplicationSearchObjectPHIDColumn() { diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php index 7120682cfb..0b0f94ba0c 100644 --- a/src/applications/project/query/PhabricatorProjectSearchEngine.php +++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorProjectSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationProject'; + return 'PhabricatorProjectApplication'; } public function getCustomFieldObject() { @@ -108,7 +108,6 @@ final class PhabricatorProjectSearchEngine } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/project/typeahead/PhabricatorProjectDatasource.php b/src/applications/project/typeahead/PhabricatorProjectDatasource.php index 40ffc28724..e57e3740ce 100644 --- a/src/applications/project/typeahead/PhabricatorProjectDatasource.php +++ b/src/applications/project/typeahead/PhabricatorProjectDatasource.php @@ -8,7 +8,7 @@ final class PhabricatorProjectDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationProject'; + return 'PhabricatorProjectApplication'; } public function loadResults() { diff --git a/src/applications/releeph/application/PhabricatorApplicationReleeph.php b/src/applications/releeph/application/PhabricatorReleephApplication.php similarity index 76% rename from src/applications/releeph/application/PhabricatorApplicationReleeph.php rename to src/applications/releeph/application/PhabricatorReleephApplication.php index 78691c3772..91e8246f85 100644 --- a/src/applications/releeph/application/PhabricatorApplicationReleeph.php +++ b/src/applications/releeph/application/PhabricatorReleephApplication.php @@ -1,6 +1,6 @@ array( - 'edit/(?P[1-9]\d*)/' => - 'ReleephBranchEditController', - '(?Pclose|re-open)/(?P[1-9]\d*)/' => - 'ReleephBranchAccessController', + 'edit/(?P[1-9]\d*)/' + => 'ReleephBranchEditController', + '(?Pclose|re-open)/(?P[1-9]\d*)/' + => 'ReleephBranchAccessController', 'preview/' => 'ReleephBranchNamePreviewController', '(?P[1-9]\d*)/' => array( 'history/' => 'ReleephBranchHistoryController', '(?:query/(?P[^/]+)/)?' => 'ReleephBranchViewController', ), - 'pull/(?P[1-9]\d*)/' => - 'ReleephRequestEditController', + 'pull/(?P[1-9]\d*)/' + => 'ReleephRequestEditController', ), 'request/' => array( @@ -68,14 +68,14 @@ final class PhabricatorApplicationReleeph extends PhabricatorApplication { 'D(?P[1-9]\d*)' => 'ReleephRequestDifferentialCreateController', ), - 'edit/(?P[1-9]\d*)/' => - 'ReleephRequestEditController', - 'action/(?P.+)/(?P[1-9]\d*)/' => - 'ReleephRequestActionController', + 'edit/(?P[1-9]\d*)/' + => 'ReleephRequestEditController', + 'action/(?P.+)/(?P[1-9]\d*)/' + => 'ReleephRequestActionController', 'typeahead/' => 'ReleephRequestTypeaheadController', - 'comment/(?P[1-9]\d*)/' => - 'ReleephRequestCommentController', + 'comment/(?P[1-9]\d*)/' + => 'ReleephRequestCommentController', ), ) ); diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_Method.php b/src/applications/releeph/conduit/ConduitAPI_releeph_Method.php index 5d055f8c63..e8fe113e21 100644 --- a/src/applications/releeph/conduit/ConduitAPI_releeph_Method.php +++ b/src/applications/releeph/conduit/ConduitAPI_releeph_Method.php @@ -11,7 +11,7 @@ abstract class ConduitAPI_releeph_Method extends ConduitAPIMethod { } public function getApplication() { - return PhabricatorApplication::getByClass('PhabricatorApplicationReleeph'); + return PhabricatorApplication::getByClass('PhabricatorReleephApplication'); } } diff --git a/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php b/src/applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php similarity index 97% rename from src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php rename to src/applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php index d32db47069..6f54a7ceb2 100644 --- a/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php +++ b/src/applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php @@ -1,6 +1,6 @@ formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationReleeph'; + return 'PhabricatorReleephApplication'; } } diff --git a/src/applications/releeph/query/ReleephProductQuery.php b/src/applications/releeph/query/ReleephProductQuery.php index a475168cb5..9e826235f8 100644 --- a/src/applications/releeph/query/ReleephProductQuery.php +++ b/src/applications/releeph/query/ReleephProductQuery.php @@ -83,7 +83,6 @@ final class ReleephProductQuery } public function didFilterPage(array $products) { - if ($this->needArcanistProjects) { $project_ids = array_filter(mpull($products, 'getArcanistProjectID')); if ($project_ids) { @@ -104,7 +103,6 @@ final class ReleephProductQuery return $products; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); @@ -169,7 +167,7 @@ final class ReleephProductQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationReleeph'; + return 'PhabricatorReleephApplication'; } } diff --git a/src/applications/releeph/query/ReleephProductSearchEngine.php b/src/applications/releeph/query/ReleephProductSearchEngine.php index 9db638edc6..e3fe499266 100644 --- a/src/applications/releeph/query/ReleephProductSearchEngine.php +++ b/src/applications/releeph/query/ReleephProductSearchEngine.php @@ -8,7 +8,7 @@ final class ReleephProductSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationReleeph'; + return 'PhabricatorReleephApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -43,7 +43,6 @@ final class ReleephProductSearchEngine ->setLabel(pht('Show Products')) ->setValue($saved_query->getParameter('active')) ->setOptions($this->getActiveOptions())); - } protected function getURI($path) { @@ -51,16 +50,13 @@ final class ReleephProductSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'active' => pht('Active'), 'all' => pht('All'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); @@ -134,5 +130,4 @@ final class ReleephProductSearchEngine return $list; } - } diff --git a/src/applications/releeph/query/ReleephRequestQuery.php b/src/applications/releeph/query/ReleephRequestQuery.php index 5a0a0056d2..41ea0f6954 100644 --- a/src/applications/releeph/query/ReleephRequestQuery.php +++ b/src/applications/releeph/query/ReleephRequestQuery.php @@ -79,7 +79,6 @@ final class ReleephRequestQuery } public function willFilterPage(array $requests) { - // Load requested objects: you must be able to see an object to see // requests for it. $object_phids = mpull($requests, 'getRequestedObjectPHID'); @@ -241,9 +240,8 @@ final class ReleephRequestQuery } } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationReleeph'; + return 'PhabricatorReleephApplication'; } } diff --git a/src/applications/repository/application/PhabricatorApplicationRepositories.php b/src/applications/repository/application/PhabricatorRepositoriesApplication.php similarity index 56% rename from src/applications/repository/application/PhabricatorApplicationRepositories.php rename to src/applications/repository/application/PhabricatorRepositoriesApplication.php index 051da3660c..5c4011ba02 100644 --- a/src/applications/repository/application/PhabricatorApplicationRepositories.php +++ b/src/applications/repository/application/PhabricatorRepositoriesApplication.php @@ -1,6 +1,6 @@ array( - '' => 'PhabricatorRepositoryListController', - 'project/edit/(?P[1-9]\d*)/' => - 'PhabricatorRepositoryArcanistProjectEditController', - 'project/delete/(?P[1-9]\d*)/' => - 'PhabricatorRepositoryArcanistProjectDeleteController', + '' => 'PhabricatorRepositoryListController', + 'project/edit/(?P[1-9]\d*)/' + => 'PhabricatorRepositoryArcanistProjectEditController', + 'project/delete/(?P[1-9]\d*)/' + => 'PhabricatorRepositoryArcanistProjectDeleteController', ), ); } diff --git a/src/applications/repository/conduit/ConduitAPI_repository_Method.php b/src/applications/repository/conduit/ConduitAPI_repository_Method.php index 6dcf3eeb25..cc859822f8 100644 --- a/src/applications/repository/conduit/ConduitAPI_repository_Method.php +++ b/src/applications/repository/conduit/ConduitAPI_repository_Method.php @@ -4,7 +4,7 @@ abstract class ConduitAPI_repository_Method extends ConduitAPIMethod { public function getApplication() { return PhabricatorApplication::getByClass( - 'PhabricatorApplicationDiffusion'); + 'PhabricatorDiffusionApplication'); } } diff --git a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php b/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php index cf7ee730d6..5e0d106ee9 100644 --- a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php +++ b/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php @@ -58,7 +58,7 @@ final class ConduitAPI_repository_create_Method protected function execute(ConduitAPIRequest $request) { $application = id(new PhabricatorApplicationQuery()) ->setViewer($request->getUser()) - ->withClasses(array('PhabricatorApplicationDiffusion')) + ->withClasses(array('PhabricatorDiffusionApplication')) ->executeOne(); PhabricatorPolicyFilter::requireCapability( diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php b/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php index acd548de05..9b43349962 100644 --- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php +++ b/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php @@ -9,7 +9,7 @@ final class PhabricatorRepositoryPHIDTypeCommit extends PhabricatorPHIDType { } public function getPHIDTypeApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } public function newObject() { @@ -61,7 +61,6 @@ final class PhabricatorRepositoryPHIDTypeCommit extends PhabricatorPHIDType { '[a-f0-9]{'.$min_unqualified.',40}'; } - public function canLoadNamedObject($name) { $pattern = self::getCommitObjectNamePattern(); return preg_match('(^'.$pattern.'$)', $name); diff --git a/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php b/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php index 2f8f7fc96e..160c6cacb4 100644 --- a/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php @@ -63,7 +63,6 @@ final class PhabricatorRepositoryMirrorQuery return $mirrors; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); @@ -93,9 +92,8 @@ final class PhabricatorRepositoryMirrorQuery return $this->formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } } diff --git a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php index 49af5a4617..9f3a8c0863 100644 --- a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php @@ -124,9 +124,8 @@ final class PhabricatorRepositoryPushEventQuery return $this->formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } } diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php index cfd437242e..d76ee930e4 100644 --- a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php @@ -82,7 +82,6 @@ final class PhabricatorRepositoryPushLogQuery return $logs; } - private function buildWhereClause(AphrontDatabaseConnection $conn_r) { $where = array(); @@ -140,9 +139,8 @@ final class PhabricatorRepositoryPushLogQuery return $this->formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } } diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php index cb4f1fdd8e..673efe67e9 100644 --- a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php +++ b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorRepositoryPushLogSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -91,15 +91,12 @@ final class PhabricatorRepositoryPushLogSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'all' => pht('All Push Logs'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php index 8423adf486..d56540dc65 100644 --- a/src/applications/repository/query/PhabricatorRepositoryQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php @@ -102,7 +102,6 @@ final class PhabricatorRepositoryQuery return $this; } - protected function loadPage() { $table = new PhabricatorRepository(); $conn_r = $table->establishConnection('r'); @@ -237,7 +236,6 @@ final class PhabricatorRepositoryQuery } protected function getPagingColumn() { - $order = $this->order; switch ($order) { case self::ORDER_CREATED: @@ -424,7 +422,7 @@ final class PhabricatorRepositoryQuery public function getQueryApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } private function getNormalizedPaths() { diff --git a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php index 84b8b144ec..5dd6830e12 100644 --- a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php +++ b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php @@ -93,9 +93,8 @@ final class PhabricatorRepositoryRefCursorQuery return $this->formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } } diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php index a0ca1e3039..d665ae3e04 100644 --- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php +++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorRepositorySearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationDiffusion'; + return 'PhabricatorDiffusionApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php index 2cfd178f50..2ae773e025 100644 --- a/src/applications/repository/storage/PhabricatorRepository.php +++ b/src/applications/repository/storage/PhabricatorRepository.php @@ -51,7 +51,7 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO public static function initializeNewRepository(PhabricatorUser $actor) { $app = id(new PhabricatorApplicationQuery()) ->setViewer($actor) - ->withClasses(array('PhabricatorApplicationDiffusion')) + ->withClasses(array('PhabricatorDiffusionApplication')) ->executeOne(); $view_policy = $app->getPolicy(DiffusionCapabilityDefaultView::CAPABILITY); diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php index d236cdd93b..4d03999019 100644 --- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php +++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php @@ -409,7 +409,7 @@ abstract class PhabricatorRepositoryCommitMessageParserWorker PhabricatorRepositoryCommit $commit, $message) { - $maniphest = 'PhabricatorApplicationManiphest'; + $maniphest = 'PhabricatorManiphestApplication'; if (!PhabricatorApplication::isClassInstalled($maniphest)) { return; } diff --git a/src/applications/search/application/PhabricatorApplicationSearch.php b/src/applications/search/application/PhabricatorSearchApplication.php similarity index 86% rename from src/applications/search/application/PhabricatorApplicationSearch.php rename to src/applications/search/application/PhabricatorSearchApplication.php index 8a47888d9b..4095438088 100644 --- a/src/applications/search/application/PhabricatorApplicationSearch.php +++ b/src/applications/search/application/PhabricatorSearchApplication.php @@ -1,6 +1,6 @@ \w+)/' => 'PhabricatorSearchSelectController', 'index/(?P[^/]+)/' => 'PhabricatorSearchIndexController', - 'hovercard/(?Pretrieve|test)/' => - 'PhabricatorSearchHovercardController', + 'hovercard/(?Pretrieve|test)/' + => 'PhabricatorSearchHovercardController', 'edit/(?P[^/]+)/' => 'PhabricatorSearchEditController', 'delete/(?P[^/]+)/(?P[^/]+)/' => 'PhabricatorSearchDeleteController', 'order/(?P[^/]+)/' => 'PhabricatorSearchOrderController', - ), + ), ); } diff --git a/src/applications/search/query/PhabricatorNamedQueryQuery.php b/src/applications/search/query/PhabricatorNamedQueryQuery.php index 1d0e4880c7..413811771d 100644 --- a/src/applications/search/query/PhabricatorNamedQueryQuery.php +++ b/src/applications/search/query/PhabricatorNamedQueryQuery.php @@ -79,9 +79,8 @@ final class PhabricatorNamedQueryQuery return $this->formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationSearch'; + return 'PhabricatorSearchApplication'; } } diff --git a/src/applications/search/query/PhabricatorSavedQueryQuery.php b/src/applications/search/query/PhabricatorSavedQueryQuery.php index 7431d6abee..168342fdf2 100644 --- a/src/applications/search/query/PhabricatorSavedQueryQuery.php +++ b/src/applications/search/query/PhabricatorSavedQueryQuery.php @@ -66,9 +66,8 @@ final class PhabricatorSavedQueryQuery return $this->formatWhereClause($where); } - public function getQueryApplicationClass() { - return 'PhabricatorApplicationSearch'; + return 'PhabricatorSearchApplication'; } } diff --git a/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php b/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php index 57aa9c4db4..a589a1dd11 100644 --- a/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php +++ b/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php @@ -8,7 +8,7 @@ final class PhabricatorSearchApplicationSearchEngine } public function getApplicationClassName() { - return 'PhabricatorApplicationSearch'; + return 'PhabricatorSearchApplication'; } public function buildSavedQueryFromRequest(AphrontRequest $request) { @@ -170,17 +170,14 @@ final class PhabricatorSearchApplicationSearchEngine } public function getBuiltinQueryNames() { - $names = array( + return array( 'all' => pht('All Documents'), 'open' => pht('Open Documents'), 'open-tasks' => pht('Open Tasks'), ); - - return $names; } public function buildSavedQueryFromBuiltin($query_key) { - $query = $this->newSavedQuery(); $query->setQueryKey($query_key); diff --git a/src/applications/search/query/PhabricatorSearchDocumentQuery.php b/src/applications/search/query/PhabricatorSearchDocumentQuery.php index bec7cd76fd..aa69fc1783 100644 --- a/src/applications/search/query/PhabricatorSearchDocumentQuery.php +++ b/src/applications/search/query/PhabricatorSearchDocumentQuery.php @@ -25,7 +25,6 @@ final class PhabricatorSearchDocumentQuery } protected function willFilterPage(array $handles) { - // NOTE: This is used by the object selector dialog to exclude the object // you're looking at, so that, e.g., a task can't be set as a dependency // of itself in the UI. @@ -67,7 +66,7 @@ final class PhabricatorSearchDocumentQuery } public function getQueryApplicationClass() { - return 'PhabricatorApplicationSearch'; + return 'PhabricatorSearchApplication'; } protected function getPagingValue($result) { diff --git a/src/applications/search/typeahead/PhabricatorSearchDatasource.php b/src/applications/search/typeahead/PhabricatorSearchDatasource.php index 9cbd8d477a..fde4438bbd 100644 --- a/src/applications/search/typeahead/PhabricatorSearchDatasource.php +++ b/src/applications/search/typeahead/PhabricatorSearchDatasource.php @@ -8,7 +8,7 @@ final class PhabricatorSearchDatasource } public function getDatasourceApplicationClass() { - return 'PhabricatorApplicationSearch'; + return 'PhabricatorSearchApplication'; } public function getComponentDatasources() { diff --git a/src/applications/settings/application/PhabricatorApplicationSettings.php b/src/applications/settings/application/PhabricatorSettingsApplication.php similarity index 95% rename from src/applications/settings/application/PhabricatorApplicationSettings.php rename to src/applications/settings/application/PhabricatorSettingsApplication.php index 0ea57e90a0..0fc3124237 100644 --- a/src/applications/settings/application/PhabricatorApplicationSettings.php +++ b/src/applications/settings/application/PhabricatorSettingsApplication.php @@ -1,6 +1,6 @@ getPreference('mailtags', array()); $all_tags = $this->getMailTags(); - $maniphest = 'PhabricatorApplicationManiphest'; + $maniphest = 'PhabricatorManiphestApplication'; if (!PhabricatorApplication::isClassInstalled($maniphest)) { $all_tags = array_diff_key($all_tags, $this->getManiphestMailTags()); } - $pholio = 'PhabricatorApplicationPholio'; + $pholio = 'PhabricatorPholioApplication'; if (!PhabricatorApplication::isClassInstalled($pholio)) { $all_tags = array_diff_key($all_tags, $this->getPholioMailTags()); } @@ -186,7 +186,7 @@ final class PhabricatorSettingsPanelEmailPreferences '**Phabricator will send an email to your primary account when:**')); if (PhabricatorApplication::isClassInstalledForViewer( - 'PhabricatorApplicationDifferential', $user)) { + 'PhabricatorDifferentialApplication', $user)) { $form ->appendChild( $this->buildMailTagCheckboxes( @@ -196,7 +196,7 @@ final class PhabricatorSettingsPanelEmailPreferences } if (PhabricatorApplication::isClassInstalledForViewer( - 'PhabricatorApplicationManiphest', $user)) { + 'PhabricatorManiphestApplication', $user)) { $form->appendChild( $this->buildMailTagCheckboxes( $this->getManiphestMailTags(), @@ -205,7 +205,7 @@ final class PhabricatorSettingsPanelEmailPreferences } if (PhabricatorApplication::isClassInstalledForViewer( - 'PhabricatorApplicationPholio', $user)) { + 'PhabricatorPholioApplication', $user)) { $form->appendChild( $this->buildMailTagCheckboxes( $this->getPholioMailTags(), diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php index c80e6cfe35..95c8c0ba96 100644 --- a/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php +++ b/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php @@ -42,7 +42,7 @@ final class PhabricatorSettingsPanelHomePreferences } asort($options); - unset($options['PhabricatorApplicationApplications']); + unset($options['PhabricatorApplicationsApplication']); if ($request->isFormPost()) { $pin = $request->getStr('pin'); @@ -137,7 +137,7 @@ final class PhabricatorSettingsPanelHomePreferences )); foreach ($app_list as $key => $application) { - if ($key == 'PhabricatorApplicationApplications') { + if ($key == 'PhabricatorApplicationsApplication') { continue; } @@ -194,4 +194,5 @@ final class PhabricatorSettingsPanelHomePreferences return $box; } + } diff --git a/src/applications/slowvote/application/PhabricatorApplicationSlowvote.php b/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php similarity index 95% rename from src/applications/slowvote/application/PhabricatorApplicationSlowvote.php rename to src/applications/slowvote/application/PhabricatorSlowvoteApplication.php index 929a23cd1f..a80b901bfd 100644 --- a/src/applications/slowvote/application/PhabricatorApplicationSlowvote.php +++ b/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php @@ -1,6 +1,6 @@ setViewer($actor) - ->withClasses(array('PhabricatorApplicationSlowvote')) + ->withClasses(array('PhabricatorSlowvoteApplication')) ->executeOne(); $view_policy = $app->getPolicy( diff --git a/src/applications/subscriptions/application/PhabricatorApplicationSubscriptions.php b/src/applications/subscriptions/application/PhabricatorSubscriptionsApplication.php similarity index 75% rename from src/applications/subscriptions/application/PhabricatorApplicationSubscriptions.php rename to src/applications/subscriptions/application/PhabricatorSubscriptionsApplication.php index 585355002c..7bc5315dd3 100644 --- a/src/applications/subscriptions/application/PhabricatorApplicationSubscriptions.php +++ b/src/applications/subscriptions/application/PhabricatorSubscriptionsApplication.php @@ -1,6 +1,6 @@ add|delete)/'. '(?P[^/]+)/' => 'PhabricatorSubscriptionsEditController', 'list/(?P[^/]+)/' => 'PhabricatorSubscriptionsListController', - 'transaction/(?Padd|rem)/(?[^/]+)/' => - 'PhabricatorSubscriptionsTransactionController', + 'transaction/(?Padd|rem)/(?[^/]+)/' + => 'PhabricatorSubscriptionsTransactionController', ), ); } diff --git a/src/applications/support/application/PhabricatorApplicationSupport.php b/src/applications/support/application/PhabricatorSupportApplication.php similarity index 82% rename from src/applications/support/application/PhabricatorApplicationSupport.php rename to src/applications/support/application/PhabricatorSupportApplication.php index 9b04107b45..6851d1f2b8 100644 --- a/src/applications/support/application/PhabricatorApplicationSupport.php +++ b/src/applications/support/application/PhabricatorSupportApplication.php @@ -1,6 +1,6 @@ getPHID(); + $herald_phid = id(new PhabricatorHeraldApplication())->getPHID(); // TODO: It would be nice to give transactions a more specific source // which points at the rule which generated them. You can figure this diff --git a/src/applications/typeahead/application/PhabricatorApplicationTypeahead.php b/src/applications/typeahead/application/PhabricatorTypeaheadApplication.php similarity index 84% rename from src/applications/typeahead/application/PhabricatorApplicationTypeahead.php rename to src/applications/typeahead/application/PhabricatorTypeaheadApplication.php index 0e5c0afd4f..c21703851e 100644 --- a/src/applications/typeahead/application/PhabricatorApplicationTypeahead.php +++ b/src/applications/typeahead/application/PhabricatorTypeaheadApplication.php @@ -1,6 +1,6 @@