voku / swiftmailer

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;
         }
@@ -231,17 +231,17 @@ 
         // Treat token as exactly what was given
         $phraseStr = $string;
         // If it's not valid
-        if (!preg_match('/^' . self::PHRASE_PATTERN . '$/D', $phraseStr)) {
+        if (!preg_match('/^'.self::PHRASE_PATTERN.'$/D', $phraseStr)) {
             // .. but it is just ascii text, try escaping some characters
             // and make it a quoted-string
             if (preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $phraseStr)) {
                 $phraseStr = $this->escapeSpecials($phraseStr, array('"'));
-                $phraseStr = '"' . $phraseStr . '"';
+                $phraseStr = '"'.$phraseStr.'"';
             } else {
                 // ... otherwise it needs encoding
                 // Determine space remaining on line if first line
                 if ($shorten) {
-                    $usedLength = strlen($header->getFieldName() . ': ');
+                    $usedLength = strlen($header->getFieldName().': ');
                 } else {
                     $usedLength = 0;
                 }
@@ -263,7 +263,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;
@@ -368,10 +368,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?
@@ -387,7 +387,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.'?=';
             }
         }
 
@@ -481,7 +481,7 @@ 
     {
         $lineCount = 0;
         $headerLines = array();
-        $headerLines[] = $this->_name . ': ';
+        $headerLines[] = $this->_name.': ';
         $currentLine = &$headerLines[$lineCount++];
 
         // Build all tokens back into compliant header
@@ -496,7 +496,7 @@ 
                     (
                         $i > 0
                         &&
-                        strlen($currentLine . $token) > $this->_lineLength
+                        strlen($currentLine.$token) > $this->_lineLength
                     )
                 )
             ) {
@@ -511,7 +511,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/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;
         }
@@ -207,7 +207,7 @@ 
             $pointer = @fopen($this->_path, 'rb', false, stream_context_create($opts));
 
             if (!$pointer) {
-                throw new Swift_IoException('Unable to open file for reading [' . $this->_path . ']');
+                throw new Swift_IoException('Unable to open file for reading ['.$this->_path.']');
             }
 
             $this->_reader = $pointer;
@@ -229,7 +229,7 @@ 
             $pointer = @fopen($this->_path, $this->_mode);
 
             if (!$pointer) {
-                throw new Swift_IoException('Unable to open file for writing [' . $this->_path . ']');
+                throw new Swift_IoException('Unable to open file for writing ['.$this->_path.']');
             }
 
             $this->_writer = $pointer;
@@ -300,7 +300,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/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 (Swift::strtolowerWithStaticCache($this->_crypto)) {
             case 'ssl':
-                $host = 'ssl://' . $host;
+                $host = 'ssl://'.$host;
                 break;
 
             case 'tls':
-                $host = 'tls://' . $host;
+                $host = 'tls://'.$host;
                 break;
         }
 

lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php

Spacing +5 added lines, -5 removed lines

@@ -51,23 +51,23 @@ 
         $prefix = 'Swift_CharacterReader_';
 
         $singleByte = array(
-            'class' => $prefix . 'GenericFixedWidthReader',
+            'class' => $prefix.'GenericFixedWidthReader',
             'constructor' => array(1),
         );
 
         $doubleByte = array(
-            'class' => $prefix . 'GenericFixedWidthReader',
+            'class' => $prefix.'GenericFixedWidthReader',
             'constructor' => array(2),
         );
 
         $fourBytes = array(
-            'class' => $prefix . 'GenericFixedWidthReader',
+            'class' => $prefix.'GenericFixedWidthReader',
             'constructor' => array(4),
         );
 
         // UTF-8
         self::$_map['utf-?8'] = array(
-            'class' => $prefix . 'Utf8Reader',
+            'class' => $prefix.'Utf8Reader',
             'constructor' => array(),
         );
 
@@ -106,7 +106,7 @@ 
         $charset = Swift::strtolowerWithStaticCache(trim($charset));
         
         foreach (self::$_map as $pattern => $spec) {
-            $re = '/^' . $pattern . '$/D';
+            $re = '/^'.$pattern.'$/D';
             if (preg_match($re, $charset)) {
                 if (!array_key_exists($pattern, self::$_loaded)) {
                     $reflector = new ReflectionClass($spec['class']);

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().']');
     }
 }