voku / swiftmailer

lib/classes/Swift/Transport/Esmtp/AuthHandler.php

Spacing +3 added lines, -3 removed lines

@@ -185,8 +185,8 @@ 
             }
             
             throw new Swift_TransportException(
-                'Failed to authenticate on SMTP server with username "' .
-                $this->_username . '" using ' . $count . ' possible authenticators'
+                'Failed to authenticate on SMTP server with username "'.
+                $this->_username.'" using '.$count.' possible authenticators'
             );
         }
     }
@@ -263,6 +263,6 @@ 
             }
         }
 
-        throw new Swift_TransportException('Auth mode ' . $mode . ' is invalid');
+        throw new Swift_TransportException('Auth mode '.$mode.' is invalid');
     }
 }

lib/swiftmailer_generate_mimes_config.php

Spacing +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
     ksort($valid_mime_types);
 
     // combine mime types and extensions array
-    $output = "$preamble\$swift_mime_types = array(\n    " . implode($valid_mime_types, ",\n    ") . "\n);";
+    $output = "$preamble\$swift_mime_types = array(\n    ".implode($valid_mime_types, ",\n    ")."\n);";
 
     // write mime_types.php config file
     /** @noinspection PhpUsageOfSilenceOperatorInspection */

lib/classes/Swift/Transport/EsmtpTransport.php

Indentation +4 added lines, -4 removed lines

@@ -248,10 +248,10 @@ 
         /** @noinspection PhpUsageOfSilenceOperatorInspection */
         /** @noinspection UsageOfSilenceOperatorInspection */
         @uasort($assoc, array($this, '_sortHandlers'));
-          $this->_handlers = $assoc;
-          $this->_setHandlerParams();
+            $this->_handlers = $assoc;
+            $this->_setHandlerParams();
 
-          return $this;
+            return $this;
     }
 
     /**
@@ -325,7 +325,7 @@ 
                     return $this;
                 }
 
-              return $return;
+                return $return;
             }
         }
 

Spacing +10 added lines, -10 removed lines

@@ -93,7 +93,7 @@ 
      */
     public function setPort($port)
     {
-        $this->_params['port'] = (int)$port;
+        $this->_params['port'] = (int) $port;
 
         return $this;
     }
@@ -117,8 +117,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;
     }
@@ -278,7 +278,7 @@ 
      */
     public function executeCommand($command, $codes = array(), &$failures = null)
     {
-        $failures = (array)$failures;
+        $failures = (array) $failures;
         $stopSignal = false;
         $response = null;
 
@@ -309,7 +309,7 @@ 
 
             $inArray = in_array(
                 Swift::strtolowerWithStaticCache($method),
-                array_map(array('Swift', 'strtolowerWithStaticCache'), (array)$handler->exposeMixinMethods()),
+                array_map(array('Swift', 'strtolowerWithStaticCache'), (array) $handler->exposeMixinMethods()),
                 true
             );
 
@@ -329,7 +329,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 */
@@ -395,10 +395,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)
         );
@@ -415,10 +415,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/FileSpool.php

Indentation +3 added lines, -3 removed lines

@@ -37,8 +37,8 @@ 
     {
         $this->_path = $path;
 
-      /** @noinspection PhpUsageOfSilenceOperatorInspection */
-      if (
+        /** @noinspection PhpUsageOfSilenceOperatorInspection */
+        if (
             !file_exists($this->_path)
             &&
             !@mkdir($this->_path, 0777, true)
@@ -107,7 +107,7 @@ 
                         return false;
                     }
                     return fclose($fp);
-              }
+                }
 
             /* The file already exists, we try a longer fileName */
             $fileName .= $this->getRandomString(1);

Spacing +6 added lines, -6 removed lines

@@ -97,11 +97,11 @@ 
     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 */
             /** @noinspection PhpUsageOfSilenceOperatorInspection */
-            $fp = @fopen($fileName . '.message', 'xb');
+            $fp = @fopen($fileName.'.message', 'xb');
                 if (false !== $fp) {
                     if (false === fwrite($fp, $ser)) {
                         return false;
@@ -157,7 +157,7 @@ 
             }
         }
 
