goetas / to-swift-mime-parser

src/Mime/HeaderDecoder.php

Spacing +2 added lines, -2 removed lines

@@ -50,8 +50,8 @@
             switch ($encoding) {
                 case 'Q':
                 case 'q':
-                    $out .= self::convertCharset(preg_replace_callback('/=([0-9a-f]{2})/i', function ($ord) {
-                        return chr(hexdec($ord [1]));
+                    $out .= self::convertCharset(preg_replace_callback('/=([0-9a-f]{2})/i', function($ord) {
+                        return chr(hexdec($ord [ 1 ]));
                     }, str_replace('_', ' ', $encoded_text)), $orig_charset, mb_internal_encoding());
                     break;
 

src/MimeParser.php

Doc Comments +3 added lines

@@ -153,6 +153,9 @@
         return $headers;
     }
 
+    /**
+     * @param resource $stream
+     */
     protected function parseParts($stream, array $partHeaders): array
     {
         $parts = [];

Spacing +51 added lines, -51 removed lines

@@ -11,8 +11,8 @@ 
     private const SWIFT_CONTAINER_CACHE_KEY = 'cache';
     private const SWIFT_CONTAINER_ID_GENERATOR_KEY = 'mime.idgenerator';
 
-    protected $removeHeaders = ['Received', 'From', 'X-Original-To', 'MIME-Version', 'Received-SPF', 'Delivered-To'];
-    protected $allowedHeaders = ['return-path', 'subject'];
+    protected $removeHeaders = [ 'Received', 'From', 'X-Original-To', 'MIME-Version', 'Received-SPF', 'Delivered-To' ];
+    protected $allowedHeaders = [ 'return-path', 'subject' ];
     /**
      * @var ContentDecoder
      */
@@ -28,7 +28,7 @@ 
      */
     private $swiftContainer;
 
-    public function __construct(array $allowedHeaders = [], array $removeHeaders = [])
+    public function __construct(array $allowedHeaders = [ ], array $removeHeaders = [ ])
     {
         $this->contentDecoder = new ContentDecoder();
         $this->headerDecoder = new HeaderDecoder();
@@ -99,7 +99,7 @@ 
         $parts = $this->parseParts($stream, $partHeaders);
 
         if (!$message) {
-            $message = new \Swift_Message ();
+            $message = new \Swift_Message();
         }
 
         $headers = $this->createHeadersSet($filteredHeaders);
@@ -116,7 +116,7 @@ 
 
     protected function extractHeaders($stream): array
     {
-        $headers = [];
+        $headers = [ ];
         $hName = null;
         while (!feof($stream)) {
             $row = fgets($stream);
@@ -124,19 +124,19 @@ 
                 break;
             }
             if (preg_match('/^([a-z0-9\-]+)\s*:(.*)/i', $row, $mch)) {
-                $hName = strtolower($mch[1]);
-                if (!in_array($hName, ["content-type", "content-transfer-encoding"], true)) {
-                    $hName = $mch[1];
+                $hName = strtolower($mch[ 1 ]);
+                if (!in_array($hName, [ "content-type", "content-transfer-encoding" ], true)) {
+                    $hName = $mch[ 1 ];
                 }
-                $row = $mch[2];
+                $row = $mch[ 2 ];
             }
             if (empty($hName)) {
                 continue;
             }
-            $headers[$hName][] = trim($row);
+            $headers[ $hName ][ ] = trim($row);
         }
         foreach ($headers as $header => $values) {
-            $headers[$header] = $this->headerDecoder->decode(trim(implode(" ", $values)));
+            $headers[ $header ] = $this->headerDecoder->decode(trim(implode(" ", $values)));
         }
         return $headers;
     }
@@ -147,7 +147,7 @@ 
             if (in_array(strtolower($header), $this->removeHeaders, true)
                 && !in_array(strtolower($header), $this->allowedHeaders, true)
             ) {
-                unset($headers[$header]);
+                unset($headers[ $header ]);
             }
         }
         return $headers;
@@ -155,16 +155,16 @@ 
 
     protected function parseParts($stream, array $partHeaders): array
     {
-        $parts = [];
+        $parts = [ ];
         $contentType = $this->extractValueHeader($this->getContentType($partHeaders));
 
         $boundary = null;
         if (stripos($contentType, 'multipart/') !== false) {
             $headerParts = $this->extractHeaderParts($this->getContentType($partHeaders));
-            if (empty($headerParts["boundary"])) {
+            if (empty($headerParts[ "boundary" ])) {
                 throw new InvalidMessageFormatException("The Content-Type header is not well formed, boundary is missing");
             }
-            $boundary = $headerParts["boundary"];
+            $boundary = $headerParts[ "boundary" ];
         }
 
         try {
@@ -176,7 +176,7 @@ 
                 "headers" => $partHeaders,
                 "body" => $e->getData(),
                 "boundary" => $boundary,
-                "parts" => [],
+                "parts" => [ ],
             ];
         }
 
@@ -188,7 +188,7 @@ 
                     $childContentType = $this->extractValueHeader($this->getContentType($partHeaders));
 
                     if (stripos($childContentType, 'multipart/') !== false) {
-                        $parts["parts"][] = $this->parseParts($stream, $partHeaders);
+                        $parts[ "parts" ][ ] = $this->parseParts($stream, $partHeaders);
                         try {
                             $this->extractPart($stream, $boundary, $this->getTransferEncoding($partHeaders));
                         } catch (Exception\EndOfPartReachedException $e) {
@@ -197,12 +197,12 @@ 
                         $this->extractPart($stream, $boundary, $this->getTransferEncoding($partHeaders));
                     }
                 } catch (Exception\EndOfPartReachedException $e) {
-                    $parts["parts"][] = [
+                    $parts[ "parts" ][ ] = [
                         "type" => $childContentType,
                         "parent-type" => $contentType,
                         "headers" => $partHeaders,
                         "body" => $e->getData(),
-                        "parts" => []
+                        "parts" => [ ]
                     ];
 
                     if ($e instanceof Exception\EndOfMultiPartReachedException) {
@@ -227,7 +227,7 @@ 
     private function getContentType(array $partHeaders): string
     {
         if (array_key_exists('content-type', $partHeaders)) {
-            return $partHeaders['content-type'];
+            return $partHeaders[ 'content-type' ];
         }
 
         return '';
@@ -238,7 +238,7 @@ 
         if (strpos($header, ';') !== false) {
             $parts = explode(";", $header);
             array_shift($parts);
-            $p = [];
+            $p = [ ];
             $part = '';
             foreach ($parts as $pv) {
                 if (preg_match('/="[^"]+$/', $pv)) {
@@ -257,12 +257,12 @@ 
                     continue;
                 }
                 list ($k, $v) = explode("=", trim($pv), 2);
-                $p[$k] = trim($v, '"');
+                $p[ $k ] = trim($v, '"');
             }
             return $p;
         }
 
-        return [];
+        return [ ];
     }
 
     /**
@@ -271,7 +271,7 @@ 
      */
     protected function extractPart($stream, ?string $boundary, string $encoding): void
     {
-        $rows = [];
+        $rows = [ ];
         while (!feof($stream)) {
             $row = fgets($stream);
 
@@ -283,7 +283,7 @@ 
                     throw new Exception\EndOfPartReachedException($this->contentDecoder->decode(implode("", $rows), $encoding));
                 }
             }
-            $rows[] = $row;
+            $rows[ ] = $row;
         }
         throw new Exception\EndOfMultiPartReachedException($this->contentDecoder->decode(implode("", $rows), $encoding));
     }
@@ -291,7 +291,7 @@ 
     private function getTransferEncoding(array $partHeaders): string
     {
         if (array_key_exists('content-transfer-encoding', $partHeaders)) {
-            return $partHeaders['content-transfer-encoding'];
+            return $partHeaders[ 'content-transfer-encoding' ];
         }
 
         return '';
@@ -305,13 +305,13 @@ 
             switch (strtolower($name)) {
                 case "content-type":
                     $parts = $this->extractHeaderParts($value);
-                    unset($parts["boundary"]);
+                    unset($parts[ "boundary" ]);
                     $headers->addParameterizedHeader($name, $this->extractValueHeader($value), $parts);
                     break;
                 case "return-path":
                     if (preg_match_all('/([a-z][a-z0-9_\-\.]*@[a-z0-9\.\-]*\.[a-z]{2,5})/i', $value, $mch)) {
-                        foreach ($mch[0] as $k => $mails) {
-                            $headers->addPathHeader($name, $mch[1][$k]);
+                        foreach ($mch[ 0 ] as $k => $mails) {
+                            $headers->addPathHeader($name, $mch[ 1 ][ $k ]);
                         }
                     }
                     break;
@@ -323,18 +323,18 @@ 
                 case "bcc":
                 case "reply-to":
                 case "cc":
-                    $adresses = [];
+                    $adresses = [ ];
                     if (preg_match_all('/(.*?)<([a-z][a-z0-9_\-\.]*@[a-z0-9\.\-]*\.[a-z]{2,5})>\s*[;,]*/i', $value, $mch)) {
-                        foreach ($mch[0] as $k => $mail) {
-                            if (!$mch[1][$k]) {
-                                $adresses[$mch[2][$k]] = trim($mch[2][$k]);
+                        foreach ($mch[ 0 ] as $k => $mail) {
+                            if (!$mch[ 1 ][ $k ]) {
+                                $adresses[ $mch[ 2 ][ $k ] ] = trim($mch[ 2 ][ $k ]);
                             } else {
-                                $adresses[$mch[2][$k]] = trim($mch[1][$k]);
+                                $adresses[ $mch[ 2 ][ $k ] ] = trim($mch[ 1 ][ $k ]);
                             }
                         }
                     } elseif (preg_match_all('/([a-z][a-z0-9_\-\.]*@[a-z0-9\.\-]*\.[a-z]{2,5})/i', $value, $mch)) {
-                        foreach ($mch[0] as $k => $mails) {
-                            $adresses[$mch[1][$k]] = trim($mch[1][$k]);
+                        foreach ($mch[ 0 ] as $k => $mails) {
+                            $adresses[ $mch[ 1 ][ $k ] ] = trim($mch[ 1 ][ $k ]);
                         }
                     }
                     $headers->addMailboxHeader($name, $adresses);
@@ -349,42 +349,42 @@ 
 
     protected function createMessage(array $message, \Swift_Mime_SimpleMimeEntity $entity): void
     {
-        if (!empty($message["parts"]) && stripos($message["type"], 'multipart/') !== false) {
-            if (strpos($message["type"], '/alternative')) {
+        if (!empty($message[ "parts" ]) && stripos($message[ "type" ], 'multipart/') !== false) {
+            if (strpos($message[ "type" ], '/alternative')) {
                 $nestingLevel = \Swift_Mime_SimpleMimeEntity::LEVEL_ALTERNATIVE;
-            } elseif (strpos($message["type"], '/related')) {
+            } elseif (strpos($message[ "type" ], '/related')) {
                 $nestingLevel = \Swift_Mime_SimpleMimeEntity::LEVEL_RELATED;
-            } elseif (strpos($message["type"], '/mixed')) {
+            } elseif (strpos($message[ "type" ], '/mixed')) {
                 $nestingLevel = \Swift_Mime_SimpleMimeEntity::LEVEL_MIXED;
             } else {
                 $nestingLevel = \Swift_Mime_SimpleMimeEntity::LEVEL_TOP;
             }
 
-            $childs = [];
-            foreach ($message["parts"] as $part) {
-                $headers = $this->createHeadersSet($part["headers"]);
-                $encoder = $this->getEncoder($this->getTransferEncoding($part["headers"]));
+            $childs = [ ];
+            foreach ($message[ "parts" ] as $part) {
+                $headers = $this->createHeadersSet($part[ "headers" ]);
+                $encoder = $this->getEncoder($this->getTransferEncoding($part[ "headers" ]));
 
-                if (stripos($part["type"], 'multipart/') !== false) {
-                    $newEntity = new \Swift_Mime_MimePart ($headers, $encoder, $this->getCache(), $this->getIdGenertor());
+                if (stripos($part[ "type" ], 'multipart/') !== false) {
+                    $newEntity = new \Swift_Mime_MimePart($headers, $encoder, $this->getCache(), $this->getIdGenertor());
                 } else {
-                    $newEntity = new \Swift_Mime_SimpleMimeEntity ($headers, $encoder, $this->getCache(), $this->getIdGenertor());
+                    $newEntity = new \Swift_Mime_SimpleMimeEntity($headers, $encoder, $this->getCache(), $this->getIdGenertor());
                 }
 
                 $this->createMessage($part, $newEntity);
 
-                $ref = new \ReflectionObject ($newEntity);
+                $ref = new \ReflectionObject($newEntity);
                 $m = $ref->getMethod('setNestingLevel');
                 $m->setAccessible(true);
                 $m->invoke($newEntity, $nestingLevel);
 
-                $childs[] = $newEntity;
+                $childs[ ] = $newEntity;
             }
 
-            $entity->setContentType($part["type"]);
+            $entity->setContentType($part[ "type" ]);
             $entity->setChildren($childs);
         } else {
-            $entity->setBody($message["body"], $message["type"]);
+            $entity->setBody($message[ "body" ], $message[ "type" ]);
         }
     }