From 210e2f5d95ae38980d87fb469757c49ee4d969b0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 24 Feb 2020 15:03:57 +0100
Subject: [PATCH] fixed tests

---
 .travis.yml            |  1 +
 _test/message.test.php | 68 ++++++++++++++++++++++--------------------
 classes/Message.php    |  2 +-
 3 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86353a7..1265bfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@
 
 language: php
 php:
+  - "7.4"
   - "7.3"
   - "7.2"
   - "7.1"
diff --git a/_test/message.test.php b/_test/message.test.php
index de69c2b..ba68daf 100644
--- a/_test/message.test.php
+++ b/_test/message.test.php
@@ -1,49 +1,53 @@
 <?php
+
 /**
  * General tests for the smtp plugin
  *
  * @group plugin_smtp
  * @group plugins
  */
-class message_plugin_smtp_test extends DokuWikiTest {
-    public function setUp() {
+class message_plugin_smtp_test extends DokuWikiTest
+{
+    public function setUp()
+    {
         parent::setUp();
         require_once __DIR__ . '/../loader.php';
     }
 
-    public function test_body() {
-        $input = trim('
-X-Mailer: DokuWiki
-X-Dokuwiki-User: admin
-X-Dokuwiki-Title: Test Wiki
-X-Dokuwiki-Server: localhost.localhost
-From: a@example.com
-To: b@example.com
-Bcc: c@example.com, d@example.com,
-    d@example.com
-Subject: A test
+    public function test_body()
+    {
+        $input = join("\r\n", [
+            'X-Mailer: DokuWiki',
+            'X-Dokuwiki-User: admin',
+            'X-Dokuwiki-Title: Test Wiki',
+            'X-Dokuwiki-Server: localhost.localhost',
+            'From: a@example.com',
+            'To: b@example.com',
+            'Bcc: c@example.com, d@example.com,',
+            '     d@example.com',
+            'Subject: A test',
+            '',
+            'This is the body of the mail',
+            'Bcc: this is not a header line',
+            'end of message',
+        ]);
 
-This is the body of the mail
-Bcc: this is not a header line
-end of message
-');
-
-        $expect = trim('
-X-Mailer: DokuWiki
-X-Dokuwiki-User: admin
-X-Dokuwiki-Title: Test Wiki
-X-Dokuwiki-Server: localhost.localhost
-From: a@example.com
-To: b@example.com
-Subject: A test
-
-This is the body of the mail
-Bcc: this is not a header line
-end of message
-');
+        $expect = join("\r\n", [
+            'X-Mailer: DokuWiki',
+            'X-Dokuwiki-User: admin',
+            'X-Dokuwiki-Title: Test Wiki',
+            'X-Dokuwiki-Server: localhost.localhost',
+            'From: a@example.com',
+            'To: b@example.com',
+            'Subject: A test',
+            '',
+            'This is the body of the mail',
+            'Bcc: this is not a header line',
+            'end of message',
+        ]);
         $expect .= "\r\n\r\n.\r\n";
 
-        $message = new \splitbrain\dokuwiki\plugin\smtp\Message('','',$input);
+        $message = new \splitbrain\dokuwiki\plugin\smtp\Message('', '', $input);
 
         $this->assertEquals($expect, $message->toString());
 
diff --git a/classes/Message.php b/classes/Message.php
index e9ef02a..db03647 100644
--- a/classes/Message.php
+++ b/classes/Message.php
@@ -73,7 +73,7 @@ class Message extends \Tx\Mailer\Message {
      */
     public function toString() {
         // we need to remove the BCC header here
-        $lines = explode("\n", $this->body);
+        $lines = preg_split('/\r?\n/', $this->body);
         $count = count($lines);
         for($i=0; $i<$count; $i++) {
             if(trim($lines[$i]) === '') break; // end of headers, we're done