-        $failedRecipients = (array)$failedRecipients;
+        $failedRecipients = (array) $failedRecipients;
         $count = 0;
         $time = time();
         foreach ($directoryIterator as $file) {
@@ -168,13 +168,13 @@ 
             }
 
             /* We try a rename, it's an atomic operation, and avoid locking the file */
-            if (rename($file, $file . '.sending')) {
+            if (rename($file, $file.'.sending')) {
                 // TODO: -> SECURITY | Perhaps it's possible to exploit the unserialize via: file_get_contents(...)
-                $message = unserialize(file_get_contents($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;

lib/classes/Swift/Transport/StreamBuffer.php

Indentation +2 added lines, -2 removed lines

@@ -186,8 +186,8 @@
             ||
             feof($this->_out)
         ) {
-          // TODO?
-          return;
+            // TODO?
+            return;
         }
 
         $line = fgets($this->_out);

Spacing +11 added lines, -11 removed lines

@@ -194,7 +194,7 @@ 
         if (!$line) {
             $metas = stream_get_meta_data($this->_out);
             if ($metas['timed_out']) {
-                throw new Swift_IoException('Connection to ' . $this->_getReadConnectionDescription() . ' Timed Out');
+                throw new Swift_IoException('Connection to '.$this->_getReadConnectionDescription().' Timed Out');
             }
         }
 
@@ -230,7 +230,7 @@ 
             $metas = stream_get_meta_data($this->_out);
             if ($metas['timed_out']) {
                 throw new Swift_IoException(
-                    'Connection to ' . $this->_getReadConnectionDescription() . ' Timed Out'
+                    'Connection to '.$this->_getReadConnectionDescription().' Timed Out'
                 );
             }
         }
@@ -278,7 +278,7 @@ 
             $bytesWritten = fwrite($this->_in, substr($bytes, $totalBytesWritten));
             if (false === $bytesWritten || 0 === $bytesWritten) {
                 throw new Swift_IoException(
-                    'Connection to ' . $this->_getReadConnectionDescription() . ' has gone away'
+                    'Connection to '.$this->_getReadConnectionDescription().' has gone away'
                 );
             }
 
@@ -306,7 +306,7 @@ 
 
         $host = $this->_params['host'];
         if (!empty($this->_params['protocol'])) {
-            $host = $this->_params['protocol'] . '://' . $host;
+            $host = $this->_params['protocol'].'://'.$host;
         }
 
         $timeout = 15;
@@ -315,7 +315,7 @@ 
         }
 
         if (!empty($this->_params['sourceIp'])) {
-            $options['socket']['bindto'] = $this->_params['sourceIp'] . ':0';
+            $options['socket']['bindto'] = $this->_params['sourceIp'].':0';
         }
 
         if (!empty($this->_params['verifySsl'])) {
@@ -328,10 +328,10 @@ 
 
         $streamContext = stream_context_create($options);
         /** @noinspection PhpUsageOfSilenceOperatorInspection */
-        $this->_stream = @stream_socket_client($host . ':' . $this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
+        $this->_stream = @stream_socket_client($host.':'.$this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
 
         if (false === $this->_stream) {
-            throw new Swift_TransportException('Connection could not be established with host ' . $this->_params['host'] . ' [' . $errstr . ' #' . $errno . ']');
+            throw new Swift_TransportException('Connection could not be established with host '.$this->_params['host'].' ['.$errstr.' #'.$errno.']');
         }
 
         if (!empty($this->_params['blocking'])) {
@@ -363,7 +363,7 @@ 
 
         $err = stream_get_contents($pipes[2]);
         if ($err) {
-            throw new Swift_TransportException('Process could not be started [' . $err . ']');
+            throw new Swift_TransportException('Process could not be started ['.$err.']');
         }
 
         $this->_in = &$pipes[0];
@@ -377,16 +377,16 @@ 
     {
         switch ($this->_params['type']) {
             case self::TYPE_PROCESS:
-                return 'Process ' . $this->_params['command'];
+                return 'Process '.$this->_params['command'];
                 break;
 
             case self::TYPE_SOCKET:
             default:
                 $host = $this->_params['host'];
                 if (!empty($this->_params['protocol'])) {
-                    $host = $this->_params['protocol'] . '://' . $host;
+                    $host = $this->_params['protocol'].'://'.$host;
                 }
-                $host .= ':' . $this->_params['port'];
+                $host .= ':'.$this->_params['port'];
 
                 return $host;
                 break;

lib/classes/Swift/Encoder/Base64Encoder.php

Spacing +2 added lines, -2 removed lines

@@ -39,11 +39,11 @@
         $firstLine = '';
 
         if (0 != $firstLineOffset) {
-            $firstLine = \substr($encodedString, 0, $maxLineLength - $firstLineOffset) . "\r\n";
+            $firstLine = \substr($encodedString, 0, $maxLineLength - $firstLineOffset)."\r\n";
             $encodedString = \substr($encodedString, $maxLineLength - $firstLineOffset);
         }
 
-        return $firstLine . \trim(\chunk_split($encodedString, $maxLineLength, "\r\n"));
+        return $firstLine.\trim(\chunk_split($encodedString, $maxLineLength, "\r\n"));
     }
 
     /**

lib/classes/Swift/Mime/MimePart.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
      */
     public function getCharset()
     {
-        return (string)$this->_getHeaderParameter('Content-Type', 'charset');
+        return (string) $this->_getHeaderParameter('Content-Type', 'charset');
     }
 
     /**

lib/classes/Swift/Mime/SimpleMimeEntity.php

Doc Comments +1 added lines, -1 removed lines

@@ -641,7 +641,7 @@
      *
      * @param string $field
      *
-     * @return null|mixed
+     * @return string
      */
     protected function _getHeaderFieldModel($field)
     {

Spacing +11 added lines, -12 removed lines

@@ -241,7 +241,7 @@ 
      */
     public function getId()
     {
-        $tmp = (array)$this->_getHeaderFieldModel($this->_getIdField());
+        $tmp = (array) $this->_getHeaderFieldModel($this->_getIdField());
 
         return $this->_headers->has($this->_getIdField()) ? current($tmp) : $this->_id;
     }
@@ -468,7 +468,7 @@ 
     public function getBoundary()
     {
         if (!isset($this->_boundary)) {
-            $this->_boundary = '_=_swift_v5_' . time() . '_' . bin2hex(random_bytes(16)) . '_=_';
+            $this->_boundary = '_=_swift_v5_'.time().'_'.bin2hex(random_bytes(16)).'_=_';
         }
 
         return $this->_boundary;
@@ -543,7 +543,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;
@@ -551,10 +551,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;
@@ -621,10 +621,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");
         }
     }
 
@@ -846,13 +846,13 @@ 
         }
 
         $realLevel = $child->getNestingLevel();
-        $lowercaseType = Swift::strtolowerWithStaticCache((string)$child->getContentType());
+        $lowercaseType = Swift::strtolowerWithStaticCache((string) $child->getContentType());
 
         if (isset($filter[$realLevel], $filter[$realLevel][$lowercaseType])) {
-            return (int)$filter[$realLevel][$lowercaseType];
+            return (int) $filter[$realLevel][$lowercaseType];
         }
 
-        return (int)$realLevel;
+        return (int) $realLevel;
     }
 
     /**
@@ -903,8 +903,7 @@ 
             foreach ($this->_immediateChildren as $child) {
                 $type = $child->getContentType();
                 $level = array_key_exists($type, $this->_alternativePartOrder) ?
-                    $this->_alternativePartOrder[$type] :
-                    max($this->_alternativePartOrder) + 1;
+                    $this->_alternativePartOrder[$type] : max($this->_alternativePartOrder) + 1;
 
                 if (empty($sorted[$level])) {
                     $sorted[$level] = array();

lib/classes/Swift/CharacterStream/NgCharacterStream.php

Spacing +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
                 $to = $start;
                 for (; $this->_currentPos < $end; ++$this->_currentPos) {
                     if (isset($this->_map['i'], $this->_map['i'][$this->_currentPos])) {
-                        $ret .= \substr($this->_datas, $start, $to - $start) . '?';
+                        $ret .= \substr($this->_datas, $start, $to - $start).'?';
                         $start = $this->_map['p'][$this->_currentPos];
                     } else {
                         $to = $this->_map['p'][$this->_currentPos];