Merge branch 'dev3x'

Author: ddrv

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "ddrv/mailer",
-    "version":"3.0.0",
+    "version":"3.1.0",
     "require":{
         "php":">=5.3.0",
         "ext-mbstring": "*"

src/Mailer.php

@@ -10,7 +10,7 @@
 final class Mailer
 {
 
-    const MAILER_VERSION = "3.0.0-beta";
+    const MAILER_VERSION = "3.1.0";
 
     const CHANNEL_DEFAULT = "default";
     const CHANNEL_ALL     = "*";
@@ -62,36 +62,40 @@ public function removeChannel($name)
 
     /**
      * @param Message $message
-     * @param string[] $to
+     * @param string[]|string $to
      * @param string[]|string $channels
      * @throws RecipientsListEmptyException
      */
     public function send(Message $message, $to, $channels = self::CHANNEL_ALL)
     {
-        foreach ($to as $address) {
+        $arrTo = (array)$to;
+        foreach ($arrTo as $address) {
             $this->mass($message, array($address), array(), array(), $channels);
         }
     }
 
     /**
      * @param Message $message
-     * @param string[] $to
-     * @param string[] $cc
-     * @param string[] $bcc
+     * @param string[]|string $to
+     * @param string[]|string $cc
+     * @param string[]|string $bcc
      * @param string[]|string $channels
      * @throws RecipientsListEmptyException
      */
     public function mass(Message $message, $to, $cc = array(), $bcc = array(), $channels = self::CHANNEL_ALL)
     {
-        $addresses = $this->getEmails(array_merge($to, $cc, $bcc));
+        $arrTo = (array)$to;
+        $arrCc = (array)$cc;
+        $arrBcc = (array)$bcc;
+        $addresses = $this->getEmails(array_merge($arrTo, $arrCc, $arrBcc));
         if (!$addresses) {
             throw new RecipientsListEmptyException();
         }
         $version = self::MAILER_VERSION;
         $message->setHeader("X-Mailer", "ddrv/mailer-$version (https://github.com/ddrv/mailer)");
-        $message->setHeader("To", implode(", ", $this->getContacts($to)));
-        $message->setHeader("Cc", implode(", ", $this->getContacts($cc)));
-        $message->setHeader("Bcc", implode(", ", $this->getContacts($bcc)));
+        $message->setHeader("To", implode(", ", $this->getContacts($arrTo)));
+        $message->setHeader("Cc", implode(", ", $this->getContacts($arrCc)));
+        $message->setHeader("Bcc", implode(", ", $this->getContacts($arrBcc)));
 
         $ch = $this->getChannels($channels);
         foreach ($ch as $transport) {

src/Transport/File.php

@@ -43,7 +43,7 @@ public function send(Message $message, $recipients)
             if (!is_dir($dir)) mkdir($dir, 0775, true);
             $num = 1;
             do {
-                $prefix = "mail_" . date(DATE_ATOM);
+                $prefix = "mail_" . date("YmdHis");
                 $suffix = str_pad($num, 3, "0", STR_PAD_LEFT);
                 $file = implode(DIRECTORY_SEPARATOR, array($dir, "{$prefix}_{$suffix}.eml"));
                 $num++;