Page MenuHomePhabricator
Files F22765219

D9982.id23990.diff
No OneTemporary
Actions

D9982.id23990.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1140,12 +1140,6 @@
'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',
@@ -1206,7 +1200,6 @@
'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',
@@ -1243,6 +1236,7 @@
'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',
@@ -1258,6 +1252,7 @@
'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',
@@ -1354,6 +1349,7 @@
'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',
@@ -1372,6 +1368,7 @@
'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',
@@ -1388,6 +1385,7 @@
'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',
@@ -1402,6 +1400,7 @@
'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',
@@ -2301,6 +2300,7 @@
'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',
@@ -3918,12 +3918,6 @@
'PhabricatorAppSearchEngine' => 'PhabricatorApplicationSearchEngine',
'PhabricatorApplication' => 'PhabricatorPolicyInterface',
'PhabricatorApplicationApplications' => 'PhabricatorApplication',
- 'PhabricatorApplicationAudit' => 'PhabricatorApplication',
- 'PhabricatorApplicationAuth' => 'PhabricatorApplication',
- 'PhabricatorApplicationCalendar' => 'PhabricatorApplication',
- 'PhabricatorApplicationChatLog' => 'PhabricatorApplication',
- 'PhabricatorApplicationConduit' => 'PhabricatorApplication',
- 'PhabricatorApplicationConfig' => 'PhabricatorApplication',
'PhabricatorApplicationConfigOptions' => 'Phobject',
'PhabricatorApplicationConpherence' => 'PhabricatorApplication',
'PhabricatorApplicationCountdown' => 'PhabricatorApplication',
@@ -3982,7 +3976,6 @@
'PhabricatorApplicationSubscriptions' => 'PhabricatorApplication',
'PhabricatorApplicationSupport' => 'PhabricatorApplication',
'PhabricatorApplicationSystem' => 'PhabricatorApplication',
- 'PhabricatorApplicationTest' => 'PhabricatorApplication',
'PhabricatorApplicationTokens' => 'PhabricatorApplication',
'PhabricatorApplicationTransaction' => array(
0 => 'PhabricatorLiskDAO',
@@ -4026,6 +4019,7 @@
'PhabricatorApplicationsListController' => 'PhabricatorApplicationsController',
'PhabricatorAsanaConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorAuditAddCommentController' => 'PhabricatorAuditController',
+ 'PhabricatorAuditApplication' => 'PhabricatorApplication',
'PhabricatorAuditComment' => array(
0 => 'PhabricatorAuditDAO',
1 => 'PhabricatorMarkupInterface',
@@ -4045,6 +4039,7 @@
'PhabricatorAuditPreviewController' => 'PhabricatorAuditController',
'PhabricatorAuditReplyHandler' => 'PhabricatorMailReplyHandler',
'PhabricatorAuthAccountView' => 'AphrontView',
+ 'PhabricatorAuthApplication' => 'PhabricatorApplication',
'PhabricatorAuthConfirmLinkController' => 'PhabricatorAuthController',
'PhabricatorAuthController' => 'PhabricatorController',
'PhabricatorAuthDAO' => 'PhabricatorLiskDAO',
@@ -4143,6 +4138,7 @@
'PhabricatorCacheManagementWorkflow' => 'PhabricatorManagementWorkflow',
'PhabricatorCacheMarkupGarbageCollector' => 'PhabricatorGarbageCollector',
'PhabricatorCacheTTLGarbageCollector' => 'PhabricatorGarbageCollector',
+ 'PhabricatorCalendarApplication' => 'PhabricatorApplication',
'PhabricatorCalendarBrowseController' => 'PhabricatorCalendarController',
'PhabricatorCalendarController' => 'PhabricatorController',
'PhabricatorCalendarDAO' => 'PhabricatorLiskDAO',
@@ -4164,6 +4160,7 @@
'PhabricatorCampfireProtocolAdapter' => 'PhabricatorBotBaseStreamingProtocolAdapter',
'PhabricatorChangeParserTestCase' => 'PhabricatorWorkingCopyTestCase',
'PhabricatorChangesetResponse' => 'AphrontProxyResponse',
+ 'PhabricatorChatLogApplication' => 'PhabricatorApplication',
'PhabricatorChatLogChannel' => array(
0 => 'PhabricatorChatLogDAO',
1 => 'PhabricatorPolicyInterface',
@@ -4185,6 +4182,7 @@
'PhabricatorCommitTagsField' => 'PhabricatorCommitCustomField',
'PhabricatorCommonPasswords' => 'Phobject',
'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
+ 'PhabricatorConduitApplication' => 'PhabricatorApplication',
'PhabricatorConduitCertificateToken' => 'PhabricatorConduitDAO',
'PhabricatorConduitConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
@@ -4202,6 +4200,7 @@
'PhabricatorConduitSearchEngine' => 'PhabricatorApplicationSearchEngine',
'PhabricatorConduitTokenController' => 'PhabricatorConduitController',
'PhabricatorConfigAllController' => 'PhabricatorConfigController',
+ 'PhabricatorConfigApplication' => 'PhabricatorApplication',
'PhabricatorConfigController' => 'PhabricatorController',
'PhabricatorConfigDatabaseSource' => 'PhabricatorConfigProxySource',
'PhabricatorConfigDefaultSource' => 'PhabricatorConfigProxySource',
@@ -4610,6 +4609,7 @@
'PhabricatorMetaMTAMailingList' => array(
0 => 'PhabricatorMetaMTADAO',
1 => 'PhabricatorPolicyInterface',
+ 2 => 'PhabricatorDestructableInterface',
),
'PhabricatorMetaMTAMemberQuery' => 'PhabricatorQuery',
'PhabricatorMetaMTAPermanentFailureException' => 'Exception',
@@ -5142,6 +5142,7 @@
'PhabricatorSystemSelectEncodingController' => 'PhabricatorController',
'PhabricatorSystemSelectHighlightController' => 'PhabricatorController',
'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon',
+ 'PhabricatorTestApplication' => 'PhabricatorApplication',
'PhabricatorTestCase' => 'ArcanistPhutilTestCase',
'PhabricatorTestController' => 'PhabricatorController',
'PhabricatorTestStorageEngine' => 'PhabricatorFileStorageEngine',
@@ -5483,6 +5484,7 @@
2 => 'PhabricatorSubscribableInterface',
3 => 'PhabricatorFlaggableInterface',
4 => 'PhabricatorTokenReceiverInterface',
+ 5 => 'PhabricatorDestructableInterface',
),
'PhrictionDocumentController' => 'PhrictionController',
'PhrictionDocumentEditor' => 'PhabricatorEditor',
diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
--- 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 @@
}
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 @@
// 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);
diff --git a/src/applications/audit/application/PhabricatorApplicationAudit.php b/src/applications/audit/application/PhabricatorAuditApplication.php
rename from src/applications/audit/application/PhabricatorApplicationAudit.php
rename to src/applications/audit/application/PhabricatorAuditApplication.php
--- a/src/applications/audit/application/PhabricatorApplicationAudit.php
+++ b/src/applications/audit/application/PhabricatorAuditApplication.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorApplicationAudit extends PhabricatorApplication {
+final class PhabricatorAuditApplication extends PhabricatorApplication {
public function getBaseURI() {
return '/audit/';
diff --git a/src/applications/audit/conduit/ConduitAPI_audit_Method.php b/src/applications/audit/conduit/ConduitAPI_audit_Method.php
--- a/src/applications/audit/conduit/ConduitAPI_audit_Method.php
+++ b/src/applications/audit/conduit/ConduitAPI_audit_Method.php
@@ -3,7 +3,7 @@
abstract class ConduitAPI_audit_Method extends ConduitAPIMethod {
public function getApplication() {
- return PhabricatorApplication::getByClass('PhabricatorApplicationAudit');
+ return PhabricatorApplication::getByClass('PhabricatorAuditApplication');
}
}
diff --git a/src/applications/audit/mail/PhabricatorAuditMailReceiver.php b/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
--- a/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
+++ b/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
@@ -3,7 +3,7 @@
final class PhabricatorAuditMailReceiver extends PhabricatorObjectMailReceiver {
public function isEnabled() {
- $app_class = 'PhabricatorApplicationAudit';
+ $app_class = 'PhabricatorAuditApplication';
return PhabricatorApplication::isClassInstalled($app_class);
}
diff --git a/src/applications/auth/application/PhabricatorApplicationAuth.php b/src/applications/auth/application/PhabricatorAuthApplication.php
rename from src/applications/auth/application/PhabricatorApplicationAuth.php
rename to src/applications/auth/application/PhabricatorAuthApplication.php
--- a/src/applications/auth/application/PhabricatorApplicationAuth.php
+++ b/src/applications/auth/application/PhabricatorAuthApplication.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorApplicationAuth extends PhabricatorApplication {
+final class PhabricatorAuthApplication extends PhabricatorApplication {
public function canUninstall() {
return false;
diff --git a/src/applications/auth/provider/PhabricatorAuthProvider.php b/src/applications/auth/provider/PhabricatorAuthProvider.php
--- a/src/applications/auth/provider/PhabricatorAuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorAuthProvider.php
@@ -93,8 +93,7 @@
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 @@
}
/**
- * 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 PhabricatorAuthProviderPassword)
+ * 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:PhabricatorAuthProviderPassword}).
*/
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 @@
return $this->renderLoginForm($controller->getRequest(), $mode = 'refresh');
}
- protected function renderLoginForm(
- AphrontRequest $request,
- $mode) {
+ protected function renderLoginForm(AphrontRequest $request, $mode) {
throw new Exception('Not implemented!');
}
@@ -197,8 +192,7 @@
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 @@
$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 @@
}
public function getStartURI() {
- $app = PhabricatorApplication::getByClass('PhabricatorApplicationAuth');
+ $app = PhabricatorApplication::getByClass('PhabricatorAuthApplication');
$uri = $app->getApplicationURI('/start/');
return $uri;
}
@@ -339,6 +333,7 @@
AphrontFormView $form,
array $values,
array $issues) {
+
return;
}
@@ -360,7 +355,6 @@
$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 @@
return false;
}
-
/**
* Render a standard login/register button element.
*
diff --git a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
--- a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
+++ b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
@@ -1,7 +1,6 @@
<?php
-final class PhabricatorAccessControlTestCase
- extends PhabricatorTestCase {
+final class PhabricatorAccessControlTestCase extends PhabricatorTestCase {
protected function getPhabricatorTestCaseConfiguration() {
return array(
@@ -201,7 +200,7 @@
$env->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
rename from src/applications/base/controller/__tests__/PhabricatorApplicationTest.php
rename to src/applications/base/controller/__tests__/PhabricatorTestApplication.php
--- a/src/applications/base/controller/__tests__/PhabricatorApplicationTest.php
+++ b/src/applications/base/controller/__tests__/PhabricatorTestApplication.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorApplicationTest extends PhabricatorApplication {
+final class PhabricatorTestApplication extends PhabricatorApplication {
private $policies = array();
@@ -30,8 +30,7 @@
}
public function getRoutes() {
- return array(
- );
+ return array();
}
}
diff --git a/src/applications/calendar/application/PhabricatorApplicationCalendar.php b/src/applications/calendar/application/PhabricatorCalendarApplication.php
rename from src/applications/calendar/application/PhabricatorApplicationCalendar.php
rename to src/applications/calendar/application/PhabricatorCalendarApplication.php
--- a/src/applications/calendar/application/PhabricatorApplicationCalendar.php
+++ b/src/applications/calendar/application/PhabricatorCalendarApplication.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorApplicationCalendar extends PhabricatorApplication {
+final class PhabricatorCalendarApplication extends PhabricatorApplication {
public function getShortDescription() {
return pht('Upcoming Events');
diff --git a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
@@ -105,7 +105,7 @@
}
public function getQueryApplicationClass() {
- return 'PhabricatorApplicationCalendar';
+ return 'PhabricatorCalendarApplication';
}
}
diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
@@ -8,7 +8,7 @@
}
public function getApplicationClassName() {
- return 'PhabricatorApplicationCalendar';
+ return 'PhabricatorCalendarApplication';
}
public function buildSavedQueryFromRequest(AphrontRequest $request) {
diff --git a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php b/src/applications/chatlog/application/PhabricatorChatLogApplication.php
rename from src/applications/chatlog/applications/PhabricatorApplicationChatLog.php
rename to src/applications/chatlog/application/PhabricatorChatLogApplication.php
--- a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php
+++ b/src/applications/chatlog/application/PhabricatorChatLogApplication.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorApplicationChatLog extends PhabricatorApplication {
+final class PhabricatorChatLogApplication extends PhabricatorApplication {
public function getBaseURI() {
return '/chatlog/';
@@ -29,11 +29,10 @@
public function getRoutes() {
return array(
'/chatlog/' => array(
- '' => 'PhabricatorChatLogChannelListController',
+ '' => 'PhabricatorChatLogChannelListController',
'channel/(?P<channelID>[^/]+)/' =>
'PhabricatorChatLogChannelLogController',
),
-
);
}
diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php b/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php
--- 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
--- a/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php
+++ b/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php
@@ -57,7 +57,7 @@
}
public function getQueryApplicationClass() {
- return 'PhabricatorApplicationChatLog';
+ return 'PhabricatorChatLogApplication';
}
}
diff --git a/src/applications/chatlog/query/PhabricatorChatLogQuery.php b/src/applications/chatlog/query/PhabricatorChatLogQuery.php
--- a/src/applications/chatlog/query/PhabricatorChatLogQuery.php
+++ b/src/applications/chatlog/query/PhabricatorChatLogQuery.php
@@ -78,7 +78,7 @@
}
public function getQueryApplicationClass() {
- return 'PhabricatorApplicationChatLog';
+ return 'PhabricatorChatLogApplication';
}
}
diff --git a/src/applications/conduit/application/PhabricatorApplicationConduit.php b/src/applications/conduit/application/PhabricatorConduitApplication.php
rename from src/applications/conduit/application/PhabricatorApplicationConduit.php
rename to src/applications/conduit/application/PhabricatorConduitApplication.php
--- a/src/applications/conduit/application/PhabricatorApplicationConduit.php
+++ b/src/applications/conduit/application/PhabricatorConduitApplication.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorApplicationConduit extends PhabricatorApplication {
+final class PhabricatorConduitApplication extends PhabricatorApplication {
public function getBaseURI() {
return '/conduit/';
diff --git a/src/applications/conduit/query/PhabricatorConduitLogQuery.php b/src/applications/conduit/query/PhabricatorConduitLogQuery.php
--- a/src/applications/conduit/query/PhabricatorConduitLogQuery.php
+++ b/src/applications/conduit/query/PhabricatorConduitLogQuery.php
@@ -41,7 +41,7 @@
}
public function getQueryApplicationClass() {
- return 'PhabricatorApplicationConduit';
+ return 'PhabricatorConduitApplication';
}
}
diff --git a/src/applications/conduit/query/PhabricatorConduitMethodQuery.php b/src/applications/conduit/query/PhabricatorConduitMethodQuery.php
--- a/src/applications/conduit/query/PhabricatorConduitMethodQuery.php
+++ b/src/applications/conduit/query/PhabricatorConduitMethodQuery.php
@@ -122,7 +122,7 @@
}
public function getQueryApplicationClass() {
- return 'PhabricatorApplicationConduit';
+ return 'PhabricatorConduitApplication';
}
}
diff --git a/src/applications/conduit/query/PhabricatorConduitSearchEngine.php b/src/applications/conduit/query/PhabricatorConduitSearchEngine.php
--- a/src/applications/conduit/query/PhabricatorConduitSearchEngine.php
+++ b/src/applications/conduit/query/PhabricatorConduitSearchEngine.php
@@ -8,7 +8,7 @@
}
public function getApplicationClassName() {
- return 'PhabricatorApplicationConduit';
+ return 'PhabricatorConduitApplication';
}
public function getPageSize(PhabricatorSavedQuery $saved) {
diff --git a/src/applications/config/application/PhabricatorApplicationConfig.php b/src/applications/config/application/PhabricatorConfigApplication.php
rename from src/applications/config/application/PhabricatorApplicationConfig.php
rename to src/applications/config/application/PhabricatorConfigApplication.php
--- a/src/applications/config/application/PhabricatorApplicationConfig.php
+++ b/src/applications/config/application/PhabricatorConfigApplication.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorApplicationConfig extends PhabricatorApplication {
+final class PhabricatorConfigApplication extends PhabricatorApplication {
public function getBaseURI() {
return '/config/';
@@ -33,13 +33,13 @@
public function getRoutes() {
return array(
'/config/' => array(
- '' => 'PhabricatorConfigListController',
- 'all/' => 'PhabricatorConfigAllController',
- 'edit/(?P<key>[\w\.\-]+)/' => 'PhabricatorConfigEditController',
- 'group/(?P<key>[^/]+)/' => 'PhabricatorConfigGroupController',
+ '' => 'PhabricatorConfigListController',
+ 'all/' => 'PhabricatorConfigAllController',
+ 'edit/(?P<key>[\w\.\-]+)/' => 'PhabricatorConfigEditController',
+ 'group/(?P<key>[^/]+)/' => 'PhabricatorConfigGroupController',
'welcome/' => 'PhabricatorConfigWelcomeController',
- '(?P<verb>ignore|unignore)/(?P<key>[^/]+)/'
- => 'PhabricatorConfigIgnoreController',
+ '(?P<verb>ignore|unignore)/(?P<key>[^/]+)/' =>
+ 'PhabricatorConfigIgnoreController',
'issue/' => array(
'' => 'PhabricatorConfigIssueListController',
'(?P<key>[^/]+)/' => 'PhabricatorConfigIssueViewController',
diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
--- a/src/applications/home/controller/PhabricatorHomeMainController.php
+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
@@ -69,7 +69,7 @@
$viewer);
$has_audit = PhabricatorApplication::isClassInstalledForViewer(
- 'PhabricatorApplicationAudit',
+ 'PhabricatorAuditApplication',
$viewer);
$has_differential = PhabricatorApplication::isClassInstalledForViewer(
diff --git a/src/applications/people/customfield/PhabricatorUserStatusField.php b/src/applications/people/customfield/PhabricatorUserStatusField.php
--- a/src/applications/people/customfield/PhabricatorUserStatusField.php
+++ b/src/applications/people/customfield/PhabricatorUserStatusField.php
@@ -23,7 +23,7 @@
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
--- a/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
+++ b/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
@@ -38,7 +38,7 @@
} 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()));

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 6, 11:01 AM (22 h, 48 m)
Storage Engine
amazon-s3
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
phabricator/secure/lu/bg/ltqspxv77udyht3q
Default Alt Text
D9982.id23990.diff (31 KB)

Event Timeline

Phabricator · Built by Phacility