goetas / to-swift-mime-parser

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

Doc Comments +10 added lines

@@ -4,6 +4,10 @@ 
 
 class HeaderDecoder {
     public static $decodeWindows1252 = false;
+
+    /**
+     * @param string $string
+     */
     public function decode($string) {
         /* Take out any spaces between multiple encoded words. */
         $string = preg_replace ( '|\?=\s+=\?|', '?==?', $string );
@@ -62,6 +66,12 @@ 
 
         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
         return $str;

Spacing +15 added lines, -15 removed lines

@@ -6,50 +6,50 @@ 
     public static $decodeWindows1252 = false;
     public function decode($string) {
         /* Take out any spaces between multiple encoded words. */
-        $string = preg_replace ( '|\?=\s+=\?|', '?==?', $string );
+        $string = preg_replace('|\?=\s+=\?|', '?==?', $string);
 
         $out = '';
         $old_pos = 0;
 
-        while ( ($pos = strpos ( $string, '=?', $old_pos )) !== false ) {
+        while (($pos = strpos($string, '=?', $old_pos)) !== false) {
             /* Save any preceding text. */
-            $out .= substr ( $string, $old_pos, $pos - $old_pos );
+            $out .= substr($string, $old_pos, $pos - $old_pos);
 
             /* Search for first delimiting question mark (charset). */
-            if (($d1 = strpos ( $string, '?', $pos + 2 )) === false) {
+            if (($d1 = strpos($string, '?', $pos + 2)) === false) {
                 break;
             }
 
-            $orig_charset = substr ( $string, $pos + 2, $d1 - $pos - 2 );
-            if (self::$decodeWindows1252 && mb_strtolower ( $orig_charset ) == 'iso-8859-1') {
+            $orig_charset = substr($string, $pos + 2, $d1 - $pos - 2);
+            if (self::$decodeWindows1252 && mb_strtolower($orig_charset) == 'iso-8859-1') {
                 $orig_charset = 'windows-1252';
             }
 
             /* Search for second delimiting question mark (encoding). */
-            if (($d2 = strpos ( $string, '?', $d1 + 1 )) === false) {
+            if (($d2 = strpos($string, '?', $d1 + 1)) === false) {
                 break;
             }
 
-            $encoding = substr ( $string, $d1 + 1, $d2 - $d1 - 1 );
+            $encoding = substr($string, $d1 + 1, $d2 - $d1 - 1);
 
             /* Search for end of encoded data. */
-            if (($end = strpos ( $string, '?=', $d2 + 1 )) === false) {
+            if (($end = strpos($string, '?=', $d2 + 1)) === false) {
                 break;
             }
 
-            $encoded_text = substr ( $string, $d2 + 1, $end - $d2 - 1 );
+            $encoded_text = substr($string, $d2 + 1, $end - $d2 - 1);
 
             switch ($encoding) {
                 case 'Q' :
                 case 'q' :
-                    $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' );
+                    $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;
 
                 case 'B' :
                 case 'b' :
-                    $out .= self::convertCharset ( base64_decode ( $encoded_text ), $orig_charset, 'UTF-8' );
+                    $out .= self::convertCharset(base64_decode($encoded_text), $orig_charset, 'UTF-8');
                     break;
 
                 default :
@@ -60,7 +60,7 @@ 
             $old_pos = $end + 2;
         }
 
-        return $out . substr ( $string, $old_pos );
+        return $out . substr($string, $old_pos);
     }
     public static function convertCharset($str, $orig, $to) {
         //@todo convert charset

lib/Goetas/Mail/ToSwiftMailParser/MimeParser.php

Doc Comments +6 added lines, -2 removed lines

@@ -23,10 +23,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) {
         $partHeaders = $this->extractHeaders ( $stream );
@@ -235,6 +235,10 @@ 
             $entity->setBody ( $message ["body"], $message ["type"] );
         }
     }
+
+    /**
+     * @return string
+     */
     private function extractValueHeader($header) {
         $pos = stripos ( $header, ';' );
         if ($pos !== false) {

Indentation +2 added lines, -2 removed lines

@@ -267,10 +267,10 @@
 
             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;

Spacing +126 added lines, -126 removed lines

@@ -10,16 +10,16 @@ 
     private $grammar;
     private $contentDecoder;
     private $headerDecoder;
-    protected $removeHeaders = array ("Received","From","X-Original-To","MIME-Version","Received-SPF","Delivered-To");
-    protected $allowedHeaders = array ("return-path","subject");
+    protected $removeHeaders = array("Received", "From", "X-Original-To", "MIME-Version", "Received-SPF", "Delivered-To");
+    protected $allowedHeaders = array("return-path", "subject");
     public function __construct(array $allowedHeaders = array(), array $removeHeaders = array()) {
-        $this->cache = \Swift_DependencyContainer::getInstance ()->lookup ( 'cache' );
-        $this->grammar = \Swift_DependencyContainer::getInstance ()->lookup ( 'mime.grammar' );
-        $this->contentDecoder = new ContentDecoder ();
-        $this->headerDecoder = new HeaderDecoder ();
+        $this->cache = \Swift_DependencyContainer::getInstance()->lookup('cache');
+        $this->grammar = \Swift_DependencyContainer::getInstance()->lookup('mime.grammar');
+        $this->contentDecoder = new ContentDecoder();
+        $this->headerDecoder = new HeaderDecoder();
 
-        $this->allowedHeaders = array_merge ( $this->allowedHeaders, $allowedHeaders );
-        $this->removeHeaders = array_merge ( $this->removeHeaders, $removeHeaders );
+        $this->allowedHeaders = array_merge($this->allowedHeaders, $allowedHeaders);
+        $this->removeHeaders = array_merge($this->removeHeaders, $removeHeaders);
     }
     /**
      *
@@ -28,25 +28,25 @@ 
      * @param \Swift_Mime_MimeEntity $message (default to null)
      * @return Swift_Mime_MimeEntity|\Swift_Message
      */
-    public function parseStream($stream, $fillHeaders = false,  \Swift_Mime_MimeEntity $message = null) {
-        $partHeaders = $this->extractHeaders ( $stream );
+    public function parseStream($stream, $fillHeaders = false, \Swift_Mime_MimeEntity $message = null) {
+        $partHeaders = $this->extractHeaders($stream);
 
-        $filteredHeaders = $this->filterHeaders ( $partHeaders );
+        $filteredHeaders = $this->filterHeaders($partHeaders);
 
-        $parts = $this->parseParts ( $stream, $partHeaders );
+        $parts = $this->parseParts($stream, $partHeaders);
 
-        if(!$message){
-            $message = new \Swift_Message ();
+        if (!$message) {
+            $message = new \Swift_Message();
         }
 
-        $headers = $this->createHeadersSet ( $filteredHeaders );
+        $headers = $this->createHeadersSet($filteredHeaders);
 
-        foreach ( $headers->getAll () as $name => $header ) {
-            if ($fillHeaders || in_array ( strtolower ( $header->getFieldName () ), $this->allowedHeaders )) {
-                $message->getHeaders ()->set ( $header );
+        foreach ($headers->getAll() as $name => $header) {
+            if ($fillHeaders || in_array(strtolower($header->getFieldName()), $this->allowedHeaders)) {
+                $message->getHeaders()->set($header);
             }
         }
-        $this->createMessage ( $parts, $message );
+        $this->createMessage($parts, $message);
 
         return $message;
     }
@@ -57,11 +57,11 @@ 
      * @return \Swift_Message
      */
     public function parseString($string) {
-        $fp = tmpfile ();
-        fwrite ( $fp, $string );
-        rewind ( $fp );
-        $message = $this->parseStream ( $fp );
-        fclose ( $fp );
+        $fp = tmpfile();
+        fwrite($fp, $string);
+        rewind($fp);
+        $message = $this->parseStream($fp);
+        fclose($fp);
         return $message;
     }
     /**
@@ -71,49 +71,49 @@ 
      * @return \Swift_Message
      */
     public function parseFile($path) {
-        $fp = fopen ( $path, "rb" );
-        $message = $this->parseStream ( $fp );
-        fclose ( $fp );
+        $fp = fopen($path, "rb");
+        $message = $this->parseStream($fp);
+        fclose($fp);
         return $message;
     }
 
     protected function parseParts($stream, $partHeaders) {
-        $parts = array ();
+        $parts = array();
         $part = 0;
-        $contentTypeHeader = array_key_exists( 'content-type', $partHeaders ) ? $partHeaders ['content-type']  : '';
-        $contentType =  $this->extractValueHeader( $contentTypeHeader );
+        $contentTypeHeader = array_key_exists('content-type', $partHeaders) ? $partHeaders [ 'content-type' ] : '';
+        $contentType = $this->extractValueHeader($contentTypeHeader);
 
-        if (stripos ( $contentType, 'multipart/' ) !== false) {
-            $headerParts = $this->extractHeaderParts ( $contentTypeHeader );
-            $boundary = $headerParts ["boundary"];
+        if (stripos($contentType, 'multipart/') !== false) {
+            $headerParts = $this->extractHeaderParts($contentTypeHeader);
+            $boundary = $headerParts [ "boundary" ];
         } else {
             $boundary = null;
         }
 
         try {
             // body
-            $transferEncoding = array_key_exists( 'content-transfer-encoding',  $partHeaders ) ? $partHeaders ['content-transfer-encoding'] : '';
-            $this->extractPart ( $stream, $boundary, $transferEncoding );
-        } catch ( Exception\EndOfPartReachedException $e ) {
-            $parts = array ("type" => $contentType,"headers" => $partHeaders,"body" => $e->getData (),"boundary" => $boundary,"parts" => array ());
+            $transferEncoding = array_key_exists('content-transfer-encoding', $partHeaders) ? $partHeaders [ 'content-transfer-encoding' ] : '';
+            $this->extractPart($stream, $boundary, $transferEncoding);
+        } catch (Exception\EndOfPartReachedException $e) {
+            $parts = array("type" => $contentType, "headers" => $partHeaders, "body" => $e->getData(), "boundary" => $boundary, "parts" => array());
         }
 
         if ($boundary) {
-            while ( ! feof ( $stream ) ) {
+            while (!feof($stream)) {
                 try {
-                    $partHeaders = $this->extractHeaders ( $stream );
-                    $childContentType = $this->extractValueHeader ( $partHeaders ["content-type"] );
+                    $partHeaders = $this->extractHeaders($stream);
+                    $childContentType = $this->extractValueHeader($partHeaders [ "content-type" ]);
 
-                    if (stripos ( $childContentType, 'multipart/' ) !== false) {
-                        $parts ["parts"] [] = $this->parseParts ( $stream, $partHeaders );
+                    if (stripos($childContentType, 'multipart/') !== false) {
+                        $parts [ "parts" ] [ ] = $this->parseParts($stream, $partHeaders);
                         try {
-                            $this->extractPart ( $stream, $boundary, $partHeaders ["content-transfer-encoding"] );
-                        } catch ( Exception\EndOfPartReachedException $e ) {}
+                            $this->extractPart($stream, $boundary, $partHeaders [ "content-transfer-encoding" ]);
+                        } catch (Exception\EndOfPartReachedException $e) {}
                     } else {
-                        $this->extractPart ( $stream, $boundary, $partHeaders ["content-transfer-encoding"] );
+                        $this->extractPart($stream, $boundary, $partHeaders [ "content-transfer-encoding" ]);
                     }
-                } catch ( Exception\EndOfPartReachedException $e ) {
-                    $parts ["parts"] [] = array ("type" => $childContentType,"parent-type" => $contentType,"headers" => $partHeaders,"body" => $e->getData (),"parts" => array ());
+                } catch (Exception\EndOfPartReachedException $e) {
+                    $parts [ "parts" ] [ ] = array("type" => $childContentType, "parent-type" => $contentType, "headers" => $partHeaders, "body" => $e->getData(), "parts" => array());
 
                     if ($e instanceof Exception\EndOfMultiPartReachedException) {
                         break;
@@ -131,16 +131,16 @@ 
     protected function getEncoder($type) {
         switch ($type) {
             case "base64" :
-                return \Swift_DependencyContainer::getInstance ()->lookup ( 'mime.base64contentencoder' );
+                return \Swift_DependencyContainer::getInstance()->lookup('mime.base64contentencoder');
                 break;
             case "8bit" :
-                return \Swift_DependencyContainer::getInstance ()->lookup ( 'mime.8bitcontentencoder' );
+                return \Swift_DependencyContainer::getInstance()->lookup('mime.8bitcontentencoder');
                 break;
             case "7bit" :
-                return \Swift_DependencyContainer::getInstance ()->lookup ( 'mime.7bitcontentencoder' );
+                return \Swift_DependencyContainer::getInstance()->lookup('mime.7bitcontentencoder');
                 break;
             default :
-                return \Swift_DependencyContainer::getInstance ()->lookup ( 'mime.qpcontentencoder' );
+                return \Swift_DependencyContainer::getInstance()->lookup('mime.qpcontentencoder');
                 break;
         }
     }
@@ -150,162 +150,162 @@ 
      * @return \Swift_Mime_HeaderSet
      */
     protected function createHeadersSet(array $headersRaw) {
-        $headers = \Swift_DependencyContainer::getInstance ()->lookup ( 'mime.headerset' );
+        $headers = \Swift_DependencyContainer::getInstance()->lookup('mime.headerset');
 
-        foreach ( $headersRaw as $name => $value ) {
-            switch (strtolower ( $name )) {
+        foreach ($headersRaw as $name => $value) {
+            switch (strtolower($name)) {
                 case "content-type" :
-                    $parts = $this->extractHeaderParts ( $value );
-                    unset ( $parts ["boundary"] );
-                    $headers->addParameterizedHeader ( $name, $this->extractValueHeader ( $value ), $parts );
+                    $parts = $this->extractHeaderParts($value);
+                    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] );
+                    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 ]);
                         }
                     }
                 break;
                 case "date":
-                    $headers->addDateHeader ( $name,  strtotime($value) );
+                    $headers->addDateHeader($name, strtotime($value));
                 case "to":
                 case "from" :
                 case "bcc" :
                 case "reply-to" :
                 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]] = $mch [2] [$k];
+                    $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 ] ] = $mch [ 2 ] [ $k ];
                             } else {
-                                $adresses [$mch [2] [$k]] = $mch [1] [$k];
+                                $adresses [ $mch [ 2 ] [ $k ] ] = $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]] = $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 ] ] = $mch [ 1 ] [ $k ];
                         }
                     }
-                    $headers->addMailboxHeader ( $name, $adresses );
+                    $headers->addMailboxHeader($name, $adresses);
                     break;
                 default :
-                    $headers->addTextHeader ( $name, $value );
+                    $headers->addTextHeader($name, $value);
                     break;
             }
         }
         return $headers;
     }
     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 ) {
+            $childrens = array();
+            foreach ($message [ "parts" ] as $part) {
 
-                $headers = $this->createHeadersSet ( $part ["headers"] );
-                $encoder = $this->getEncoder ( $part ["headers"] ["content-transfer-encoding"] );
+                $headers = $this->createHeadersSet($part [ "headers" ]);
+                $encoder = $this->getEncoder($part [ "headers" ] [ "content-transfer-encoding" ]);
 
-                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 );
+                $this->createMessage($part, $newEntity);
 
-                $ref = new \ReflectionObject ( $newEntity );
-                $m = $ref->getMethod ( '_setNestingLevel' );
-                $m->setAccessible ( true );
-                $m->invoke ( $newEntity, $nestingLevel );
+                $ref = new \ReflectionObject($newEntity);
+                $m = $ref->getMethod('_setNestingLevel');
+                $m->setAccessible(true);
+                $m->invoke($newEntity, $nestingLevel);
 
-                $childrens [] = $newEntity;
+                $childrens [ ] = $newEntity;
             }
 
-            $entity->setContentType ( $part ["type"] );
-            $entity->setChildren ( $childrens );
+            $entity->setContentType($part [ "type" ]);
+            $entity->setChildren($childrens);
         } else {
-            $entity->setBody ( $message ["body"], $message ["type"] );
+            $entity->setBody($message [ "body" ], $message [ "type" ]);
         }
     }
     private function extractValueHeader($header) {
-        $pos = stripos ( $header, ';' );
+        $pos = stripos($header, ';');
         if ($pos !== false) {
-            return substr ( $header, 0, $pos );
+            return substr($header, 0, $pos);
         } else {
             return $header;
         }
     }
     private function extractHeaderParts($header) {
-        $pos = stripos ( $header, ';' );
+        $pos = stripos($header, ';');
         if ($pos !== false) {
 
-            $parts = explode ( ";", $header );
-            array_shift ( $parts );
+            $parts = explode(";", $header);
+            array_shift($parts);
 
-            $p = array ();
-            foreach ( $parts as $pv ) {
-                list ( $k, $v ) = explode ( "=", trim ( $pv ), 2 );
-                $p [$k] = trim ( $v, '"' );
+            $p = array();
+            foreach ($parts as $pv) {
+                list ($k, $v) = explode("=", trim($pv), 2);
+                $p [ $k ] = trim($v, '"');
             }
             return $p;
         } else {
-            return array ();
+            return array();
         }
     }
     protected function extractPart($stream, $boundary, $encoding) {
-        $rows = array ();
-        while ( ! feof ( $stream ) ) {
-            $row = fgets ( $stream );
+        $rows = array();
+        while (!feof($stream)) {
+            $row = fgets($stream);
 
             if ($boundary !== null) {
-                if(strpos($row, "--$boundary--")===0){
-                	throw new Exception\EndOfMultiPartReachedException ( $this->contentDecoder->decode ( implode ( "", $rows ), $encoding ) );
+                if (strpos($row, "--$boundary--") === 0) {
+                	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 ) );
+                if (strpos($row, "--$boundary") === 0) {
+                	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));
     }
     protected function extractHeaders($stream) {
-        $headers = array ();
+        $headers = array();
         $hName = null;
-        while ( ! feof ( $stream ) ) {
-            $row = fgets ( $stream );
+        while (!feof($stream)) {
+            $row = fgets($stream);
             if ($row == "\r\n" || $row == "\n" || $row == "\r") {
                 break;
             }
-            if (preg_match ( '/^([a-z0-9\-]+)\s*:(.*)/i', $row, $mch )) {
-                $hName = strtolower ( $mch [1] );
-                if (! in_array ( $hName, array ("content-type","content-transfer-encoding") )) {
-                    $hName = $mch [1];
+            if (preg_match('/^([a-z0-9\-]+)\s*:(.*)/i', $row, $mch)) {
+                $hName = strtolower($mch [ 1 ]);
+                if (!in_array($hName, array("content-type", "content-transfer-encoding"))) {
+                    $hName = $mch [ 1 ];
                 }
-                $row = $mch [2];
+                $row = $mch [ 2 ];
             }
-            if (! $hName) {
+            if (!$hName) {
                 continue;
             }
-            $headers [$hName] [] = trim ( $row );
+            $headers [ $hName ] [ ] = trim($row);
         }
-        foreach ( $headers as $header => $values ) {
-            $headers [$header] = $this->headerDecoder->decode ( trim ( implode ( " ", $values ) ) );
+        foreach ($headers as $header => $values) {
+            $headers [ $header ] = $this->headerDecoder->decode(trim(implode(" ", $values)));
         }
         return $headers;
     }
     private function filterHeaders(array $headers) {
-        foreach ( $headers as $header => $values ) {
-            if(in_array(strtolower ( $header ), $this->removeHeaders) && !in_array(strtolower ( $header ), $this->allowedHeaders)){
-                unset ( $headers [$header] );
+        foreach ($headers as $header => $values) {
+            if (in_array(strtolower($header), $this->removeHeaders) && !in_array(strtolower($header), $this->allowedHeaders)) {
+                unset ($headers [ $header ]);
             }
         }
         return $headers;

lib/Goetas/Mail/ToSwiftMailParser/Exception/EndOfPartReachedException.php

Spacing +2 added lines, -2 removed lines

@@ -3,10 +3,10 @@
 namespace Goetas\Mail\ToSwiftMailParser\Exception;
 
 class EndOfPartReachedException extends \Exception {
-    protected $data = array ();
+    protected $data = array();
     public function __construct($data) {
         $this->data = $data;
-        parent::__construct ();
+        parent::__construct();
     }
     public function getData() {
         return $this->data;

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

Spacing +3 added lines, -3 removed lines

@@ -5,11 +5,11 @@
 class ContentDecoder {
     public function decode($string, $from) {
         if ($from == "base64") {
-            return base64_decode ( $string );
+            return base64_decode($string);
         } elseif ($from == "7bit") {
-            return quoted_printable_decode ( $string );
+            return quoted_printable_decode($string);
         } elseif ($from == "quoted-printable") {
-            return quoted_printable_decode ( $string );
+            return quoted_printable_decode($string);
         }
         return $string;
     }