php-mime-mail-parser · Nov 18, 2024 · Nov 18, 2024 · Nov 26, 2024 · Dec 5, 2024
Showing with 984 additions and 7 deletions.

+2 −6 composer.json

+11 −0 src/Enum/BodyType.php

+40 −0 src/Helper/Html.php

+17 −1 src/Parser.php

+914 −0 src/ProtonParser.php
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "php-mime-mail-parser/php-mime-mail-parser",
+    "name": "protonmail/php-mime-mail-parser",
     "type": "library",
     "description": "Fully Tested Mailparse Extension Wrapper for PHP 5.4+",
     "keywords": ["mime", "mail", "mailparse", "MimeMailParser"],
@@ -42,7 +42,7 @@
         "url":"https://github.com/php-mime-mail-parser/php-mime-mail-parser.git"
     },
     "require": {
-        "php":           "^5.4.0 || ^7.0",
+        "php-64bit": ">=8.2",
         "ext-mailparse": "*"
     },
     "require-dev": {
@@ -51,10 +51,6 @@
         "satooshi/php-coveralls":       "0.*",
         "squizlabs/PHP_CodeSniffer":    "2.*"
     },
-    "replace": {
-        "exorus/php-mime-mail-parser":   "*",
-        "messaged/php-mime-mail-parser": "*"
-    },
     "autoload": {
         "psr-4": { "PhpMimeMailParser\\": "src/" }
     }

diff --git a/src/Enum/BodyType.php b/src/Enum/BodyType.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMimeMailParser\Enum;
+
+enum BodyType: string
+{
+    case Text = 'text';
+    case Html = 'html';
+}
diff --git a/src/Helper/Html.php b/src/Helper/Html.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMimeMailParser\Helper;
+
+class Html
+{
+    /**
+     * Can nest this function and never double-encode.
+     *
+     * @param string $input *string to add entities to
+     * @return string *string with HTML entities
+     */
+    public static function special(string $input): string
+    {
+        return htmlspecialchars(htmlspecialchars_decode($input, ENT_QUOTES), ENT_QUOTES);
+    }
+
+    /**
+     * Make a plain text string html compatible by replacing new lines by html new line tag <br>.
+     */
+    public static function fromPlainText(string $plainText): string
+    {
+        $htmlEscapedText = self::special($plainText);
+
+        // don't take any risks if string could not be transformed - probably because of the string encoding
+        if ($htmlEscapedText === '') {
+            return $plainText;
+        }
+
+        return '<html><body><p>'
+            . str_replace(
+                ["\r\n", "\r", "\n"],
+                "<br>\n",
+                $htmlEscapedText,
+            )
+            . '</p></body></html>';
+    }
+}
diff --git a/src/Parser.php b/src/Parser.php
@@ -2,6 +2,7 @@
 
 namespace PhpMimeMailParser;
 
+use MimeMailParser\Exception\RuntimeException;
 use PhpMimeMailParser\Attachment;
 use PhpMimeMailParser\Exception;
 use PhpMimeMailParser\Contracts\CharsetManager;
@@ -204,6 +205,21 @@ public function getHeaders()
         }
     }
 
+    /**
+     * Retrieve the raw Email Headers
+     * @return string
+     */
+    public function getHeadersRaw(): string|array
+    {
+        if (isset($this->parts[1])) {
+            return $this->getPart('headers', $this->parts[1]);
+        }
+
+        throw new \RuntimeException(
+            'Parser::setPath() or Parser::setText() must be called before retrieving email headers.',
+        );
+    }
+
     /**
      * Returns the email message body in the specified format
      * @return string|false String Body or False if not found
@@ -406,7 +422,7 @@ private function getAttachmentStream(&$part)
      * @param string $encodedString    The string in its original encoded state
      * @param $encodingType     The encoding type from the Content-Transfer-Encoding header of the part.
      */
-    private function decodeContentTransfer($encodedString, $encodingType)
+    protected function decodeContentTransfer($encodedString, $encodingType)
     {
         $encodingType = strtolower($encodingType);
         if ($encodingType == 'base64') {