Fixing boundaries

PlancakeEmailParser.php

@@ -411,17 +411,15 @@ public function getBody($returnType = self::PLAINTEXT)
             $contentTypeRegex = '/^Content-Type: ?text\/plain/i';
         }
 
-        // there could be more than one boundary
-        preg_match_all('!boundary=(.*?)[;$]!mi', $this->emailRawContent, $matches);
+        // there could be more than one boundary. This also skips the quotes if they are included.
+        preg_match_all('/boundary=(?:|")([a-zA-Z0-9\(\)_\/+-]+)(?:|")(?:$|;)/mi', $this->emailRawContent, $matches);
         $boundariesRaw = $matches[1];
         $boundaries = array();
         foreach ($boundariesRaw as $i => $v) {
-            // sometimes boundaries are delimited by quotes - we want to remove them
-            $tempboundary = str_replace(array("'", '"'), '', $v);
             // actual boundary lines start with --
-            $boundaries[] = '--' . $tempboundary;
+            $boundaries[] = '--' . $v;
             // or start and end with --
-            $boundaries[] = '--' . $tempboundary . '--';
+            $boundaries[] = '--' . $v . '--';
         }
 
         foreach ($this->rawBodyLines as $line) {

composer.json

@@ -20,7 +20,9 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "~2.5.1"
+        "squizlabs/php_codesniffer": "~2.5.1",
+        "phpunit/phpunit": "^6.0",
+        "symfony/yaml": "^3.2"
     },
     "autoload": {
         "psr-0": { "PlancakeEmailParser": "." }

tests/PlancakeEmailParserTest.php

@@ -0,0 +1,112 @@
+<?php
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Yaml\Yaml;
+
+class PlancakeEmailParserTest extends TestCase
+{
+
+    public function testSubject()
+    {
+        foreach (glob(__DIR__ . '/emails/*.txt') as $testFile) {
+
+            $answerFile = str_replace('.txt', '.yml', $testFile);
+            $answers = Yaml::parse(
+                file_get_contents($answerFile)
+            );
+
+            $email = new PlancakeEmailParser(file_get_contents($testFile));
+
+            $this->assertEquals($answers['subject'], $email->getSubject());
+        }
+    }
+
+    public function testFrom()
+    {
+        foreach (glob(__DIR__ . '/emails/*.txt') as $testFile) {
+
+            $answerFile = str_replace('.txt', '.yml', $testFile);
+            $answers = Yaml::parse(
+                file_get_contents($answerFile)
+            );
+
+            $email = new PlancakeEmailParser(file_get_contents($testFile));
+
+            $this->assertEquals($answers['from'], $email->getFrom());
+        }
+    }
+
+    public function testTo()
+    {
+        foreach (glob(__DIR__ . '/emails/*.txt') as $testFile) {
+
+            $answerFile = str_replace('.txt', '.yml', $testFile);
+            $answers = Yaml::parse(
+                file_get_contents($answerFile)
+            );
+
+            $email = new PlancakeEmailParser(file_get_contents($testFile));
+
+            $this->assertEquals($answers['to'], $email->getTo());
+        }
+    }
+
+    public function testCc()
+    {
+        foreach (glob(__DIR__ . '/emails/*.txt') as $testFile) {
+
+            $answerFile = str_replace('.txt', '.yml', $testFile);
+            $answers = Yaml::parse(
+                file_get_contents($answerFile)
+            );
+
+            $email = new PlancakeEmailParser(file_get_contents($testFile));
+
+            $this->assertEquals($answers['cc'], $email->getCc());
+        }
+    }
+
+    public function testBcc()
+    {
+        foreach (glob(__DIR__ . '/emails/*.txt') as $testFile) {
+
+            $answerFile = str_replace('.txt', '.yml', $testFile);
+            $answers = Yaml::parse(
+                file_get_contents($answerFile)
+            );
+
+            $email = new PlancakeEmailParser(file_get_contents($testFile));
+
+            $this->assertEquals($answers['bcc'], $email->getBcc());
+        }
+    }
+
+    public function testSender()
+    {
+        foreach (glob(__DIR__ . '/emails/*.txt') as $testFile) {
+
+            $answerFile = str_replace('.txt', '.yml', $testFile);
+            $answers = Yaml::parse(
+                file_get_contents($answerFile)
+            );
+
+            $email = new PlancakeEmailParser(file_get_contents($testFile));
+
+            $this->assertEquals($answers['sender'], $email->getSender());
+        }
+    }
+
+    public function testPlainBody()
+    {
+        foreach (glob(__DIR__ . '/emails/*.txt') as $testFile) {
+
+            $answerFile = str_replace('.txt', '.yml', $testFile);
+            $answers = Yaml::parse(
+                file_get_contents($answerFile)
+            );
+
+            $email = new PlancakeEmailParser(file_get_contents($testFile));
+
+            $this->assertEquals($answers['plainbody'], $email->getPlainBody());
+        }
+    }
+}

tests/bootstrap.php

@@ -0,0 +1,2 @@
+<?php
+require_once(dirname(__DIR__) . '/vendor/autoload.php');

tests/emails/0.yml

@@ -0,0 +1,16 @@
+subject: 'zażółć gęślą jaźń i zrób próbne zadanie %%tod'
+from:
+  - name: Pawel
+    email: pawel@test.com
+to:
+  - name: ''
+    email: dan@test.com
+cc: []
+bcc: []
+sender: []
+plainbody: |-
+            This is a nonesense test-email to check Plancake Mail to Inbox feature. 
+            All Polish diacritics included ;-) tag also included for additional tests.
+            It should look like in the picture attached.
+            Best regards
+            Pawel

tests/emails/1.yml

@@ -0,0 +1,11 @@
+subject: this is a test
+from:
+  - name: Dan @ Test.com
+    email: dan@test.com
+to:
+  - name: 'Daniele '
+    email: danielet@test.com
+cc: []
+bcc: []
+sender: []
+plainbody: Hope it works!

tests/emails/2.yml

@@ -0,0 +1,11 @@
+subject: 'これはテストです'
+from:
+  - name: Dan
+    email: dan@test.com
+to:
+  - name: 'Daniele'
+    email: daniele@test.com
+cc: []
+bcc: []
+sender: []
+plainbody: 'それは作品を期待'

tests/emails/from_ipad_with_attachment.yml

@@ -0,0 +1,11 @@
+subject: Voice Memo
+from:
+  - name: Dan Occhi
+    email: dan@example.com
+to:
+  - name: Inbox_danocch.it_2063@examplebox.com
+    email: Inbox_danocch.it_2063@examplebox.com
+cc: []
+bcc: []
+sender: []
+plainbody: ''

tests/emails/subject_on_multiple_lines.yml

@@ -0,0 +1,18 @@
+subject: 'Re: Testo Del di Soggetto Che Va A Capo In UTF8 '
+from:
+  - name: ''
+    email: info@domain.it
+to:
+  - name: ''
+    email: bounce@domain-bounce.it
+cc: []
+bcc: []
+sender: []
+plainbody: |-
+
+
+
+            Da: info@domain.it
+            Oggetto: Grazie!!!
+
+            Nome Cognome