voku / swiftmailer

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

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
      *
      * This method returns a UNIX timestamp.
      *
-     * @return mixed
+     * @return integer|null
      */
     public function getFieldBodyModel()
     {

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

Spacing +12 added lines, -12 removed lines

@@ -132,7 +132,7 @@ 
         foreach ($this->_params as $name => $value) {
             if (null !== $value) {
                 // Add the parameter
-                $body .= '; ' . $this->_createParameter($name, $value);
+                $body .= '; '.$this->_createParameter($name, $value);
             }
         }
 
@@ -160,7 +160,7 @@ 
                 $tokens[count($tokens) - 1] .= ';';
                 $tokens = array_merge(
                     $tokens,
-                    $this->generateTokenLines(' ' . $this->_createParameter($name, $value))
+                    $this->generateTokenLines(' '.$this->_createParameter($name, $value))
                 );
             }
         }
@@ -182,19 +182,19 @@ 
 
         $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 it's not already a valid parameter value ...
-        if (!preg_match('/^' . self::TOKEN_REGEX . '$/D', $value)) {
+        if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
             // TODO: text, or something else??
             // ... and it's not ascii
             if (!preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $value)) {
                 $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()."'");
             }
         }
 
@@ -224,13 +224,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
@@ -248,18 +248,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;
     }
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
      *
      * @see getNameAddresses()
      *
-     * @return string[]
+     * @return integer[]
      */
     public function getAddresses()
     {

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/Transport/EsmtpTransport.php

Spacing +10 added lines, -10 removed lines

@@ -91,7 +91,7 @@ 
      */
     public function setPort($port)
     {
-        $this->_params['port'] = (int)$port;
+        $this->_params['port'] = (int) $port;
 
         return $this;
     }
@@ -115,8 +115,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;
     }
@@ -256,7 +256,7 @@ 
      */
     public function executeCommand($command, $codes = array(), &$failures = null)
     {
-        $failures = (array)$failures;
+        $failures = (array) $failures;
         $stopSignal = false;
         $response = null;
 
@@ -287,7 +287,7 @@ 
 
             $inArray = in_array(
                 Swift::strtolowerWithStaticCache($method),
-                array_map(array('Swift', 'strtolowerWithStaticCache'), (array)$handler->exposeMixinMethods()),
+                array_map(array('Swift', 'strtolowerWithStaticCache'), (array) $handler->exposeMixinMethods()),
                 true
             );
 
@@ -306,7 +306,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 */
@@ -372,10 +372,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)
         );
@@ -392,10 +392,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/Mime/Attachment.php

Spacing +1 added lines, -1 removed lines

@@ -167,6 +167,6 @@
         }
         $extension = Swift::strtolowerWithStaticCache($extension);
 
-        return (string)$extension;
+        return (string) $extension;
     }
 }

lib/classes/Swift/FileSpool.php

Spacing +7 added lines, -7 removed lines

@@ -96,10 +96,10 @@ 
     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 */
-            $fp = @fopen($fileName . '.message', 'x');
+            $fp = @fopen($fileName.'.message', 'x');
             if (false !== $fp) {
                 if (false === fwrite($fp, $ser)) {
                     return false;
@@ -156,7 +156,7 @@ 
             }
         }
 
-        $failedRecipients = (array)$failedRecipients;
+        $failedRecipients = (array) $failedRecipients;
         $count = 0;
         $time = time();
         foreach ($directoryIterator as $file) {
@@ -167,12 +167,12 @@ 
             }
 
             /* We try a rename, it's an atomic operation, and avoid locking the file */
-            if (rename($file, $file . '.sending')) {
-                $message = unserialize(file_get_contents($file . '.sending'));
+            if (rename($file, $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;
@@ -209,7 +209,7 @@ 
         $ret = '';
         $strlen = strlen($base) - 1;
         for ($i = 0; $i < $count; ++$i) {
-            $ret .= $base[(int)mt_rand(0, $strlen)];
+            $ret .= $base[(int) mt_rand(0, $strlen)];
         }
 
         return $ret;

lib/classes/Swift/Transport/MailTransport.php

Spacing +10 added lines, -10 removed lines

@@ -130,7 +130,7 @@ 
      */
     public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     {
-        $failedRecipients = (array)$failedRecipients;
+        $failedRecipients = (array) $failedRecipients;
 
         $evt = $this->_eventDispatcher->createSendEvent($this, $message);
         if ($evt) {
@@ -142,9 +142,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())
         );
 
         /*
@@ -177,10 +177,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 = '';
         }
 
@@ -207,9 +207,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) {
@@ -221,7 +221,7 @@ 
             $count = 0;
         }
 
-        $message->generateId();  // Make sure a new Message ID is used
+        $message->generateId(); // Make sure a new Message ID is used
 
         return $count;
     }

Indentation +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
         $messageStr = $message->toString();
 
         if ($toHeader) {
-          $message->getHeaders()->set($toHeader);
+            $message->getHeaders()->set($toHeader);
         }
         $message->getHeaders()->set($subjectHeader);
 

Doc Comments +1 added lines, -1 removed lines

@@ -262,7 +262,7 @@
      *
      * @param Swift_Mime_Message $message
      *
-     * @return mixed|null|string
+     * @return string|null
      */
     private function _getReversePath(Swift_Mime_Message $message)
     {

lib/classes/Swift/Encoder/QpEncoder.php

Indentation +1 added lines, -1 removed lines

@@ -260,7 +260,7 @@
             }
 
             if ($tmpRet !== '=00') {
-              $ret .= $tmpRet;
+                $ret .= $tmpRet;
             }
         }
 

lib/classes/Swift/Mime/SimpleMimeEntity.php

Doc Comments +1 added lines, -1 removed lines

@@ -641,7 +641,7 @@
      *
      * @param string $field
      *
-     * @return null|string[]|string
+     * @return string
      */
     protected function _getHeaderFieldModel($field)
     {

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();