voku / swiftmailer

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

Spacing +5 added lines, -5 removed lines

@@ -109,7 +109,7 @@ 
      */
     public function setNameAddresses($mailboxes)
     {
-        $this->_mailboxes = $this->normalizeMailboxes((array)$mailboxes);
+        $this->_mailboxes = $this->normalizeMailboxes((array) $mailboxes);
         $this->setCachedValue(null); //Clear any cached value
     }
 
@@ -194,7 +194,7 @@ 
      */
     public function setAddresses($addresses)
     {
-        $this->setNameAddresses(array_values((array)$addresses));
+        $this->setNameAddresses(array_values((array) $addresses));
     }
 
     /**
@@ -217,7 +217,7 @@ 
     public function removeAddresses($addresses)
     {
         $this->setCachedValue(null);
-        foreach ((array)$addresses as $address) {
+        foreach ((array) $addresses as $address) {
             unset($this->_mailboxes[$address]);
         }
     }
@@ -337,7 +337,7 @@ 
             $mailboxStr = $email;
             if ($name) {
                 $nameStr = $this->createDisplayNameString($name, 0 === count($strings));
-                $mailboxStr = $nameStr . ' <' . $mailboxStr . '>';
+                $mailboxStr = $nameStr.' <'.$mailboxStr.'>';
             }
             $strings[] = $mailboxStr;
         }
@@ -355,7 +355,7 @@ 
     private function _assertValidAddress($address)
     {
         if ($this->_emailValidator->isValidWrapper($address) === false) {
-            throw new Swift_RfcComplianceException('Address in mailbox given [' . $address . '] does not comply with RFC 2822, 3.6.2.');
+            throw new Swift_RfcComplianceException('Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.');
         }
     }
 }

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

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/classes/Swift/Transport/StreamBuffer.php

Spacing +11 added lines, -11 removed lines

@@ -183,7 +183,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');
                 }
             }
 
@@ -212,7 +212,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'
                     );
                 }
             }
@@ -253,7 +253,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'
                     );
                 }
 
@@ -279,7 +279,7 @@ 
 
         $host = $this->_params['host'];
         if (!empty($this->_params['protocol'])) {
-            $host = $this->_params['protocol'] . '://' . $host;
+            $host = $this->_params['protocol'].'://'.$host;
         }
 
         $timeout = 15;
@@ -288,7 +288,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'])) {
@@ -301,10 +301,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'])) {
@@ -335,7 +335,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];
@@ -346,16 +346,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/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/Signers/DKIMSigner.php

Spacing +8 added lines, -8 removed lines

@@ -203,7 +203,7 @@ 
     {
         $this->_privateKey = $privateKey;
         $this->_domainName = $domainName;
-        $this->_signerIdentity = '@' . $domainName;
+        $this->_signerIdentity = '@'.$domainName;
         $this->_selector = $selector;
 
         // keep fallback hash algorithm sha1 if php version is lower than 5.4.8
@@ -562,7 +562,7 @@ 
         // Prepare the DKIM-Signature
         $params = array('v' => '1', 'a' => $this->_hashAlgorithm, 'bh' => base64_encode($this->_bodyHash), 'd' => $this->_domainName, 'h' => implode(': ', $this->_signedHeaders), 'i' => $this->_signerIdentity, 's' => $this->_selector);
         if ($this->_bodyCanon != 'simple') {
-            $params['c'] = $this->_headerCanon . '/' . $this->_bodyCanon;
+            $params['c'] = $this->_headerCanon.'/'.$this->_bodyCanon;
         } elseif ($this->_headerCanon != 'simple') {
             $params['c'] = $this->_headerCanon;
         }
@@ -587,19 +587,19 @@ 
         }
         $string = '';
         foreach ($params as $k => $v) {
-            $string .= $k . '=' . $v . '; ';
+            $string .= $k.'='.$v.'; ';
         }
         $string = trim($string);
         $headers->addTextHeader('DKIM-Signature', $string);
         // Add the last DKIM-Signature
         $tmp = $headers->getAll('DKIM-Signature');
         $this->_dkimHeader = end($tmp);
-        $this->_addHeader(trim($this->_dkimHeader->toString()) . "\r\n b=", true);
+        $this->_addHeader(trim($this->_dkimHeader->toString())."\r\n b=", true);
         $this->_endOfHeaders();
         if ($this->_debugHeaders) {
             $headers->addTextHeader('X-DebugHash', base64_encode($this->_headerHash));
         }
-        $this->_dkimHeader->setValue($string . ' b=' . trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' ')));
+        $this->_dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' ')));
 
         return $this;
     }
@@ -619,7 +619,7 @@ 
                 $name = Swift::strtolowerWithStaticCache(trim($exploded[0]));
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
-                $header = $name . ':' . trim($value) . ($is_sig ? '' : "\r\n");
+                $header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
             case 'simple':
                 // Nothing to do
         }
@@ -747,11 +747,11 @@ 
         }
         $pkeyId = openssl_get_privatekey($this->_privateKey);
         if (!$pkeyId) {
-            throw new Swift_SwiftException('Unable to load DKIM Private Key [' . openssl_error_string() . ']');
+            throw new Swift_SwiftException('Unable to load DKIM Private Key ['.openssl_error_string().']');
         }
         if (openssl_sign($this->_headerCanonData, $signature, $pkeyId, $algorithm)) {
             return $signature;
         }
-        throw new Swift_SwiftException('Unable to sign DKIM Hash [' . openssl_error_string() . ']');
+        throw new Swift_SwiftException('Unable to sign DKIM Hash ['.openssl_error_string().']');
     }
 }

lib/classes/Swift/Mime/SimpleMimeEntity.php

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() . '_' . md5(getmypid() . mt_rand() . uniqid('', true)) . '_=_';
+            $this->_boundary = '_=_swift_v5_'.time().'_'.md5(getmypid().mt_rand().uniqid('', true)).'_=_';
         }
 
         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");
         }
     }
 
@@ -753,7 +753,7 @@ 
      */
     private function _generateNewCacheKey()
     {
-        return md5(getmypid() . '.' . time() . '.' . uniqid(mt_rand(), true));
+        return md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
     }
 
     /**
@@ -849,10 +849,10 @@ 
         $lowercaseType = Swift::strtolowerWithStaticCache($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();