diff --git a/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
--- a/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
@@ -63,6 +63,7 @@
array(
'name' => 'type',
'param' => 'message-type',
+ 'default' => PhabricatorMailEmailMessage::MESSAGETYPE,
'help' => pht(
'Send the specified type of message (email, sms, ...).'),
),
@@ -74,10 +75,6 @@
$viewer = $this->getViewer();
$type = $args->getArg('type');
- if (!strlen($type)) {
- $type = PhabricatorMailEmailMessage::MESSAGETYPE;
- }
-
$type_map = PhabricatorMailExternalMessage::getAllMessageTypes();
if (!isset($type_map[$type])) {
throw new PhutilArgumentUsageException(
diff --git a/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php
--- a/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementShowOutboundWorkflow.php
@@ -65,7 +65,7 @@
foreach ($messages as $message_key => $message) {
if ($args->getArg('dump-html')) {
$html_body = $message->getHTMLBody();
- if (strlen($html_body)) {
+ if (phutil_nonempty_string($html_body)) {
$template =
"<!doctype html><html><body>{$html_body}</body></html>";
$console->writeOut("%s\n", $html_body);
@@ -188,7 +188,7 @@
$info[] = null;
$info[] = $this->newSectionHeader(pht('TEXT BODY'));
- if (strlen($message->getBody())) {
+ if (phutil_nonempty_string($message->getBody())) {
$info[] = tsprintf('%B', $message->getBody());
} else {
$info[] = pht('(This message has no text body.)');
@@ -203,7 +203,7 @@
$info[] = null;
$info[] = $this->newSectionHeader(pht('HTML BODY'));
- if (strlen($message->getHTMLBody())) {
+ if (phutil_nonempty_string($message->getHTMLBody())) {
$info[] = $message->getHTMLBody();
$info[] = null;
} else {