Page MenuHomePhabricator
Files F15337574

D12233.diff
No OneTemporary
Actions

D12233.diff
View Options

diff --git a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
--- a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
@@ -39,8 +39,7 @@
}
public static function newReplyHandlerForCommit($commit) {
- $reply_handler = PhabricatorEnv::newObjectFromConfig(
- 'metamta.diffusion.reply-handler');
+ $reply_handler = new PhabricatorAuditReplyHandler();
$reply_handler->setMailReceiver($commit);
return $reply_handler;
}
diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -588,10 +588,8 @@
return $result;
}
-
protected function buildReplyHandler(PhabricatorLiskDAO $object) {
- $reply_handler = PhabricatorEnv::newObjectFromConfig(
- 'metamta.diffusion.reply-handler');
+ $reply_handler = new PhabricatorAuditReplyHandler();
$reply_handler->setMailReceiver($object);
return $reply_handler;
}
diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
@@ -164,6 +164,9 @@
'Configure a reply domain with "%s".',
'metamta.reply-handler-domain');
+ $reply_handler_reason = pht(
+ 'Reply handlers can no longer be overridden with configuration.');
+
$ancient_config += array(
'phid.external-loaders' =>
pht(
@@ -233,6 +236,11 @@
'metamta.macro.reply-handler-domain' => $reply_domain_reason,
'metamta.maniphest.reply-handler-domain' => $reply_domain_reason,
'metamta.pholio.reply-handler-domain' => $reply_domain_reason,
+
+ 'metamta.diffusion.reply-handler' => $reply_handler_reason,
+ 'metamta.differential.reply-handler' => $reply_handler_reason,
+ 'metamta.maniphest.reply-handler' => $reply_handler_reason,
+ 'metamta.package.reply-handler' => $reply_handler_reason,
);
return $ancient_config;
diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
--- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
+++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
@@ -245,13 +245,6 @@
"Similar to `differential.days-fresh` but marks stale revisions. ".
"If the revision is even older than it is when marked as 'old'.")),
$this->newOption(
- 'metamta.differential.reply-handler',
- 'class',
- 'DifferentialReplyHandler')
- ->setLocked(true)
- ->setBaseClass('PhabricatorMailReplyHandler')
- ->setDescription(pht('Alternate reply handler class.')),
- $this->newOption(
'metamta.differential.subject-prefix',
'string',
'[Differential]')
diff --git a/src/applications/differential/mail/DifferentialMail.php b/src/applications/differential/mail/DifferentialMail.php
--- a/src/applications/differential/mail/DifferentialMail.php
+++ b/src/applications/differential/mail/DifferentialMail.php
@@ -4,11 +4,8 @@
public static function newReplyHandlerForRevision(
DifferentialRevision $revision) {
-
- $reply_handler = PhabricatorEnv::newObjectFromConfig(
- 'metamta.differential.reply-handler');
+ $reply_handler = new DifferentialReplyHandler();
$reply_handler->setMailReceiver($revision);
-
return $reply_handler;
}
diff --git a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
--- a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
+++ b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php
@@ -27,13 +27,6 @@
'[Diffusion]')
->setDescription(pht('Subject prefix for Diffusion mail.')),
$this->newOption(
- 'metamta.diffusion.reply-handler',
- 'class',
- 'PhabricatorAuditReplyHandler')
- ->setLocked(true)
- ->setBaseClass('PhabricatorMailReplyHandler')
- ->setDescription(pht('Override mail reply handler class.')),
- $this->newOption(
'metamta.diffusion.attach-patches',
'bool',
false)
diff --git a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
--- a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
+++ b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
@@ -273,13 +273,6 @@
'{{maniphest.priorities}} configuration option. The default value '.
'(`90`) corresponds to the default "Needs Triage" priority.')),
$this->newOption(
- 'metamta.maniphest.reply-handler',
- 'class',
- 'ManiphestReplyHandler')
- ->setLocked(true)
- ->setBaseClass('PhabricatorMailReplyHandler')
- ->setDescription(pht('Override reply handler class.')),
- $this->newOption(
'metamta.maniphest.subject-prefix',
'string',
'[Maniphest]')
diff --git a/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php b/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
--- a/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
+++ b/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
@@ -19,8 +19,7 @@
$task = ManiphestTask::initializeNewTask($sender);
$task->setOriginalEmailSource($mail->getHeader('From'));
- $handler = PhabricatorEnv::newObjectFromConfig(
- 'metamta.maniphest.reply-handler');
+ $handler = new ManiphestReplyHandler();
$handler->setMailReceiver($task);
$handler->setActor($sender);
diff --git a/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php b/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php
--- a/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php
+++ b/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php
@@ -29,8 +29,7 @@
PhabricatorLiskDAO $object,
PhabricatorUser $sender) {
- $handler = PhabricatorEnv::newObjectFromConfig(
- 'metamta.maniphest.reply-handler');
+ $handler = new ManiphestReplyHandler();
$handler->setMailReceiver($object);
$handler->setActor($sender);
diff --git a/src/applications/owners/config/PhabricatorOwnersConfigOptions.php b/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
--- a/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
+++ b/src/applications/owners/config/PhabricatorOwnersConfigOptions.php
@@ -21,13 +21,6 @@
public function getOptions() {
return array(
- $this->newOption(
- 'metamta.package.reply-handler',
- 'class',
- 'OwnersPackageReplyHandler')
- ->setLocked(true)
- ->setBaseClass('PhabricatorMailReplyHandler')
- ->setDescription(pht('Reply handler for owners mail.')),
$this->newOption('metamta.package.subject-prefix', 'string', '[Package]')
->setDescription(pht('Subject prefix for Owners email.')),
);
diff --git a/src/applications/owners/mail/PackageMail.php b/src/applications/owners/mail/PackageMail.php
--- a/src/applications/owners/mail/PackageMail.php
+++ b/src/applications/owners/mail/PackageMail.php
@@ -201,8 +201,7 @@
}
private function newReplyHandler() {
- $reply_handler = PhabricatorEnv::newObjectFromConfig(
- 'metamta.package.reply-handler');
+ $reply_handler = new OwnersPackageReplyHandler();
$reply_handler->setMailReceiver($this->getPackage());
return $reply_handler;
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 6:33 AM (1 d, 18 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7408945
Default Alt Text
D12233.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility