goetas / to-swift-mime-parser

src/MimeParser.php

Doc Comments +3 added lines

@@ -163,6 +163,9 @@
         return trim($row,"\r\n");
     }
 
+    /**
+     * @param resource $stream
+     */
     protected function parseParts($stream, array $part): array
     {
         while (!feof($stream)) {

Spacing +54 added lines, -54 removed lines

@@ -32,8 +32,8 @@ 
 
     public function __construct(array $allowedHeaders = array(), array $removeHeaders = array())
     {
-        $this->contentDecoder = new ContentDecoder ();
-        $this->headerDecoder = new HeaderDecoder ();
+        $this->contentDecoder = new ContentDecoder();
+        $this->headerDecoder = new HeaderDecoder();
 
         $this->allowedHeaders = array_merge($this->allowedHeaders, $allowedHeaders);
         $this->removeHeaders = array_merge($this->removeHeaders, $removeHeaders);
@@ -88,7 +88,7 @@ 
         $partHeaders = $this->extractHeaders($stream);
 
         $filteredHeaders = $this->filterHeaders($partHeaders);
-        $part=array(
+        $part = array(
             "type" => $this->extractValueHeader($this->getContentType($partHeaders)),
             "headers" => $partHeaders,
             "body" => '',
@@ -99,7 +99,7 @@ 
         $parts = $this->parseParts($stream, $part);
 
         if (!$message) {
-            $message = new \Swift_Message ();
+            $message = new \Swift_Message();
         }
 
         $headers = $this->createHeadersSet($filteredHeaders);
@@ -119,25 +119,25 @@ 
         $headers = array();
         $hName = null;
         while (!feof($stream)) {
-            $row = $this->getCurrentLine($stream,false);
+            $row = $this->getCurrentLine($stream, false);
             if ($row == "") {
                 break;
             }
-            $row=$this->getCurrentLine($stream);
+            $row = $this->getCurrentLine($stream);
             if (preg_match('/^([a-z0-9\-]+)\s*:(.*)/i', $row, $mch)) {
-                $hName = strtolower($mch[1]);
+                $hName = strtolower($mch[ 1 ]);
                 if (!in_array($hName, array("content-type", "content-transfer-encoding"))) {
-                    $hName = $mch[1];
+                    $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;
     }
@@ -146,30 +146,30 @@ 
     {
         foreach ($headers as $header => $values) {
             if (in_array(strtolower($header), $this->removeHeaders) && !in_array(strtolower($header), $this->allowedHeaders)) {
-                unset ($headers[$header]);
+                unset ($headers[ $header ]);
             }
         }
         return $headers;
     }
 
-    public function getCurrentLine($stream, $auto_advance=true){
-        $row=null;
-        if (!feof($stream)){
-            $pos=ftell($stream);
+    public function getCurrentLine($stream, $auto_advance = true) {
+        $row = null;
+        if (!feof($stream)) {
+            $pos = ftell($stream);
             $row = fgets($stream);
-            if(!$auto_advance)
-                fseek($stream,$pos);
+            if (!$auto_advance)
+                fseek($stream, $pos);
         }
-        return trim($row,"\r\n");
+        return trim($row, "\r\n");
     }
 
     protected function parseParts($stream, array $part): array
     {
         while (!feof($stream)) {
-            $line=$this->getCurrentLine($stream);
-            if (strpos($part["type"],'multipart/') !== false) {
-                $headerParts = $this->extractHeaderParts($this->getContentType($part['headers']));
-                if (empty($headerParts["boundary"])) {
+            $line = $this->getCurrentLine($stream);
+            if (strpos($part[ "type" ], 'multipart/') !== false) {
+                $headerParts = $this->extractHeaderParts($this->getContentType($part[ 'headers' ]));
+                if (empty($headerParts[ "boundary" ])) {
                     throw new InvalidMessageFormatException("The Content-Type header is not well formed, boundary is missing");
                 }
 
@@ -186,10 +186,10 @@ 
                         "parts" => array()
                     );
                     $child = $this->parseParts($stream, $child_parts);
-                    $part['parts'][]=$child;
+                    $part[ 'parts' ][ ] = $child;
                 }
             } else {
-                $part['body']=$this->parseContent($stream,$this->getTransferEncoding($part['headers']));
+                $part[ 'body' ] = $this->parseContent($stream, $this->getTransferEncoding($part[ 'headers' ]));
                 return $part;
             }
         }
@@ -200,15 +200,15 @@ 
     {
         $contents = array();
         while (!feof($stream)) {
-            $line = $this->getCurrentLine($stream,false);
+            $line = $this->getCurrentLine($stream, false);
             if (preg_match(self::REGEX_BOUNDARY, $line)) {
                 break;
             } else {
-                $contents[] =  $this->getCurrentLine($stream,true);
+                $contents[ ] = $this->getCurrentLine($stream, true);
             }
         }
         //remove last newline ( part of boundary)
-        if(end($contents) =="")
+        if (end($contents) == "")
             array_pop($contents);
         return $this->contentDecoder->decode(implode(PHP_EOL, $contents), $encoding);
     }
@@ -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 '';
@@ -258,7 +258,7 @@ 
                     continue;
                 }
                 list ($k, $v) = explode("=", trim($pv), 2);
-                $p[$k] = trim($v, '"');
+                $p[ $k ] = trim($v, '"');
             }
             return $p;
         } else {
@@ -270,7 +270,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 '';
@@ -284,13 +284,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;
@@ -304,16 +304,16 @@ 
                 case "cc":
                     $adresses = array();
                     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);
@@ -328,44 +328,44 @@ 
 
     protected function createMessage(array $message, \Swift_Mime_SimpleMimeEntity $entity): void
     {
-        if (stripos($message["type"], 'multipart/') !== false && !empty($message["parts"])) {
+        if (stripos($message[ "type" ], 'multipart/') !== false && !empty($message[ "parts" ])) {
 
-            if (strpos($message["type"], '/alternative')) {
+            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 = array();
-            foreach ($message["parts"] as $part) {
+            foreach ($message[ "parts" ] as $part) {
 
-                $headers = $this->createHeadersSet($part["headers"]);
-                $encoder = $this->getEncoder($this->getTransferEncoding($part["headers"]));
+                $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" ]);
         }
     }
 

Braces +6 added lines, -4 removed lines

@@ -157,8 +157,9 @@ 
         if (!feof($stream)){
             $pos=ftell($stream);
             $row = fgets($stream);
-            if(!$auto_advance)
-                fseek($stream,$pos);
+            if(!$auto_advance) {
+                            fseek($stream,$pos);
+            }
         }
         return trim($row,"\r\n");
     }
@@ -208,8 +209,9 @@ 
             }
         }
         //remove last newline ( part of boundary)
-        if(end($contents) =="")
-            array_pop($contents);
+        if(end($contents) =="") {
+                    array_pop($contents);
+        }
         return $this->contentDecoder->decode(implode(PHP_EOL, $contents), $encoding);
     }