voku / swiftmailer

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

Indentation +6 added lines, -6 removed lines

@@ -510,7 +510,7 @@ 
             return array('DKIM-Signature', 'X-DebugHash');
         }
 
-      return array('DKIM-Signature');
+        return array('DKIM-Signature');
     }
 
     /**
@@ -591,7 +591,7 @@ 
 
         if ($this->_signatureTimestamp === true) {
 
-          $params['t'] = time();
+            $params['t'] = time();
             if ($this->_signatureExpiration !== false) {
                 $params['x'] = $params['t'] + $this->_signatureExpiration;
             }
@@ -739,8 +739,8 @@ 
     {
         $len = strlen($string);
         if ($len > ($new_len = ($this->_maxLen - $this->_bodyLen))) {
-          /** @noinspection CallableParameterUseCaseInTypeContextInspection */
-          $string = substr($string, 0, $new_len);
+            /** @noinspection CallableParameterUseCaseInTypeContextInspection */
+            $string = substr($string, 0, $new_len);
             $len = $new_len;
         }
         hash_update($this->_bodyHashHandler, $string);
@@ -779,9 +779,9 @@ 
         }
 
         if ($this->_passphrase) {
-          $pkeyId = openssl_get_privatekey($this->_privateKey, $this->_passphrase);
+            $pkeyId = openssl_get_privatekey($this->_privateKey, $this->_passphrase);
         } else {
-          $pkeyId = openssl_get_privatekey($this->_privateKey);
+            $pkeyId = openssl_get_privatekey($this->_privateKey);
         }
         if (!$pkeyId) {
             throw new Swift_SwiftException('Unable to load DKIM Private Key [' . openssl_error_string() . ']');

Spacing +8 added lines, -8 removed lines

@@ -209,7 +209,7 @@ 
     {
         $this->_privateKey = $privateKey;
         $this->_domainName = $domainName;
-        $this->_signerIdentity = '@' . $domainName;
+        $this->_signerIdentity = '@'.$domainName;
         $this->_selector = $selector;
         $this->_passphrase = $passphrase;
 
@@ -580,7 +580,7 @@ 
         );
 
         if ($this->_bodyCanon != 'simple') {
-            $params['c'] = $this->_headerCanon . '/' . $this->_bodyCanon;
+            $params['c'] = $this->_headerCanon.'/'.$this->_bodyCanon;
         } elseif ($this->_headerCanon != 'simple') {
             $params['c'] = $this->_headerCanon;
         }
@@ -614,7 +614,7 @@ 
 
         $string = '';
         foreach ($params as $k => $v) {
-            $string .= $k . '=' . $v . '; ';
+            $string .= $k.'='.$v.'; ';
         }
 
         $string = trim($string);
@@ -623,14 +623,14 @@ 
         // 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;
     }
@@ -648,7 +648,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
         }
@@ -784,13 +784,13 @@ 
           $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/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/Mime/Headers/ParameterizedHeader.php

Spacing +12 added lines, -12 removed lines

@@ -136,7 +136,7 @@ 
         foreach ($this->_params as $name => $value) {
             if (null !== $value) {
                 // Add the parameter
-                $body .= '; ' . $this->_createParameter($name, $value);
+                $body .= '; '.$this->_createParameter($name, $value);
             }
         }
 
@@ -164,7 +164,7 @@ 
                 $tokens[count($tokens) - 1] .= ';';
                 $tokens = array_merge(
                     $tokens,
-                    $this->generateTokenLines(' ' . $this->_createParameter($name, $value))
+                    $this->generateTokenLines(' '.$this->_createParameter($name, $value))
                 );
             }
         }
@@ -186,13 +186,13 @@ 
 
         $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 (
             // If it's not already a valid parameter value ...
-            !preg_match('/^' . self::TOKEN_REGEX . '$/D', $value)
+            !preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)
             &&
             // ... and it's not ascii
             !UTF8::is_ascii($value)
@@ -200,8 +200,8 @@ 
             $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()."'");
         }
 
         // Encode if we need to ...
@@ -230,13 +230,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
@@ -254,18 +254,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;
     }
 }