Completed
Pull Request — 5.x (#21)
by Lars
11:50
created
lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
             if ($atEOF) {
47 47
                 $streamTheseBytes = $base64ReadBufferRemainderBytes;
48 48
             } else {
49
-                $streamTheseBytes = $base64ReadBufferRemainderBytes . $readBytes;
49
+                $streamTheseBytes = $base64ReadBufferRemainderBytes.$readBytes;
50 50
             }
51 51
 
52 52
             $base64ReadBufferRemainderBytes = null;
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
             $thisMaxLineLength = $maxLineLength - $remainder - $firstLineOffset;
72 72
 
73 73
             while ($thisMaxLineLength < strlen($encoded)) {
74
-                $encodedTransformed .= substr($encoded, 0, $thisMaxLineLength) . "\r\n";
74
+                $encodedTransformed .= substr($encoded, 0, $thisMaxLineLength)."\r\n";
75 75
                 $firstLineOffset = 0;
76 76
                 $encoded = substr($encoded, $thisMaxLineLength);
77 77
                 $thisMaxLineLength = $maxLineLength;
Please login to merge, or discard this patch.
lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
     {
72 72
         $leftOver = '';
73 73
         while (false !== $bytes = $os->read(8192)) {
74
-            $toencode = $leftOver . $bytes;
74
+            $toencode = $leftOver.$bytes;
75 75
 
76 76
             if ($this->_canonical) {
77 77
                 $toencode = $this->_canonicalize($toencode);
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
                 if (
141 141
                     $currentLine !== ''
142 142
                     &&
143
-                    strlen($currentLine . $chunk) > $length
143
+                    strlen($currentLine.$chunk) > $length
144 144
                 ) {
145 145
                     $lines[] = '';
146 146
                     $currentLine = &$lines[$lineCount++];
Please login to merge, or discard this patch.
lib/classes/Swift/Transport/EsmtpTransport.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
      */
92 92
     public function setPort($port)
93 93
     {
94
-        $this->_params['port'] = (int)$port;
94
+        $this->_params['port'] = (int) $port;
95 95
 
96 96
         return $this;
97 97
     }
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
115 115
      */
116 116
     public function setTimeout($timeout)
117 117
     {
118
-        $this->_params['timeout'] = (int)$timeout;
119
-        $this->_buffer->setParam('timeout', (int)$timeout);
118
+        $this->_params['timeout'] = (int) $timeout;
119
+        $this->_buffer->setParam('timeout', (int) $timeout);
120 120
 
121 121
         return $this;
122 122
     }
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
      */
259 259
     public function executeCommand($command, $codes = array(), &$failures = null)
260 260
     {
261
-        $failures = (array)$failures;
261
+        $failures = (array) $failures;
262 262
         $stopSignal = false;
263 263
         $response = null;
264 264
 
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 
292 292
             $inArray = in_array(
293 293
                 strtolower($method),
294
-                array_map('strtolower', (array)$handler->exposeMixinMethods()),
294
+                array_map('strtolower', (array) $handler->exposeMixinMethods()),
295 295
                 true
296 296
             );
297 297
 
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
                 }
311 311
             }
312 312
         }
313
-        trigger_error('Call to undefined method ' . $method, E_USER_ERROR);
313
+        trigger_error('Call to undefined method '.$method, E_USER_ERROR);
314 314
     }
315 315
 
316 316
     /** Get the params to initialize the buffer */
@@ -376,10 +376,10 @@  discard block
 block discarded – undo
376 376
 
377 377
         $params = array();
378 378
         foreach ($handlers as $handler) {
379
-            $params = array_merge($params, (array)$handler->getMailParams());
379
+            $params = array_merge($params, (array) $handler->getMailParams());
380 380
         }
381 381
 
382
-        $paramStr = !empty($params) ? ' ' . implode(' ', $params) : '';
382
+        $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
383 383
         $this->executeCommand(
384 384
             sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), array(250)
385 385
         );
@@ -396,10 +396,10 @@  discard block
 block discarded – undo
396 396
 
397 397
         $params = array();
398 398
         foreach ($handlers as $handler) {
399
-            $params = array_merge($params, (array)$handler->getRcptParams());
399
+            $params = array_merge($params, (array) $handler->getRcptParams());
400 400
         }
401 401
 
402
-        $paramStr = !empty($params) ? ' ' . implode(' ', $params) : '';
402
+        $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
403 403
         $this->executeCommand(
404 404
             sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
405 405
         );
Please login to merge, or discard this patch.
lib/classes/Swift/Transport/AbstractSmtpTransport.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
     public function send(Swift_Mime_Message $message, &$failedRecipients = null)
178 178
     {
179 179
         $sent = 0;
180
-        $failedRecipients = (array)$failedRecipients;
180
+        $failedRecipients = (array) $failedRecipients;
181 181
 
182 182
         $evt = $this->_eventDispatcher->createSendEvent($this, $message);
183 183
         if ($evt) {
@@ -196,10 +196,10 @@  discard block
 block discarded – undo
196 196
             );
197 197
         }
198 198
 
199
-        $to = (array)$message->getTo();
200
-        $cc = (array)$message->getCc();
199
+        $to = (array) $message->getTo();
200
+        $cc = (array) $message->getCc();
201 201
         $tos = array_merge($to, $cc);
202
-        $bcc = (array)$message->getBcc();
202
+        $bcc = (array) $message->getBcc();
203 203
 
204 204
         $message->setBcc(array());
205 205
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
      */
309 309
     public function executeCommand($command, $codes = array(), &$failures = null)
310 310
     {
311
-        $failures = (array)$failures;
311
+        $failures = (array) $failures;
312 312
         $seq = $this->_buffer->write($command);
313 313
         $response = $this->_getFullResponse($seq);
314 314
 
@@ -461,8 +461,8 @@  discard block
 block discarded – undo
461 461
         if (!$valid) {
462 462
             $this->_throwException(
463 463
                 new Swift_TransportException(
464
-                    'Expected response code ' . implode('/', $wanted) . ' but got code ' .
465
-                    '"' . $code . '", with message "' . $response . '"',
464
+                    'Expected response code '.implode('/', $wanted).' but got code '.
465
+                    '"'.$code.'", with message "'.$response.'"',
466 466
                     $code
467 467
                 )
468 468
             );
Please login to merge, or discard this patch.
lib/classes/Swift/Transport/Esmtp/AuthHandler.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -182,8 +182,8 @@  discard block
 block discarded – undo
182 182
                 }
183 183
             }
184 184
             throw new Swift_TransportException(
185
-                'Failed to authenticate on SMTP server with username "' .
186
-                $this->_username . '" using ' . $count . ' possible authenticators'
185
+                'Failed to authenticate on SMTP server with username "'.
186
+                $this->_username.'" using '.$count.' possible authenticators'
187 187
                 );
188 188
         }
189 189
     }
