voku / swiftmailer

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/Headers/DateHeader.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
      *
      * This method returns a UNIX timestamp.
      *
-     * @return mixed
+     * @return integer|null
      */
     public function getFieldBodyModel()
     {

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;
     }
 }

lib/classes/Swift/Mime/MimePart.php

Doc Comments +2 added lines, -2 removed lines

@@ -213,7 +213,7 @@ 
     /**
      * Set the nesting level of this entity
      *
-     * @param $level
+     * @param integer $level
      */
     protected function _setNestingLevel($level)
     {
@@ -223,7 +223,7 @@ 
     /**
      * Encode charset
      *
-     * @param $string
+     * @param string $string
      *
      * @return string
      */

lib/classes/Swift/Transport/EsmtpTransport.php

Spacing +10 added lines, -10 removed lines

@@ -91,7 +91,7 @@ 
      */
     public function setPort($port)
     {
-        $this->_params['port'] = (int)$port;
+        $this->_params['port'] = (int) $port;
 
         return $this;
     }
@@ -115,8 +115,8 @@ 
      */
     public function setTimeout($timeout)
     {
-        $this->_params['timeout'] = (int)$timeout;
-        $this->_buffer->setParam('timeout', (int)$timeout);
+        $this->_params['timeout'] = (int) $timeout;
+        $this->_buffer->setParam('timeout', (int) $timeout);
 
         return $this;
     }
@@ -256,7 +256,7 @@ 
      */
     public function executeCommand($command, $codes = array(), &$failures = null)
     {
-        $failures = (array)$failures;
+        $failures = (array) $failures;
         $stopSignal = false;
         $response = null;
 
@@ -287,7 +287,7 @@ 
 
             $inArray = in_array(
                 Swift::strtolowerWithStaticCache($method),
-                array_map(array('Swift', 'strtolowerWithStaticCache'), (array)$handler->exposeMixinMethods()),
+                array_map(array('Swift', 'strtolowerWithStaticCache'), (array) $handler->exposeMixinMethods()),
                 true
             );
 
@@ -306,7 +306,7 @@ 
                 }
             }
         }
-        trigger_error('Call to undefined method ' . $method, E_USER_ERROR);
+        trigger_error('Call to undefined method '.$method, E_USER_ERROR);
     }
 
     /** Get the params to initialize the buffer */
@@ -372,10 +372,10 @@ 
 
         $params = array();
         foreach ($handlers as $handler) {
-            $params = array_merge($params, (array)$handler->getMailParams());
+            $params = array_merge($params, (array) $handler->getMailParams());
         }
 
-        $paramStr = !empty($params) ? ' ' . implode(' ', $params) : '';
+        $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
             sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), array(250)
         );
@@ -392,10 +392,10 @@ 
 
         $params = array();
         foreach ($handlers as $handler) {
-            $params = array_merge($params, (array)$handler->getRcptParams());
+            $params = array_merge($params, (array) $handler->getRcptParams());
         }
 
-        $paramStr = !empty($params) ? ' ' . implode(' ', $params) : '';
+        $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
             sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
         );

lib/classes/Swift/Mime/Attachment.php

Spacing +1 added lines, -1 removed lines

@@ -167,6 +167,6 @@
         }
         $extension = Swift::strtolowerWithStaticCache($extension);
 
-        return (string)$extension;
+        return (string) $extension;
     }
 }

lib/classes/Swift/ByteStream/FileByteStream.php

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
         if (strpos($path, '?') !== false) {
             $parameter = parse_url($path, PHP_URL_QUERY);
 
-            $this->_path = str_replace('?' . $parameter, '', $path);
+            $this->_path = str_replace('?'.$parameter, '', $path);
         } else {
             $this->_path = $path;
         }
@@ -198,7 +198,7 @@ 
 
             if (!$pointer) {
                 throw new Swift_IoException(
-                    'Unable to open file for reading [' . $this->_path . ']'
+                    'Unable to open file for reading ['.$this->_path.']'
                 );
             }
 
@@ -221,7 +221,7 @@ 
 
             if (!$pointer) {
                 throw new Swift_IoException(
-                    'Unable to open file for writing [' . $this->_path . ']'
+                    'Unable to open file for writing ['.$this->_path.']'
                 );
             }
 
@@ -291,7 +291,7 @@ 
 
         $source = @fopen($this->_path, 'rb');
         if (!$source) {
-            throw new Swift_IoException('Unable to open file for copying [' . $this->_path . ']');
+            throw new Swift_IoException('Unable to open file for copying ['.$this->_path.']');
         }
 
         fseek($tmpFile, 0, SEEK_SET);

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();
+        $fileName = $this->_path.'/'.$this->getRandomString();
         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;
@@ -209,7 +209,7 @@ 
         $ret = '';
         $strlen = strlen($base) - 1;
         for ($i = 0; $i < $count; ++$i) {
-            $ret .= $base[(int)mt_rand(0, $strlen)];
+            $ret .= $base[(int) mt_rand(0, $strlen)];
         }
 
         return $ret;