voku / swiftmailer

lib/classes/Swift/Mime/SimpleMessage.php

Doc Comments +10 added lines, -10 removed lines

@@ -107,7 +107,7 @@ 
     /**
      * Get the date at which this message was created.
      *
-     * @return int
+     * @return string
      */
     public function getDate()
     {
@@ -199,7 +199,7 @@ 
      * If $name is passed and the first parameter is a string, this name will be
      * associated with the address.
      *
-     * @param string|array $addresses
+     * @param string $addresses
      * @param string       $name      optional
      *
      * @return Swift_Mime_SimpleMessage
@@ -220,7 +220,7 @@ 
     /**
      * Get the from address of this message.
      *
-     * @return mixed
+     * @return string
      */
     public function getFrom()
     {
@@ -253,7 +253,7 @@ 
      * If $name is passed and the first parameter is a string, this name will be
      * associated with the address.
      *
-     * @param mixed  $addresses
+     * @param string  $addresses
      * @param string $name      optional
      *
      * @return Swift_Mime_SimpleMessage
@@ -308,7 +308,7 @@ 
      * If $name is passed and the first parameter is a string, this name will be
      * associated with the address.
      *
-     * @param mixed  $addresses
+     * @param string  $addresses
      * @param string $name      optional
      *
      * @return Swift_Mime_SimpleMessage
@@ -329,7 +329,7 @@ 
     /**
      * Get the To addresses of this message.
      *
-     * @return array
+     * @return string
      */
     public function getTo()
     {
@@ -360,7 +360,7 @@ 
      * If $name is passed and the first parameter is a string, this name will be
      * associated with the address.
      *
-     * @param mixed  $addresses
+     * @param string  $addresses
      * @param string $name      optional
      *
      * @return Swift_Mime_SimpleMessage
@@ -381,7 +381,7 @@ 
     /**
      * Get the Cc address of this message.
      *
-     * @return array
+     * @return string
      */
     public function getCc()
     {
@@ -412,7 +412,7 @@ 
      * If $name is passed and the first parameter is a string, this name will be
      * associated with the address.
      *
-     * @param mixed  $addresses
+     * @param string  $addresses
      * @param string $name      optional
      *
      * @return Swift_Mime_SimpleMessage
@@ -433,7 +433,7 @@ 
     /**
      * Get the Bcc addresses of this message.
      *
-     * @return array
+     * @return string
      */
     public function getBcc()
     {

Spacing +1 added lines, -1 removed lines

@@ -560,7 +560,7 @@
     {
         $this->attach($entity);
 
-        return 'cid:' . $entity->getId();
+        return 'cid:'.$entity->getId();
     }
 
     /**

lib/classes/Swift/Signers/DomainKeySigner.php

Doc Comments +3 added lines

@@ -435,6 +435,9 @@
 
     /* Private helpers */
 
+    /**
+     * @param string $header
+     */
     protected function _addHeader($header)
     {
         switch ($this->_canon) {

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

lib/classes/Swift/EmailValidatorBridge.php

Spacing +1 added lines, -1 removed lines

@@ -30,6 +30,6 @@
      */
     public function isValidSimpleWrapper($email)
     {
-        return (boolean)preg_match('/^(.*<?)(.*)@(.*)(>?)$/', $email);
+        return (boolean) preg_match('/^(.*<?)(.*)@(.*)(>?)$/', $email);
     }
 }

lib/classes/Swift/Signers/DKIMSigner.php

Doc Comments +3 added lines

@@ -435,6 +435,9 @@
 
     /* Private helpers */
 
+    /**
+     * @param string $header
+     */
     protected function _addHeader($header)
     {
         switch ($this->_canon) {

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/Mime/MimePart.php

Doc Comments +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
     /**
      * Set the nesting level of this entity
      *
-     * @param $level
+     * @param integer $level
      */
     protected function _setNestingLevel($level)
     {

lib/classes/Swift/Transport/MailTransport.php

Doc Comments +2 added lines, -2 removed lines

@@ -286,10 +286,10 @@
     /**
      * Return php mail extra params to use for invoker->mail.
      *
-     * @param $extraParams
+     * @param string $extraParams
      * @param $reversePath
      *
-     * @return mixed <string|null>
+     * @return string|null <string|null>
      */
     private function _formatExtraParams($extraParams, $reversePath)
     {

Spacing +9 added lines, -9 removed lines

@@ -104,7 +104,7 @@ 
      */
     public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     {
-        $failedRecipients = (array)$failedRecipients;
+        $failedRecipients = (array) $failedRecipients;
 
         $evt = $this->_eventDispatcher->createSendEvent($this, $message);
         if ($evt) {
@@ -116,9 +116,9 @@ 
         }
 
         $count = (
-            count((array)$message->getTo())
-            + count((array)$message->getCc())
-            + count((array)$message->getBcc())
+            count((array) $message->getTo())
+            + count((array) $message->getCc())
+            + count((array) $message->getBcc())
         );
 
         /*
@@ -151,10 +151,10 @@ 
 
         // Separate headers from body
         if (false !== $endHeaders = strpos($messageStr, "\r\n\r\n")) {
-            $headers = substr($messageStr, 0, $endHeaders) . "\r\n"; // Keep last EOL
+            $headers = substr($messageStr, 0, $endHeaders)."\r\n"; // Keep last EOL
             $body = substr($messageStr, $endHeaders + 4);
         } else {
-            $headers = $messageStr . "\r\n";
+            $headers = $messageStr."\r\n";
             $body = '';
         }
 
@@ -181,9 +181,9 @@ 
         } else {
             $failedRecipients = array_merge(
                 $failedRecipients,
-                array_keys((array)$message->getTo()),
-                array_keys((array)$message->getCc()),
-                array_keys((array)$message->getBcc())
+                array_keys((array) $message->getTo()),
+                array_keys((array) $message->getCc()),
+                array_keys((array) $message->getBcc())
             );
 
             if ($evt) {

lib/classes/Swift/Mime/SimpleMimeEntity.php

Doc Comments +3 added lines

@@ -810,6 +810,9 @@
         }
     }
 
+    /**
+     * @param integer $level
+     */
     private function _setNestingLevel($level)
     {
         $this->_nestingLevel = $level;

Spacing +13 added lines, -13 removed lines

@@ -465,7 +465,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;
@@ -536,7 +536,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;
@@ -544,10 +544,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;
@@ -614,10 +614,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");
         }
     }
 
@@ -746,14 +746,14 @@ 
      */
     protected function getRandomId()
     {
-        $idLeft = md5(getmypid() . '.' . time() . '.' . uniqid(mt_rand(), true));
+        $idLeft = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
         $idRight = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated';
-        $id = $idLeft . '@' . $idRight;
+        $id = $idLeft.'@'.$idRight;
 
         try {
             $this->_assertValidId($id);
         } catch (Swift_RfcComplianceException $e) {
-            $id = $idLeft . '@swift.generated';
+            $id = $idLeft.'@swift.generated';
         }
 
         return $id;
@@ -766,7 +766,7 @@ 
      */
     private function _generateNewCacheKey()
     {
-        return md5(uniqid(getmypid() . mt_rand(), true));
+        return md5(uniqid(getmypid().mt_rand(), true));
     }
 
     private function _readStream(Swift_OutputByteStream $os)
@@ -849,10 +849,10 @@ 
         $lowercaseType = Swift::strtolowerWithStaticCache($child->getContentType());
 
         if (isset($filter[$realLevel]) && isset($filter[$realLevel][$lowercaseType])) {
-            return (int)$filter[$realLevel][$lowercaseType];
+            return (int) $filter[$realLevel][$lowercaseType];
         }
 
-        return (int)$realLevel;
+        return (int) $realLevel;
     }
 
     /**
@@ -948,7 +948,7 @@ 
     private function _assertValidId($id)
     {
         if ($this->_emailValidator->isValidWrapper($id) === false) {
-            throw new Swift_RfcComplianceException('Invalid ID given <' . $id . '>');
+            throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
         }
     }
 

lib/classes/Swift/Transport/NullTransport.php

Spacing +3 added lines, -3 removed lines

@@ -77,9 +77,9 @@
         }
 
         $count = (
-            count((array)$message->getTo())
-            + count((array)$message->getCc())
-            + count((array)$message->getBcc())
+            count((array) $message->getTo())
+            + count((array) $message->getCc())
+            + count((array) $message->getBcc())
         );
 
         return $count;

lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
         if ($i !== null) {
             $tree[-1] = min(count($replace) - 1, $i);
             $tree[-2] = $last_size;
-            $this->_treeMaxLen = (int)$size;
+            $this->_treeMaxLen = (int) $size;
         }
         foreach ($replace as $rep) {
             if (!is_array($rep)) {