New return structure

Author: DivineOmega

README.md

@@ -1,5 +1,5 @@
-# 📧 Email Structure Parser
-Given an IMAP stream and a message number, this library will parse the 
+# Email Structure Parser
+Given an IMAP stream and a message nubmer, this library will parse the 
 structure of multipart emails.
 
 ## Installation
@@ -43,7 +43,7 @@ $parts = $parser->getParts();
 var_dump($parts['TEXT/HTML']);
 
 // Save attached PNG images
-foreach($parts['IMAGE/PNG'] as $key => $image) {
-    file_put_contents($key.'.png', $image);
+foreach($parts['IMAGE/PNG'] as $image) {
+    file_put_contents($image->name, $image->content);
 }
-```
+```

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "divineomega/email-structure-parser",
-    "description": "Given an IMAP stream and a message number, this library will parse the structure of multipart emails.",
+    "description": "Email Structure Parser",
     "type": "library",
     "license": "LGPL-3.0-only",
     "authors": [

src/EmailStructureParser.php

@@ -82,18 +82,37 @@ private function getPart(&$returnParts, $structure, $partNumber = false)
                 else
                 {
                     $mimeType = $this->getMimeType($substructure);
-                    $returnParts[$mimeType][] = $this->getPartByPartNumber($substructure, $partToGet);
+                    $name = $this->getParameterValue($substructure, 'name');
+                    $content = $this->getPartByPartNumber($substructure, $partToGet);
+                    $returnParts[$mimeType][] = new Part($name, $content);
                 }
             }
         }
         else
         {
             $mimeType = $this->getMimeType($structure);
-            $returnParts[$mimeType][] = $this->getPartByPartNumber($structure, 1);
+            $name = $this->getParameterValue($structure, 'name');
+            $content = $this->getPartByPartNumber($structure, 1);
+            $returnParts[$mimeType][] = new Part($name, $content);
         }
 
     }
 
+    private function getParameterValue($structure, $parameterName)
+    {
+        if (!isset($structure->parameters) || !is_array($structure->parameters)) {
+            return null;
+        }
+
+        foreach($structure->parameters as $parameter) {
+            if (strtolower($parameter->attribute) === strtolower($parameterName)) {
+                return $parameter->value;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * @param $structure
      * @param $partToGet

src/Part.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace DivineOmega\EmailStructureParser;
+
+class Part
+{
+    public $name;
+    public $content;
+    
+    public function __construct($name, $content)
+    {
+        $this->name = $name;
+        $this->content = $content;
+    }
+}

src/example.php

@@ -21,6 +21,6 @@
 var_dump($parts['TEXT/HTML']);
 
 // Save attached PNG images
-foreach($parts['IMAGE/PNG'] as $key => $image) {
-    file_put_contents($key.'.png', $image);
+foreach($parts['IMAGE/PNG'] as $image) {
+    file_put_contents($image->name, $image->content);
 }