Fixes per merge request comments.

Author: Srdjan Marjanovic

src/ActiveCollab/EmailReplyExtractor.php

@@ -33,7 +33,7 @@ public static function extractReplyEml($path)
 
       $extractor = self::getExtractorEml(self::detectMailer(self::getHeadersRelevantForMailerDetectionEml($parser)), $parser);
 
-      return (string) trim($extractor->body);
+      return trim($extractor->body);
     }
 
     /**

src/ActiveCollab/EmailReplyExtractor/Extractor/AndroidMailExtractor.php

@@ -1,7 +1,9 @@
 <?php
   namespace ActiveCollab\EmailReplyExtractor\Extractor;
 
-
+  /**
+   * @package ActiveCollab\EmailReplyExtractor\Extractor
+   */
   final class AndroidMailExtractor extends Extractor
   {
     /**
@@ -19,10 +21,6 @@ protected function processLines()
         $this->body = array_splice($this->body, 0, $cut_line);
       }
 
-      if (preg_match('/^Am(.*?)schrieb(.*?)/is', $unwanted_text)) {
-        $this->body = array_splice($this->body, 0, $cut_line);
-      }
-
       // default signature
       $match_string = '^sent from(.*?)';
       // strip default signature

src/ActiveCollab/EmailReplyExtractor/Extractor/AppleMailExtractor.php

@@ -37,7 +37,6 @@ protected function processLines()
     /**
      * Return original message splitters
      *
-     * @todo
      * @return array
      */
     protected function getOriginalMessageSplitters()

src/ActiveCollab/EmailReplyExtractor/Extractor/Extractor.php

@@ -73,7 +73,6 @@ public function joinLines()
     /**
      * Return original message splitters
      *
-     * @todo
      * @return array
      */
     protected function getOriginalMessageSplitters()

src/ActiveCollab/EmailReplyExtractor/Extractor/GenericExtractor.php

@@ -6,13 +6,6 @@
    */
   final class GenericExtractor extends Extractor
   {
-    public static function toPlainText($html)
-    {
-      $html = str_replace('div', 'p', $html);
-
-      return parent::toPlainText($html);
-    }
-
     /**
      * Return splitters
      *

src/ActiveCollab/EmailReplyExtractor/Extractor/OutlookExpressExtractor.php

@@ -6,22 +6,10 @@
    */
   final class OutlookExpressExtractor extends Extractor
   {
-    /**
-     * @param string $html
-     *
-     * @return string
-     */
-    static function toPlainText($html)
-    {
-      $html = str_replace('div', 'p', $html);
-
-      return parent::toPlainText($html);
-    }
 
     /**
      * Return original message splitters
      *
-     * @todo
      * @return array
      */
     protected function getOriginalMessageSplitters()

src/ActiveCollab/EmailReplyExtractor/Extractor/OutlookExtractor.php

@@ -6,21 +6,6 @@
    */
   final class OutlookExtractor extends Extractor
   {
-    /**
-     * Overrides Extractor::toPlaineText()
-     *
-     * @param string $html
-     *
-     * @return string
-     */
-    static function toPlainText($html)
-    {
-      $html = str_replace('div', 'p', $html);
-
-      return parent::toPlainText($html);
-    }
-
-
     public function processLines()
     {
       parent::processLines();
@@ -52,7 +37,6 @@ public function stripSignature()
     /**
      * Return original message splitters
      *
-     * @todo
      * @return array
      */
     protected function getOriginalMessageSplitters()