voku / swiftmailer

lib/classes/Swift/FileSpool.php

Spacing +7 added lines, -7 removed lines

@@ -96,10 +96,10 @@ 
     public function queueMessage(Swift_Mime_Message $message)
     {
         $ser = serialize($message);
-        $fileName = $this->_path . '/' . $this->getRandomString(10);
+        $fileName = $this->_path.'/'.$this->getRandomString(10);
         for ($i = 0; $i < $this->_retryLimit; ++$i) {
             /* We try an exclusive creation of the file. This is an atomic operation, it avoid locking mechanism */
-            $fp = @fopen($fileName . '.message', 'x');
+            $fp = @fopen($fileName.'.message', 'x');
             if (false !== $fp) {
                 if (false === fwrite($fp, $ser)) {
                     return false;
@@ -156,7 +156,7 @@ 
             }
         }
 
-        $failedRecipients = (array)$failedRecipients;
+        $failedRecipients = (array) $failedRecipients;
         $count = 0;
         $time = time();
         foreach ($directoryIterator as $file) {
@@ -167,12 +167,12 @@ 
             }
 
             /* We try a rename, it's an atomic operation, and avoid locking the file */
-            if (rename($file, $file . '.sending')) {
-                $message = unserialize(file_get_contents($file . '.sending'));
+            if (rename($file, $file.'.sending')) {
+                $message = unserialize(file_get_contents($file.'.sending'));
 
                 $count += $transport->send($message, $failedRecipients);
 
-                unlink($file . '.sending');
+                unlink($file.'.sending');
             } else {
                 /* This message has just been catched by another process */
                 continue;
@@ -204,7 +204,7 @@ 
         $ret = '';
         $strlen = strlen($base);
         for ($i = 0; $i < $count; ++$i) {
-            $ret .= $base[((int)mt_rand(0, $strlen - 1))];
+            $ret .= $base[((int) mt_rand(0, $strlen - 1))];
         }
 
         return $ret;

lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php

Spacing +3 added lines, -3 removed lines

@@ -139,7 +139,7 @@ 
      */
     public function setTimeout($timeout)
     {
-        $this->_timeout = (int)$timeout;
+        $this->_timeout = (int) $timeout;
 
         return $this;
     }
@@ -306,11 +306,11 @@ 
         $host = $this->_host;
         switch (strtolower($this->_crypto)) {
             case 'ssl':
-                $host = 'ssl://' . $host;
+                $host = 'ssl://'.$host;
                 break;
 
             case 'tls':
-                $host = 'tls://' . $host;
+                $host = 'tls://'.$host;
                 break;
         }
 

lib/classes/Swift/StreamFilters/StringReplacementFilter.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
             return false;
         }
 
-        foreach ((array)$this->_search as $needle) {
+        foreach ((array) $this->_search as $needle) {
             if (
                 $needle
                 &&

lib/classes/Swift/Mime/SimpleMimeEntity.php

Spacing +12 added lines, -12 removed lines

@@ -468,7 +468,7 @@ 
     public function getBoundary()
     {
         if (!isset($this->_boundary)) {
-            $this->_boundary = '_=_swift_v5_' . time() . '_' . md5(getmypid() . mt_rand() . uniqid('', true)) . '_=_';
+            $this->_boundary = '_=_swift_v5_'.time().'_'.md5(getmypid().mt_rand().uniqid('', true)).'_=_';
         }
 
         return $this->_boundary;
@@ -539,7 +539,7 @@ 
             if ($this->_cache->hasKey($this->_cacheKey, 'body')) {
                 $body = $this->_cache->getString($this->_cacheKey, 'body');
             } else {
-                $body = "\r\n" . $this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
+                $body = "\r\n".$this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
                 $this->_cache->setString($this->_cacheKey, 'body', $body, Swift_KeyCache::MODE_WRITE);
             }
             $string .= $body;
@@ -547,10 +547,10 @@ 
 
         if (!empty($this->_immediateChildren)) {
             foreach ($this->_immediateChildren as $child) {
-                $string .= "\r\n\r\n--" . $this->getBoundary() . "\r\n";
+                $string .= "\r\n\r\n--".$this->getBoundary()."\r\n";
                 $string .= $child->toString();
             }
-            $string .= "\r\n\r\n--" . $this->getBoundary() . "--\r\n";
+            $string .= "\r\n\r\n--".$this->getBoundary()."--\r\n";
         }
 
         return $string;
@@ -617,10 +617,10 @@ 
 
         if (!empty($this->_immediateChildren)) {
             foreach ($this->_immediateChildren as $child) {
-                $is->write("\r\n\r\n--" . $this->getBoundary() . "\r\n");
+                $is->write("\r\n\r\n--".$this->getBoundary()."\r\n");
                 $child->toByteStream($is);
             }
-            $is->write("\r\n\r\n--" . $this->getBoundary() . "--\r\n");
+            $is->write("\r\n\r\n--".$this->getBoundary()."--\r\n");
         }
     }
 
@@ -751,12 +751,12 @@ 
     {
         $idLeft = $this->_generateNewCacheKey();
         $idRight = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated';
-        $id = $idLeft . '@' . $idRight;
+        $id = $idLeft.'@'.$idRight;
 
         try {
             $this->_assertValidId($id);
         } catch (Swift_RfcComplianceException $e) {
-            $id = $idLeft . '@swift.generated';
+            $id = $idLeft.'@swift.generated';
         }
 
         return $id;
@@ -769,7 +769,7 @@ 
      */
     private function _generateNewCacheKey()
     {
-        return md5(getmypid() . '.' . time() . '.' . uniqid(mt_rand(), true));
+        return md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
     }
 
     private function _readStream(Swift_OutputByteStream $os)
@@ -852,10 +852,10 @@ 
         $lowercaseType = Swift::strtolowerWithStaticCache($child->getContentType());
 
         if (isset($filter[$realLevel]) && isset($filter[$realLevel][$lowercaseType])) {
-            return (int)$filter[$realLevel][$lowercaseType];
+            return (int) $filter[$realLevel][$lowercaseType];
         }
 
-        return (int)$realLevel;
+        return (int) $realLevel;
     }
 
     /**
@@ -949,7 +949,7 @@ 
     private function _assertValidId($id)
     {
         if ($this->_emailValidator->isValidWrapper($id) === false) {
-            throw new Swift_RfcComplianceException('Invalid ID given <' . $id . '>');
+            throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
         }
     }
 

lib/classes/Swift/Mime/MimePart.php

Spacing +1 added lines, -1 removed lines

@@ -228,6 +228,6 @@
      */
     protected function _convertString($string)
     {
-        return UTF8::encode($this->getCharset(),$string, false);
+        return UTF8::encode($this->getCharset(), $string, false);
     }
 }

lib/classes/Swift/Mime/Headers/AbstractHeader.php

Spacing +12 added lines, -12 removed lines

@@ -106,7 +106,7 @@ 
     {
         if ($lang && $this->_lang !== $lang) {
             $this->clearCachedValue();
-            $this->_lang = (string)$lang;
+            $this->_lang = (string) $lang;
         }
     }
 
@@ -165,7 +165,7 @@ 
         if ($lineLength && $this->_lineLength !== $lineLength) {
             $this->clearCachedValue();
 
-            $this->_lineLength = (int)$lineLength;
+            $this->_lineLength = (int) $lineLength;
 
             return true;
         }
@@ -229,7 +229,7 @@ 
         $phraseStr = $string;
 
         // If it's not valid ...
-        if (!preg_match('/^' . self::PHRASE_PATTERN . '$/D', $phraseStr)) {
+        if (!preg_match('/^'.self::PHRASE_PATTERN.'$/D', $phraseStr)) {
 
             if (preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $phraseStr)) {
                 // ... but it is just ascii text, try escaping some characters
@@ -240,7 +240,7 @@ 
             }
 
             // ... and make it a quoted-string.
-            $phraseStr = '"' . $phraseStr . '"';
+            $phraseStr = '"'.$phraseStr.'"';
         }
 
         return $phraseStr;
@@ -257,7 +257,7 @@ 
     protected function escapeSpecials($token, array $include = array())
     {
         foreach (array_merge(array('\\'), $include) as $char) {
-            $token = str_replace($char, '\\' . $char, $token);
+            $token = str_replace($char, '\\'.$char, $token);
         }
 
         return $token;
@@ -289,7 +289,7 @@ 
                         $token = substr($token, 1);
                 }
 
-                $usedLength = strlen($header->getFieldName() . ': ') + strlen($value);
+                $usedLength = strlen($header->getFieldName().': ') + strlen($value);
                 $value .= $this->getTokenAsEncodedWord($token, $usedLength);
 
                 $header->setMaxLineLength(74); // Forcefully override (we need to save two chars for quoting)
@@ -364,10 +364,10 @@ 
         $charsetDecl = $this->_charset;
 
         if ($this->_lang) {
-            $charsetDecl .= '*' . $this->_lang;
+            $charsetDecl .= '*'.$this->_lang;
         }
 
-        $encodingWrapperLength = strlen('=?' . $charsetDecl . '?' . $this->_encoder->getName() . '??=');
+        $encodingWrapperLength = strlen('=?'.$charsetDecl.'?'.$this->_encoder->getName().'??=');
 
         if ($firstLineOffset >= 75) {
             // Does this logic need to be here?
@@ -383,7 +383,7 @@ 
         if (Swift::strtolowerWithStaticCache($this->_charset) !== 'iso-2022-jp') {
             // special encoding for iso-2022-jp using mb_encode_mimeheader
             foreach ($encodedTextLines as $lineNum => $line) {
-                $encodedTextLines[$lineNum] = '=?' . $charsetDecl . '?' . $this->_encoder->getName() . '?' . $line . '?=';
+                $encodedTextLines[$lineNum] = '=?'.$charsetDecl.'?'.$this->_encoder->getName().'?'.$line.'?=';
             }
         }
 
@@ -477,7 +477,7 @@ 
     {
         $lineCount = 0;
         $headerLines = array();
-        $headerLines[] = $this->_name . ': ';
+        $headerLines[] = $this->_name.': ';
         $currentLine = &$headerLines[$lineCount++];
 
         // Build all tokens back into compliant header
@@ -492,7 +492,7 @@ 
                     (
                         $i > 0
                         &&
-                        strlen($currentLine . $token) > $this->_lineLength
+                        strlen($currentLine.$token) > $this->_lineLength
                     )
                 )
             ) {
@@ -507,7 +507,7 @@ 
         }
 
         // Implode with FWS (RFC 2822, 2.2.3)
-        return implode("\r\n", $headerLines) . "\r\n";
+        return implode("\r\n", $headerLines)."\r\n";
     }
 
     /**

lib/classes/Swift/Mime/Headers/ParameterizedHeader.php

Spacing +12 added lines, -12 removed lines

@@ -132,7 +132,7 @@ 
         foreach ($this->_params as $name => $value) {
             if (null !== $value) {
                 // Add the parameter
-                $body .= '; ' . $this->_createParameter($name, $value);
+                $body .= '; '.$this->_createParameter($name, $value);
             }
         }
 
@@ -160,7 +160,7 @@ 
                 $tokens[count($tokens) - 1] .= ';';
                 $tokens = array_merge(
                     $tokens,
-                    $this->generateTokenLines(' ' . $this->_createParameter($name, $value))
+                    $this->generateTokenLines(' '.$this->_createParameter($name, $value))
                 );
             }
         }
@@ -182,19 +182,19 @@ 
 
         $encoded = false;
         // Allow room for parameter name, indices, "=" and DQUOTEs
-        $maxValueLength = $this->getMaxLineLength() - strlen($name . '=*N"";') - 1;
+        $maxValueLength = $this->getMaxLineLength() - strlen($name.'=*N"";') - 1;
         $firstLineOffset = 0;
 
         // If it's not already a valid parameter value ...
-        if (!preg_match('/^' . self::TOKEN_REGEX . '$/D', $value)) {
+        if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
             // TODO: text, or something else??
             // ... and it's not ascii
             if (!preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $value)) {
                 $encoded = true;
 
                 // Allow space for the indices, charset and language.
-                $maxValueLength = $this->getMaxLineLength() - strlen($name . '*N*="";') - 1;
-                $firstLineOffset = strlen($this->getCharset() . "'" . $this->getLanguage() . "'");
+                $maxValueLength = $this->getMaxLineLength() - strlen($name.'*N*="";') - 1;
+                $firstLineOffset = strlen($this->getCharset()."'".$this->getLanguage()."'");
             }
         }
 
@@ -224,13 +224,13 @@ 
         if (count($valueLines) > 1) {
             $paramLines = array();
             foreach ($valueLines as $i => $line) {
-                $paramLines[] = $name . '*' . $i . $this->_getEndOfParameterValue($line, true, $i === 0);
+                $paramLines[] = $name.'*'.$i.$this->_getEndOfParameterValue($line, true, $i === 0);
             }
 
             return implode(";\r\n ", $paramLines);
         }
 
-        return $name . $this->_getEndOfParameterValue(
+        return $name.$this->_getEndOfParameterValue(
             $valueLines[0],
             $encoded,
             true
@@ -248,18 +248,18 @@ 
      */
     private function _getEndOfParameterValue($value, $encoded = false, $firstLine = false)
     {
-        if (!preg_match('/^' . self::TOKEN_REGEX . '$/D', $value)) {
-            $value = '"' . $value . '"';
+        if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
+            $value = '"'.$value.'"';
         }
 
         $prepend = '=';
         if ($encoded) {
             $prepend = '*=';
             if ($firstLine) {
-                $prepend = '*=' . $this->getCharset() . "'" . $this->getLanguage() . "'";
+                $prepend = '*='.$this->getCharset()."'".$this->getLanguage()."'";
             }
         }
 
-        return $prepend . $value;
+        return $prepend.$value;
     }
 }