Merge pull request #17 from cedriclombardot/more-date-headers

Match more date quotes headers

src/EmailReplyParser/Parser/EmailParser.php

@@ -27,6 +27,8 @@ class EmailParser
      */
     private $quoteHeadersRegex = array(
         '/^(On\s(.+)wrote:)$/ms', // On DATE, NAME <EMAIL> wrote:
+        '/^(Le\s(.+)écrit :)$/ms', // Le DATE, NAME <EMAIL> a écrit :
+        '/^(20[0-9]{2}\-(0?[1-9]|1[012])\-(0?[1-2][0-9]|3[01]|[1-9])\s0?[0-9]:\d{2}\s(.+):)$/ms', // 20YY-MM-DD HH:II GMT+01:00 MAME <EMAIL>:
     );
 
     /**

tests/EmailReplyParser/Tests/Parser/EmailParserTest.php

@@ -181,7 +181,31 @@ public function testCustomQuoteHeader2()
         $this->parser->setQuoteHeadersRegex($regex);
 
         $email = $this->parser->parse($this->getFixtures('email_customer_quote_header_2.txt'));
+        $fragments = $email->getFragments();
+        $this->assertCount(2, $fragments);
 
         $this->assertEquals('Thank you very much.', $email->getVisibleText());
+        $this->assertTrue($fragments[1]->isHidden());
+        $this->assertTrue($fragments[1]->isQuoted());
+    }
+
+    /**
+     * @dataProvider getDateFormats
+     */
+    public function testDateQuoteHeader($date)
+    {
+        $email = $this->parser->parse(str_replace('[DATE]', $date, $this->getFixtures('email_with_date_headers.txt')));
+
+        $this->assertEquals('Thank you very much.', $email->getVisibleText());
+    }
+
+    public function getDateFormats()
+    {
+        return array(
+            array('On Tue, 2011-03-01 at 18:02 +0530, Abhishek Kona wrote:'),
+            array('2014-03-20 8:48 GMT+01:00 Rémi Dolan <[email protected]>:'), // Gmail
+            array('Le 19 mars 2014 10:37, Cédric Lombardot <[email protected]> a écrit :'), // Gmail
+            array('Le 19/03/2014 11:34, Georges du chemin a écrit :'), // Thunderbird
+        );
     }
 }

tests/Fixtures/email_with_date_headers.txt

@@ -0,0 +1,5 @@
+Thank you very much.
+
+[DATE]
+
+This is my previous mail