goetas / to-swift-mime-parser

lib/Goetas/Mail/ToSwiftMailParser/Mime/HeaderDecoder.php

Doc Comments +8 added lines

@@ -6,6 +6,9 @@ 
 {
     public static $decodeWindows1252 = false;
 
+    /**
+     * @param string $string
+     */
     public function decode($string)
     {
         /* Take out any spaces between multiple encoded words. */
@@ -66,6 +69,11 @@ 
         return $out . substr($string, $old_pos);
     }
 
+    /**
+     * @param string $str
+     * @param string $orig
+     * @param string $to
+     */
     public static function convertCharset($str, $orig, $to)
     {
         //@todo convert charset

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,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, 'UTF-8');
                     break;
 

lib/Goetas/Mail/ToSwiftMailParser/MimeParser.php

Doc Comments +5 added lines, -2 removed lines

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

Spacing +42 added lines, -42 removed lines

@@ -18,8 +18,8 @@ 
     {
         $this->cache = \Swift_DependencyContainer::getInstance()->lookup('cache');
         $this->grammar = \Swift_DependencyContainer::getInstance()->lookup('mime.grammar');
-        $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);
@@ -57,7 +57,7 @@ 
         $parts = $this->parseParts($stream, $partHeaders);
 
         if (!$message) {
-            $message = new \Swift_Message ();
+            $message = new \Swift_Message();
         }
 
         $headers = $this->createHeadersSet($filteredHeaders);
@@ -82,19 +82,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 (!$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;
     }
@@ -103,7 +103,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;
@@ -116,7 +116,7 @@ 
 
         if (stripos($contentType, 'multipart/') !== false) {
             $headerParts = $this->extractHeaderParts($this->getContentType($partHeaders));
-            $boundary = $headerParts ["boundary"];
+            $boundary = $headerParts [ "boundary" ];
         } else {
             $boundary = null;
         }
@@ -141,7 +141,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) {
@@ -150,7 +150,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,
@@ -180,7 +180,7 @@ 
     private function getContentType(array $partHeaders)
     {
         if (array_key_exists('content-type', $partHeaders)) {
-            return $partHeaders['content-type'];
+            return $partHeaders[ 'content-type' ];
         }
 
         return '';
@@ -198,7 +198,7 @@ 
                     continue;
                 }
                 list ($k, $v) = explode("=", trim($pv), 2);
-                $p [$k] = trim($v, '"');
+                $p [ $k ] = trim($v, '"');
             }
             return $p;
         } else {
@@ -214,21 +214,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 '';
@@ -247,13 +247,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;
@@ -266,16 +266,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);
@@ -290,42 +290,42 @@ 
 
     protected function createMessage(array $message, \Swift_Mime_MimeEntity $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_MimeEntity::LEVEL_ALTERNATIVE;
-            } elseif (strpos($message ["type"], '/related')) {
+            } elseif (strpos($message [ "type" ], '/related')) {
                 $nestingLevel = \Swift_Mime_MimeEntity::LEVEL_RELATED;
-            } elseif (strpos($message ["type"], '/mixed')) {
+            } elseif (strpos($message [ "type" ], '/mixed')) {
                 $nestingLevel = \Swift_Mime_MimeEntity::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->grammar);
+                if (stripos($part [ "type" ], 'multipart/') !== false) {
+                    $newEntity = new \Swift_Mime_MimePart($headers, $encoder, $this->cache, $this->grammar);
                 } else {
-                    $newEntity = new \Swift_Mime_SimpleMimeEntity ($headers, $encoder, $this->cache, $this->grammar);
+                    $newEntity = new \Swift_Mime_SimpleMimeEntity($headers, $encoder, $this->cache, $this->grammar);
                 }
 
                 $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" ]);
         }
     }