@@ -260,6 +260,6 @@  discard block
 block discarded – undo
260 260
             }
261 261
         }
262 262
 
263
-        throw new Swift_TransportException('Auth mode ' . $mode . ' is invalid');
263
+        throw new Swift_TransportException('Auth mode '.$mode.' is invalid');
264 264
     }
265 265
 }
Please login to merge, or discard this patch.
lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
             $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", array(334));
41 41
             $challenge = base64_decode(substr($challenge, 4));
42 42
             $message = base64_encode(
43
-                $username . ' ' . $this->_getResponse($password, $challenge)
43
+                $username.' '.$this->_getResponse($password, $challenge)
44 44
                 );
45 45
             $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
46 46
 
@@ -73,8 +73,8 @@  discard block
 block discarded – undo
73 73
         $k_ipad = substr($secret, 0, 64) ^ str_repeat(chr(0x36), 64);
74 74
         $k_opad = substr($secret, 0, 64) ^ str_repeat(chr(0x5C), 64);
75 75
 
76
-        $inner = pack('H32', md5($k_ipad . $challenge));
77
-        $digest = md5($k_opad . $inner);
76
+        $inner = pack('H32', md5($k_ipad.$challenge));
77
+        $digest = md5($k_opad.$inner);
78 78
 
79 79
         return $digest;
80 80
     }
Please login to merge, or discard this patch.
lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
     {
49 49
         try {
50 50
             $param = $this->constructXOAuth2Params($email, $token);
51
-            $agent->executeCommand('AUTH XOAUTH2 ' . $param . "\r\n", array(235));
51
+            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", array(235));
52 52
 
53 53
             return true;
54 54
         } catch (Swift_TransportException $e) {
Please login to merge, or discard this patch.
lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
38 38
     {
39 39
         try {
40
-            $message = base64_encode($username . chr(0) . $username . chr(0) . $password);
40
+            $message = base64_encode($username.chr(0).$username.chr(0).$password);
41 41
             $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
42 42
 
43 43
             return true;
Please login to merge, or discard this patch.
lib/classes/Swift/Transport/SendmailTransport.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
      */
100 100
     public function send(Swift_Mime_Message $message, &$failedRecipients = null)
101 101
     {
102
-        $failedRecipients = (array)$failedRecipients;
102
+        $failedRecipients = (array) $failedRecipients;
103 103
         $command = $this->getCommand();
104 104
         $buffer = $this->getBuffer();
105 105
         $count = 0;
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
             }
117 117
 
118 118
             if (false === strpos($command, ' -f')) {
119
-                $command .= ' -f' . escapeshellarg($this->_getReversePath($message));
119
+                $command .= ' -f'.escapeshellarg($this->_getReversePath($message));
120 120
             }
121 121
 
122 122
             $buffer->initialize(array_merge($this->_params, array('command' => $command)));
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
                 $buffer->setWriteTranslations(array("\r\n" => "\n"));
128 128
             }
129 129
 
130
-            $count = count((array)$message->getTo())
131
-                     + count((array)$message->getCc())
132
-                     + count((array)$message->getBcc());
130
+            $count = count((array) $message->getTo())
131
+                     + count((array) $message->getCc())
132
+                     + count((array) $message->getBcc());
133 133
 
134 134
             $message->toByteStream($buffer);
135 135
             $buffer->flushBuffers();
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
         } else {
153 153
             $this->_throwException(
154 154
                 new Swift_TransportException(
155
-                    'Unsupported sendmail command flags [' . $command . ']. ' .
155
+                    'Unsupported sendmail command flags ['.$command.']. '.
156 156
                     'Must be one of "-bs" or "-t" but can include additional flags.'
157 157
                 )
158 158
             );
Please login to merge, or discard this patch.