voku / swiftmailer

lib/classes/Swift/Signers/SMimeSigner.php

Spacing +6 added lines, -6 removed lines

@@ -95,14 +95,14 @@ 
      */
     public function setSignCertificate($certificate, $privateKey = null, $signOptions = PKCS7_DETACHED, $extraCerts = null)
     {
-        $this->signCertificate = 'file://' . str_replace('\\', '/', realpath($certificate));
+        $this->signCertificate = 'file://'.str_replace('\\', '/', realpath($certificate));
 
         if (null !== $privateKey) {
             if (is_array($privateKey)) {
                 $this->signPrivateKey = $privateKey;
-                $this->signPrivateKey[0] = 'file://' . str_replace('\\', '/', realpath($privateKey[0]));
+                $this->signPrivateKey[0] = 'file://'.str_replace('\\', '/', realpath($privateKey[0]));
             } else {
-                $this->signPrivateKey = 'file://' . str_replace('\\', '/', realpath($privateKey));
+                $this->signPrivateKey = 'file://'.str_replace('\\', '/', realpath($privateKey));
             }
         }
 
@@ -131,10 +131,10 @@ 
             $this->encryptCert = array();
 
             foreach ($recipientCerts as $cert) {
-                $this->encryptCert[] = 'file://' . str_replace('\\', '/', realpath($cert));
+                $this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert));
             }
         } else {
-            $this->encryptCert = 'file://' . str_replace('\\', '/', realpath($recipientCerts));
+            $this->encryptCert = 'file://'.str_replace('\\', '/', realpath($recipientCerts));
         }
 
         if (null !== $cipher) {
@@ -380,7 +380,7 @@ 
         foreach ($headerLines as $headerLine) {
             // Line separated
             if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) {
-                $headers[$currentHeaderName] .= ' ' . trim($headerLine);
+                $headers[$currentHeaderName] .= ' '.trim($headerLine);
                 continue;
             }
 

lib/classes/Swift/Signers/DKIMSigner.php

Spacing +8 added lines, -8 removed lines

@@ -201,7 +201,7 @@ 
     {
         $this->_privateKey = $privateKey;
         $this->_domainName = $domainName;
-        $this->_signerIdentity = '@' . $domainName;
+        $this->_signerIdentity = '@'.$domainName;
         $this->_selector = $selector;
     }
 
@@ -549,7 +549,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;
         }
@@ -574,19 +574,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;
     }
@@ -602,7 +602,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
         }
@@ -723,11 +723,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/Signers/DomainKeySigner.php

Spacing +5 added lines, -5 removed lines

@@ -145,7 +145,7 @@ 
     {
         $this->_privateKey = $privateKey;
         $this->_domainName = $domainName;
-        $this->_signerIdentity = '@' . $domainName;
+        $this->_signerIdentity = '@'.$domainName;
         $this->_selector = $selector;
     }
 
@@ -425,7 +425,7 @@ 
         $params = array('a' => $this->_hashAlgorithm, 'b' => chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' '), 'c' => $this->_canon, 'd' => $this->_domainName, 'h' => implode(': ', $this->_signedHeaders), 'q' => 'dns', 's' => $this->_selector);
         $string = '';
         foreach ($params as $k => $v) {
-            $string .= $k . '=' . $v . '; ';
+            $string .= $k.'='.$v.'; ';
         }
         $string = trim($string);
         $headers->addTextHeader('DomainKey-Signature', $string);
@@ -444,7 +444,7 @@ 
                 $name = Swift::strtolowerWithStaticCache(trim($exploded[0]));
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
-                $header = $name . ':' . trim($value) . "\r\n";
+                $header = $name.':'.trim($value)."\r\n";
             case 'simple':
                 // Nothing to do
         }
