Resolve conflicts

zendframework · Oct 23, 2012 · 4ea71ee · 4ea71ee
4 parents 5e1c4bb + de6ba8b + 19c92ef + 730f592
commit 4ea71ee
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 91 deletions.
diff --git a/src/Message.php b/src/Message.php
@@ -535,4 +535,25 @@ public function toString()
                . Headers::EOL
                . $this->getBodyText();
     }
+
+    /**
+     * Instantiate from raw message string
+     *
+     * @todo   Restore body to Mime\Message
+     * @param  string $rawMessage
+     * @return Message
+     */
+    public static function fromString($rawMessage)
+    {
+        $message = new static();
+        $headers = null;
+        $content = null;
+        Mime\Decode::splitMessage($rawMessage, $headers, $content);
+        if ($headers->has('mime-version')) {
+            // todo - restore body to mime\message
+        }
+        $message->setHeaders($headers);
+        $message->setBody($content);
+        return $message;
+    }
 }