revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 08:52:39 +01:00
Code Issues Releases Wiki Activity

Make the "Test" adapter support both SMS and email

Browse source 
Summary:
Depends on D20012. Ref T920. If you have a test adapter configured, it should swallow messages and prevent them from ever hitting a lower-priority adapter.

Make the test adapter support SMS so this actually happens.

Test Plan: Ran `bin/mail send-test --type sms ...` with a test adapter (first) and a Twilio adapter (second). Got SMS swallowed by test adapter instead of live SMS messages.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T920

Differential Revision: https://secure.phabricator.com/D20013
This commit is contained in:
epriestley 2019-01-21 15:15:52 -08:00
parent af71c51f0a
commit f69fbf5ea6
1 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/applications/metamta/adapter/PhabricatorMailTestAdapter.php
View file

@ -33,6 +33,7 @@ final class PhabricatorMailTestAdapter
public function getSupportedMessageTypes() { public function getSupportedMessageTypes() {
return array( return array(
PhabricatorMailEmailMessage::MESSAGETYPE, PhabricatorMailEmailMessage::MESSAGETYPE,
PhabricatorMailSMSMessage::MESSAGETYPE,
); );
} }
@ -63,6 +64,28 @@ final class PhabricatorMailTestAdapter
pht('Unit Test (Temporary)')); pht('Unit Test (Temporary)'));
} }
switch ($message->getMessageType()) {
case PhabricatorMailEmailMessage::MESSAGETYPE:
$guts = $this->newEmailGuts($message);
break;
case PhabricatorMailSMSMessage::MESSAGETYPE:
$guts = $this->newSMSGuts($message);
break;
}
$guts['did-send'] = true;
$this->guts = $guts;
}
public function getBody() {
return idx($this->guts, 'body');
}
public function getHTMLBody() {
return idx($this->guts, 'html-body');
}
private function newEmailGuts(PhabricatorMailExternalMessage $message) {
$guts = array(); $guts = array();
$from = $message->getFromAddress(); $from = $message->getFromAddress();
@ -123,19 +146,16 @@ final class PhabricatorMailTestAdapter
} }
$guts['attachments'] = $file_list; $guts['attachments'] = $file_list;
$guts['did-send'] = true; return $guts;
$this->guts = $guts;
} }
private function newSMSGuts(PhabricatorMailExternalMessage $message) {
$guts = array();
public function getBody() { $guts['to'] = $message->getToNumber();
return idx($this->guts, 'body'); $guts['body'] = $message->getTextBody();
return $guts;
} }
public function getHTMLBody() {
return idx($this->guts, 'html-body');
}
} }