goetas / to-swift-mime-parser

lib/Goetas/Mail/ToSwiftMailParser/MimeParser.php

Doc Comments +5 added lines, -2 removed lines

@@ -42,10 +42,10 @@ 
 
     /**
      *
-     * @param stream $stream
+     * @param resource $stream
      * @param boolean $fillHeaders (default to false)
      * @param \Swift_Mime_SimpleMimeEntity $message (default to null)
-     * @return Swift_Mime_SimpleMimeEntity|\Swift_Message
+     * @return \Swift_Mime_SimpleMimeEntity
      */
     public function parseStream($stream, $fillHeaders = false, \Swift_Mime_SimpleMimeEntity $message = null)
     {
@@ -166,6 +166,9 @@ 
         return $parts;
     }
 
+    /**
+     * @return string
+     */
     private function extractValueHeader($header)
     {
         $pos = stripos($header, ';');

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Goetas\Mail\ToSwiftMailParser;
 
 use Goetas\Mail\ToSwiftMailParser\Mime\ContentDecoder;
-use Goetas\Mail\ToSwiftMailParser\Mime\Grammar;
 use Goetas\Mail\ToSwiftMailParser\Mime\HeaderDecoder;
 
 class MimeParser

Spacing +42 added lines, -42 removed lines

@@ -23,8 +23,8 @@ 
         $swiftContainer = \Swift_DependencyContainer::getInstance();
         $this->cache = $swiftContainer->lookup(static::SWIFT_CONTAINER_CACHE_KEY);
         $this->idGenerator = $swiftContainer->lookup(static::SWIFT_CONTAINER_ID_GENERATOR_KEY);
-        $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);
@@ -56,7 +56,7 @@ 
         $parts = $this->parseParts($stream, $partHeaders);
 
         if (!$message) {
-            $message = new \Swift_Message ();
+            $message = new \Swift_Message();
         }
 
         $headers = $this->createHeadersSet($filteredHeaders);
@@ -81,19 +81,19 @@ 
                 break;
             }
             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;
     }
@@ -102,7 +102,7 @@ 
     {
         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;
@@ -115,7 +115,7 @@ 
 
         if (stripos($contentType, 'multipart/') !== false) {
             $headerParts = $this->extractHeaderParts($this->getContentType($partHeaders));
-            $boundary = $headerParts ["boundary"];
+            $boundary = $headerParts [ "boundary" ];
         } else {
             $boundary = null;
         }
@@ -140,7 +140,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) {
@@ -149,7 +149,7 @@ 
                         $this->extractPart($stream, $boundary, $this->getTransferEncoding($partHeaders));
                     }
                 } catch (Exception\EndOfPartReachedException $e) {
-                    $parts ["parts"] [] = array(
+                    $parts [ "parts" ] [ ] = array(
                         "type" => $childContentType,
                         "parent-type" => $contentType,
                         "headers" => $partHeaders,
@@ -179,7 +179,7 @@ 
     private function getContentType(array $partHeaders)
     {
         if (array_key_exists('content-type', $partHeaders)) {
-            return $partHeaders['content-type'];
+            return $partHeaders[ 'content-type' ];
         }
 
         return '';
@@ -197,7 +197,7 @@ 
                     continue;
                 }
                 list ($k, $v) = explode("=", trim($pv), 2);
-                $p [$k] = trim($v, '"');
+                $p [ $k ] = trim($v, '"');
             }
             return $p;
         } else {
@@ -212,21 +212,21 @@ 
 
             if ($boundary !== null) {
                 if (strpos($row, "--$boundary--") === 0) {
-                    throw new Exception\EndOfMultiPartReachedException ($this->contentDecoder->decode(implode("", $rows), $encoding));
+                    throw new Exception\EndOfMultiPartReachedException($this->contentDecoder->decode(implode("", $rows), $encoding));
                 }
                 if (strpos($row, "--$boundary") === 0) {
-                    throw new Exception\EndOfPartReachedException ($this->contentDecoder->decode(implode("", $rows), $encoding));
+                    throw new Exception\EndOfPartReachedException($this->contentDecoder->decode(implode("", $rows), $encoding));
                 }
             }
-            $rows [] = $row;
+            $rows [ ] = $row;
         }
-        throw new Exception\EndOfMultiPartReachedException ($this->contentDecoder->decode(implode("", $rows), $encoding));
+        throw new Exception\EndOfMultiPartReachedException($this->contentDecoder->decode(implode("", $rows), $encoding));
     }
 
     private function getTransferEncoding(array $partHeaders)
     {
         if (array_key_exists('content-transfer-encoding', $partHeaders)) {
-            return $partHeaders ['content-transfer-encoding'];
+            return $partHeaders [ 'content-transfer-encoding' ];
         }
 
         return '';
@@ -245,13 +245,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;
@@ -265,16 +265,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);
@@ -289,42 +289,42 @@ 
 
     protected function createMessage(array $message, \Swift_Mime_SimpleMimeEntity $entity)
     {
-        if (stripos($message ["type"], 'multipart/') !== false) {
+        if (stripos($message [ "type" ], 'multipart/') !== false) {
 
-            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;
             }
 
             $childrens = 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->cache, $this->idGenerator);
+                if (stripos($part [ "type" ], 'multipart/') !== false) {
+                    $newEntity = new \Swift_Mime_MimePart($headers, $encoder, $this->cache, $this->idGenerator);
                 } else {
-                    $newEntity = new \Swift_Mime_SimpleMimeEntity ($headers, $encoder, $this->cache, $this->idGenerator);
+                    $newEntity = new \Swift_Mime_SimpleMimeEntity($headers, $encoder, $this->cache, $this->idGenerator);
                 }
 
                 $this->createMessage($part, $newEntity);
 
-                $ref = new \ReflectionObject ($newEntity);
+                $ref = new \ReflectionObject($newEntity);
                 $m = $ref->getMethod('setNestingLevel');
                 $m->setAccessible(true);
                 $m->invoke($newEntity, $nestingLevel);
 
-                $childrens [] = $newEntity;
+                $childrens [ ] = $newEntity;
             }
 
-            $entity->setContentType($part ["type"]);
+            $entity->setContentType($part [ "type" ]);
             $entity->setChildren($childrens);
         } else {
-            $entity->setBody($message ["body"], $message ["type"]);
+            $entity->setBody($message [ "body" ], $message [ "type" ]);
         }
     }