@@ -544,11 +544,11 @@ 
         $signature = '';
         $pkeyId = openssl_get_privatekey($this->_privateKey);
         if (!$pkeyId) {
-            throw new Swift_SwiftException('Unable to load DomainKey Private Key [' . openssl_error_string() . ']');
+            throw new Swift_SwiftException('Unable to load DomainKey Private Key ['.openssl_error_string().']');
         }
         if (openssl_sign($this->_canonData, $signature, $pkeyId, OPENSSL_ALGO_SHA1)) {
             return $signature;
         }
-        throw new Swift_SwiftException('Unable to sign DomainKey Hash  [' . openssl_error_string() . ']');
+        throw new Swift_SwiftException('Unable to sign DomainKey Hash  ['.openssl_error_string().']');
     }
 }

Doc Comments +3 added lines

@@ -520,6 +520,9 @@
         $this->_hash = hash_final($this->_hashHandler, true);
     }
 
+    /**
+     * @param string $string
+     */
     private function _addToHash($string)
     {
         $this->_canonData .= $string;

lib/classes/Swift/Signers/OpenDKIMSigner.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
         $header = new Swift_Mime_Headers_OpenDKIMHeader('DKIM-Signature');
         $headerVal = $this->_dkimHandler->getSignatureHeader();
         if (!$headerVal) {
-            throw new Swift_SwiftException('OpenDKIM Error: ' . $this->_dkimHandler->getError());
+            throw new Swift_SwiftException('OpenDKIM Error: '.$this->_dkimHandler->getError());
         }
         $header->setValue($headerVal);
         $headers->set($header);
@@ -112,7 +112,7 @@ 
             OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, time());
         } else {
             if (!OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, $this->_signatureTimestamp)) {
-                throw new Swift_SwiftException('Unable to force signature timestamp [' . openssl_error_string() . ']');
+                throw new Swift_SwiftException('Unable to force signature timestamp ['.openssl_error_string().']');
             }
         }
 

lib/classes/Swift/Plugins/LoggerPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
         $code = $e->getCode();
         $this->_logger->add(sprintf('!! %s (code: %s)', $message, $code));
         $message .= PHP_EOL;
-        $message .= 'Log data:' . PHP_EOL;
+        $message .= 'Log data:'.PHP_EOL;
         $message .= $this->_logger->dump();
         $evt->cancelBubble();
         throw new Swift_TransportException($message, $code, $e->getPrevious());

lib/classes/Swift/Plugins/Reporters/HtmlReporter.php

Spacing +6 added lines, -6 removed lines

@@ -25,14 +25,14 @@
     public function notify(Swift_Mime_Message $message, $address, $result)
     {
         if (self::RESULT_PASS === $result) {
-            echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">' . PHP_EOL;
-            echo 'PASS ' . $address . PHP_EOL;
-            echo '</div>' . PHP_EOL;
+            echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">'.PHP_EOL;
+            echo 'PASS '.$address.PHP_EOL;
+            echo '</div>'.PHP_EOL;
             flush();
         } else {
-            echo '<div style="color: #fff; background: #880000; padding: 2px; margin: 2px;">' . PHP_EOL;
-            echo 'FAIL ' . $address . PHP_EOL;
-            echo '</div>' . PHP_EOL;
+            echo '<div style="color: #fff; background: #880000; padding: 2px; margin: 2px;">'.PHP_EOL;
+            echo 'FAIL '.$address.PHP_EOL;
+            echo '</div>'.PHP_EOL;
             flush();
         }
     }

lib/classes/Swift/Encoder/Rfc2231Encoder.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
             if (
                 $currentLine !== ''
                 &&
-                strlen($currentLine . $encodedChar) > $thisLineLength
+                strlen($currentLine.$encodedChar) > $thisLineLength
             ) {
                 $lines[] = '';
                 $currentLine = &$lines[$lineCount++];

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/CharacterStream/NgCharacterStream.php

Spacing +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
                 $to = $start;
                 for (; $this->_currentPos < $end; ++$this->_currentPos) {
                     if (isset($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];