@@ -51,23 +51,23 @@ discard block |
||
| 51 | 51 | $prefix = 'Swift_CharacterReader_'; |
| 52 | 52 | |
| 53 | 53 | $singleByte = array( |
| 54 | - 'class' => $prefix . 'GenericFixedWidthReader', |
|
| 54 | + 'class' => $prefix.'GenericFixedWidthReader', |
|
| 55 | 55 | 'constructor' => array(1), |
| 56 | 56 | ); |
| 57 | 57 | |
| 58 | 58 | $doubleByte = array( |
| 59 | - 'class' => $prefix . 'GenericFixedWidthReader', |
|
| 59 | + 'class' => $prefix.'GenericFixedWidthReader', |
|
| 60 | 60 | 'constructor' => array(2), |
| 61 | 61 | ); |
| 62 | 62 | |
| 63 | 63 | $fourBytes = array( |
| 64 | - 'class' => $prefix . 'GenericFixedWidthReader', |
|
| 64 | + 'class' => $prefix.'GenericFixedWidthReader', |
|
| 65 | 65 | 'constructor' => array(4), |
| 66 | 66 | ); |
| 67 | 67 | |
| 68 | 68 | // UTF-8 |
| 69 | 69 | self::$_map['utf-?8'] = array( |
| 70 | - 'class' => $prefix . 'Utf8Reader', |
|
| 70 | + 'class' => $prefix.'Utf8Reader', |
|
| 71 | 71 | 'constructor' => array(), |
| 72 | 72 | ); |
| 73 | 73 | |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | $charset = Swift::strtolowerWithStaticCache(trim($charset)); |
| 107 | 107 | |
| 108 | 108 | foreach (self::$_map as $pattern => $spec) { |
| 109 | - $re = '/^' . $pattern . '$/D'; |
|
| 109 | + $re = '/^'.$pattern.'$/D'; |
|
| 110 | 110 | if (preg_match($re, $charset)) { |
| 111 | 111 | if (!array_key_exists($pattern, self::$_loaded)) { |
| 112 | 112 | $reflector = new ReflectionClass($spec['class']); |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | */ |
| 110 | 110 | public function setNameAddresses($mailboxes) |
| 111 | 111 | { |
| 112 | - $this->_mailboxes = $this->normalizeMailboxes((array)$mailboxes); |
|
| 112 | + $this->_mailboxes = $this->normalizeMailboxes((array) $mailboxes); |
|
| 113 | 113 | $this->setCachedValue(null); //Clear any cached value |
| 114 | 114 | } |
| 115 | 115 | |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | */ |
| 195 | 195 | public function setAddresses($addresses) |
| 196 | 196 | { |
| 197 | - $this->setNameAddresses(array_values((array)$addresses)); |
|
| 197 | + $this->setNameAddresses(array_values((array) $addresses)); |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | /** |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | public function removeAddresses($addresses) |
| 218 | 218 | { |
| 219 | 219 | $this->setCachedValue(null); |
| 220 | - foreach ((array)$addresses as $address) { |
|
| 220 | + foreach ((array) $addresses as $address) { |
|
| 221 | 221 | unset($this->_mailboxes[$address]); |
| 222 | 222 | } |
| 223 | 223 | } |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | $mailboxStr = $email; |
| 338 | 338 | if ($name) { |
| 339 | 339 | $nameStr = $this->createDisplayNameString($name, 0 === count($strings)); |
| 340 | - $mailboxStr = $nameStr . ' <' . $mailboxStr . '>'; |
|
| 340 | + $mailboxStr = $nameStr.' <'.$mailboxStr.'>'; |
|
| 341 | 341 | } |
| 342 | 342 | $strings[] = $mailboxStr; |
| 343 | 343 | } |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | private function _assertValidAddress($address) |
| 356 | 356 | { |
| 357 | 357 | if ($this->_emailValidator->isValidWrapper($address) === false) { |
| 358 | - throw new Swift_RfcComplianceException('Address in mailbox given [' . $address . '] does not comply with RFC 2822, 3.6.2.'); |
|
| 358 | + throw new Swift_RfcComplianceException('Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.'); |
|
| 359 | 359 | } |
| 360 | 360 | } |
| 361 | 361 | } |
@@ -203,7 +203,7 @@ |
||
| 203 | 203 | $to = $start; |
| 204 | 204 | for (; $this->_currentPos < $end; ++$this->_currentPos) { |
| 205 | 205 | if (isset($this->_map['i'], $this->_map['i'][$this->_currentPos])) { |
| 206 | - $ret .= substr($this->_datas, $start, $to - $start) . '?'; |
|
| 206 | + $ret .= substr($this->_datas, $start, $to - $start).'?'; |
|
| 207 | 207 | $start = $this->_map['p'][$this->_currentPos]; |
| 208 | 208 | } else { |
| 209 | 209 | $to = $this->_map['p'][$this->_currentPos]; |
@@ -185,8 +185,8 @@ discard block |
||
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | throw new Swift_TransportException( |
| 188 | - 'Failed to authenticate on SMTP server with username "' . |
|
| 189 | - $this->_username . '" using ' . $count . ' possible authenticators' |
|
| 188 | + 'Failed to authenticate on SMTP server with username "'. |
|
| 189 | + $this->_username.'" using '.$count.' possible authenticators' |
|
| 190 | 190 | ); |
| 191 | 191 | } |
| 192 | 192 | } |
@@ -263,6 +263,6 @@ discard block |
||
| 263 | 263 | } |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | - throw new Swift_TransportException('Auth mode ' . $mode . ' is invalid'); |
|
| 266 | + throw new Swift_TransportException('Auth mode '.$mode.' is invalid'); |
|
| 267 | 267 | } |
| 268 | 268 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | if (!$line) { |
| 184 | 184 | $metas = stream_get_meta_data($this->_out); |
| 185 | 185 | if ($metas['timed_out']) { |
| 186 | - throw new Swift_IoException('Connection to ' . $this->_getReadConnectionDescription() . ' Timed Out'); |
|
| 186 | + throw new Swift_IoException('Connection to '.$this->_getReadConnectionDescription().' Timed Out'); |
|
| 187 | 187 | } |
| 188 | 188 | } |
| 189 | 189 | |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $metas = stream_get_meta_data($this->_out); |
| 213 | 213 | if ($metas['timed_out']) { |
| 214 | 214 | throw new Swift_IoException( |
| 215 | - 'Connection to ' . $this->_getReadConnectionDescription() . ' Timed Out' |
|
| 215 | + 'Connection to '.$this->_getReadConnectionDescription().' Timed Out' |
|
| 216 | 216 | ); |
| 217 | 217 | } |
| 218 | 218 | } |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | $bytesWritten = fwrite($this->_in, substr($bytes, $totalBytesWritten)); |
| 254 | 254 | if (false === $bytesWritten || 0 === $bytesWritten) { |
| 255 | 255 | throw new Swift_IoException( |
| 256 | - 'Connection to ' . $this->_getReadConnectionDescription() . ' has gone away' |
|
| 256 | + 'Connection to '.$this->_getReadConnectionDescription().' has gone away' |
|
| 257 | 257 | ); |
| 258 | 258 | } |
| 259 | 259 | |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | |
| 280 | 280 | $host = $this->_params['host']; |
| 281 | 281 | if (!empty($this->_params['protocol'])) { |
| 282 | - $host = $this->_params['protocol'] . '://' . $host; |
|
| 282 | + $host = $this->_params['protocol'].'://'.$host; |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | $timeout = 15; |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | if (!empty($this->_params['sourceIp'])) { |
| 291 | - $options['socket']['bindto'] = $this->_params['sourceIp'] . ':0'; |
|
| 291 | + $options['socket']['bindto'] = $this->_params['sourceIp'].':0'; |
|
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | if (!empty($this->_params['verifySsl'])) { |
@@ -301,10 +301,10 @@ discard block |
||
| 301 | 301 | |
| 302 | 302 | $streamContext = stream_context_create($options); |
| 303 | 303 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 304 | - $this->_stream = @stream_socket_client($host . ':' . $this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext); |
|
| 304 | + $this->_stream = @stream_socket_client($host.':'.$this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext); |
|
| 305 | 305 | |
| 306 | 306 | if (false === $this->_stream) { |
| 307 | - throw new Swift_TransportException('Connection could not be established with host ' . $this->_params['host'] . ' [' . $errstr . ' #' . $errno . ']'); |
|
| 307 | + throw new Swift_TransportException('Connection could not be established with host '.$this->_params['host'].' ['.$errstr.' #'.$errno.']'); |
|
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | if (!empty($this->_params['blocking'])) { |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | |
| 336 | 336 | $err = stream_get_contents($pipes[2]); |
| 337 | 337 | if ($err) { |
| 338 | - throw new Swift_TransportException('Process could not be started [' . $err . ']'); |
|
| 338 | + throw new Swift_TransportException('Process could not be started ['.$err.']'); |
|
| 339 | 339 | } |
| 340 | 340 | |
| 341 | 341 | $this->_in = &$pipes[0]; |
@@ -346,16 +346,16 @@ discard block |
||
| 346 | 346 | { |
| 347 | 347 | switch ($this->_params['type']) { |
| 348 | 348 | case self::TYPE_PROCESS: |
| 349 | - return 'Process ' . $this->_params['command']; |
|
| 349 | + return 'Process '.$this->_params['command']; |
|
| 350 | 350 | break; |
| 351 | 351 | |
| 352 | 352 | case self::TYPE_SOCKET: |
| 353 | 353 | default: |
| 354 | 354 | $host = $this->_params['host']; |
| 355 | 355 | if (!empty($this->_params['protocol'])) { |
| 356 | - $host = $this->_params['protocol'] . '://' . $host; |
|
| 356 | + $host = $this->_params['protocol'].'://'.$host; |
|
| 357 | 357 | } |
| 358 | - $host .= ':' . $this->_params['port']; |
|
| 358 | + $host .= ':'.$this->_params['port']; |
|
| 359 | 359 | |
| 360 | 360 | return $host; |
| 361 | 361 | break; |
@@ -181,7 +181,7 @@ |
||
| 181 | 181 | ksort($valid_mime_types); |
| 182 | 182 | |
| 183 | 183 | // combine mime types and extensions array |
| 184 | - $output = "$preamble\$swift_mime_types = array(\n " . implode($valid_mime_types, ",\n ") . "\n);"; |
|
| 184 | + $output = "$preamble\$swift_mime_types = array(\n ".implode($valid_mime_types, ",\n ")."\n);"; |
|
| 185 | 185 | |
| 186 | 186 | // write mime_types.php config file |
| 187 | 187 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | { |
| 204 | 204 | $this->_privateKey = $privateKey; |
| 205 | 205 | $this->_domainName = $domainName; |
| 206 | - $this->_signerIdentity = '@' . $domainName; |
|
| 206 | + $this->_signerIdentity = '@'.$domainName; |
|
| 207 | 207 | $this->_selector = $selector; |
| 208 | 208 | |
| 209 | 209 | // keep fallback hash algorithm sha1 if php version is lower than 5.4.8 |
@@ -562,7 +562,7 @@ discard block |
||
| 562 | 562 | // Prepare the DKIM-Signature |
| 563 | 563 | $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); |
| 564 | 564 | if ($this->_bodyCanon != 'simple') { |
| 565 | - $params['c'] = $this->_headerCanon . '/' . $this->_bodyCanon; |
|
| 565 | + $params['c'] = $this->_headerCanon.'/'.$this->_bodyCanon; |
|
| 566 | 566 | } elseif ($this->_headerCanon != 'simple') { |
| 567 | 567 | $params['c'] = $this->_headerCanon; |
| 568 | 568 | } |
@@ -587,19 +587,19 @@ discard block |
||
| 587 | 587 | } |
| 588 | 588 | $string = ''; |
| 589 | 589 | foreach ($params as $k => $v) { |
| 590 | - $string .= $k . '=' . $v . '; '; |
|
| 590 | + $string .= $k.'='.$v.'; '; |
|
| 591 | 591 | } |
| 592 | 592 | $string = trim($string); |
| 593 | 593 | $headers->addTextHeader('DKIM-Signature', $string); |
| 594 | 594 | // Add the last DKIM-Signature |
| 595 | 595 | $tmp = $headers->getAll('DKIM-Signature'); |
| 596 | 596 | $this->_dkimHeader = end($tmp); |
| 597 | - $this->_addHeader(trim($this->_dkimHeader->toString()) . "\r\n b=", true); |
|
| 597 | + $this->_addHeader(trim($this->_dkimHeader->toString())."\r\n b=", true); |
|
| 598 | 598 | $this->_endOfHeaders(); |
| 599 | 599 | if ($this->_debugHeaders) { |
| 600 | 600 | $headers->addTextHeader('X-DebugHash', base64_encode($this->_headerHash)); |
| 601 | 601 | } |
| 602 | - $this->_dkimHeader->setValue($string . ' b=' . trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' '))); |
|
| 602 | + $this->_dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' '))); |
|
| 603 | 603 | |
| 604 | 604 | return $this; |
| 605 | 605 | } |
@@ -619,7 +619,7 @@ discard block |
||
| 619 | 619 | $name = Swift::strtolowerWithStaticCache(trim($exploded[0])); |
| 620 | 620 | $value = str_replace("\r\n", '', $exploded[1]); |
| 621 | 621 | $value = preg_replace("/[ \t][ \t]+/", ' ', $value); |
| 622 | - $header = $name . ':' . trim($value) . ($is_sig ? '' : "\r\n"); |
|
| 622 | + $header = $name.':'.trim($value).($is_sig ? '' : "\r\n"); |
|
| 623 | 623 | case 'simple': |
| 624 | 624 | // Nothing to do |
| 625 | 625 | } |
@@ -747,11 +747,11 @@ discard block |
||
| 747 | 747 | } |
| 748 | 748 | $pkeyId = openssl_get_privatekey($this->_privateKey); |
| 749 | 749 | if (!$pkeyId) { |
| 750 | - throw new Swift_SwiftException('Unable to load DKIM Private Key [' . openssl_error_string() . ']'); |
|
| 750 | + throw new Swift_SwiftException('Unable to load DKIM Private Key ['.openssl_error_string().']'); |
|
| 751 | 751 | } |
| 752 | 752 | if (openssl_sign($this->_headerCanonData, $signature, $pkeyId, $algorithm)) { |
| 753 | 753 | return $signature; |
| 754 | 754 | } |
| 755 | - throw new Swift_SwiftException('Unable to sign DKIM Hash [' . openssl_error_string() . ']'); |
|
| 755 | + throw new Swift_SwiftException('Unable to sign DKIM Hash ['.openssl_error_string().']'); |
|
| 756 | 756 | } |
| 757 | 757 | } |