From 8de794d3c28a11f1a30e93e7bd74e71031de6ab5 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 8 Feb 2018 17:58:14 -0800
Subject: [PATCH] Make optional options actually optional in cluster mailer
 config validation

---
 .../cluster/config/PhabricatorClusterMailersConfigType.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php b/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
index 60547eea44..03f30506bd 100644
--- a/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
+++ b/src/infrastructure/cluster/config/PhabricatorClusterMailersConfigType.php
@@ -85,6 +85,8 @@ final class PhabricatorClusterMailersConfigType
 
       $options = idx($spec, 'options', array());
       try {
+        $defaults = $adapters[$type]->newDefaultOptions();
+        $options = $options + $defaults;
         id(clone $adapters[$type])->setOptions($options);
       } catch (Exception $ex) {
         throw $this->newException(