Merge pull request #44 from bnrmth/master

Allow empty default sender_name as it is optional in Mandrill Messages

Author: slot

DependencyInjection/Configuration.php

@@ -51,7 +51,7 @@ public function getConfigTreeBuilder()
                 ->isRequired()
                 ->children()
                     ->scalarNode('sender')->isRequired()->cannotBeEmpty()->end()
-                    ->scalarNode('sender_name')->isRequired()->cannotBeEmpty()->end()
+                    ->scalarNode('sender_name')->defaultNull()->end()
                     ->scalarNode('subaccount')->defaultNull()->end()
                 ->end()
             ->end()

Dispatcher.php

@@ -109,7 +109,7 @@ public function send(Message $message, $templateName = '', $templateContent = ar
             $message->setFromEmail($this->defaultSender);
         }
 
-        if (strlen($message->getFromName()) == 0) {
+        if (strlen($message->getFromName()) == 0 && null !== $this->defaultSenderName) {
             $message->setFromName($this->defaultSenderName);
         }
 
@@ -144,11 +144,11 @@ private function addCurlProxyOptions()
         if ($this->proxy['host'] !== null) {
             curl_setopt($this->service->ch, CURLOPT_PROXY, $this->proxy['host']);
         }
-        
+
         if ($this->proxy['port'] !== null) {
             curl_setopt($this->service->ch, CURLOPT_PROXYPORT, $this->proxy['port']);
         }
-        
+
         if ($this->proxy['user'] !== null && $this->proxy['password'] !== null) {
             curl_setopt($this->service->ch, CURLOPT_PROXYUSERPWD, sprintf(
                 '%s:%s',

README.md

@@ -73,7 +73,7 @@ hip_mandrill:
     debug: true
     default:
         sender: [email protected]
-        sender_name: John Doe
+        sender_name: John Doe # Optionally define a sender name (from name)
         subaccount: Project # Optionally define a subaccount to use
     proxy:
         use: true # when you are behing a proxy. Default value is 'false'