Completed
Pull Request — 5.x (#23)
by Lars
07:46
created
lib/classes/Swift/Mime/SimpleMessage.php 2 patches
Doc Comments   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
     /**
108 108
      * Get the date at which this message was created.
109 109
      *
110
-     * @return int
110
+     * @return string
111 111
      */
112 112
     public function getDate()
113 113
     {
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
      * If $name is passed and the first parameter is a string, this name will be
200 200
      * associated with the address.
201 201
      *
202
-     * @param string|array $addresses
202
+     * @param string $addresses
203 203
      * @param string       $name      optional
204 204
      *
205 205
      * @return Swift_Mime_SimpleMessage
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
     /**
221 221
      * Get the from address of this message.
222 222
      *
223
-     * @return mixed
223
+     * @return string
224 224
      */
225 225
     public function getFrom()
226 226
     {
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
      * If $name is passed and the first parameter is a string, this name will be
254 254
      * associated with the address.
255 255
      *
256
-     * @param mixed  $addresses
256
+     * @param string  $addresses
257 257
      * @param string $name      optional
258 258
      *
259 259
      * @return Swift_Mime_SimpleMessage
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
      * If $name is passed and the first parameter is a string, this name will be
309 309
      * associated with the address.
310 310
      *
311
-     * @param mixed  $addresses
311
+     * @param string  $addresses
312 312
      * @param string $name      optional
313 313
      *
314 314
      * @return Swift_Mime_SimpleMessage
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
     /**
330 330
      * Get the To addresses of this message.
331 331
      *
332
-     * @return array
332
+     * @return string
333 333
      */
334 334
     public function getTo()
335 335
     {
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
      * If $name is passed and the first parameter is a string, this name will be
361 361
      * associated with the address.
362 362
      *
363
-     * @param mixed  $addresses
363
+     * @param string  $addresses
364 364
      * @param string $name      optional
365 365
      *
366 366
      * @return Swift_Mime_SimpleMessage
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
     /**
382 382
      * Get the Cc address of this message.
383 383
      *
384
-     * @return array
384
+     * @return string
385 385
      */
386 386
     public function getCc()
387 387
     {
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
      * If $name is passed and the first parameter is a string, this name will be
413 413
      * associated with the address.
414 414
      *
415
-     * @param mixed  $addresses
415
+     * @param string  $addresses
416 416
      * @param string $name      optional
417 417
      *
418 418
      * @return Swift_Mime_SimpleMessage
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
     /**
434 434
      * Get the Bcc addresses of this message.
435 435
      *
436
-     * @return array
436
+     * @return string
437 437
      */
438 438
     public function getBcc()
439 439
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -560,7 +560,7 @@
 block discarded – undo
560 560
     {
561 561
         $this->attach($entity);
562 562
 
563
-        return 'cid:' . $entity->getId();
563
+        return 'cid:'.$entity->getId();
564 564
     }
565 565
 
566 566
     /**
Please login to merge, or discard this patch.
lib/classes/Swift/Signers/DomainKeySigner.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -435,6 +435,9 @@
 block discarded – undo
435 435
 
436 436
     /* Private helpers */
437 437
 
438
+    /**
439
+     * @param string $header
440
+     */
438 441
     protected function _addHeader($header)
439 442
     {
440 443
         switch ($this->_canon) {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
     {
146 146
         $this->_privateKey = $privateKey;
147 147
         $this->_domainName = $domainName;
148
-        $this->_signerIdentity = '@' . $domainName;
148
+        $this->_signerIdentity = '@'.$domainName;
149 149
         $this->_selector = $selector;
150 150
     }
151 151
 
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
         $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);
426 426
         $string = '';
427 427
         foreach ($params as $k => $v) {
428
-            $string .= $k . '=' . $v . '; ';
428
+            $string .= $k.'='.$v.'; ';
429 429
         }
430 430
         $string = trim($string);
431 431
         $headers->addTextHeader('DomainKey-Signature', $string);
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
                 $name = Swift::strtolowerWithStaticCache(trim($exploded[0]));
445 445
                 $value = str_replace("\r\n", '', $exploded[1]);
446 446
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
447
-                $header = $name . ':' . trim($value) . "\r\n";
447
+                $header = $name.':'.trim($value)."\r\n";
448 448
             case 'simple':
449 449
                 // Nothing to do
450 450
         }
@@ -544,11 +544,11 @@  discard block
 block discarded – undo
544 544
         $signature = '';
545 545
         $pkeyId = openssl_get_privatekey($this->_privateKey);
546 546
         if (!$pkeyId) {
547
-            throw new Swift_SwiftException('Unable to load DomainKey Private Key [' . openssl_error_string() . ']');
547
+            throw new Swift_SwiftException('Unable to load DomainKey Private Key ['.openssl_error_string().']');
548 548
         }
549 549
         if (openssl_sign($this->_canonData, $signature, $pkeyId, OPENSSL_ALGO_SHA1)) {
550 550
             return $signature;
551 551
         }
552
-        throw new Swift_SwiftException('Unable to sign DomainKey Hash  [' . openssl_error_string() . ']');
552
+        throw new Swift_SwiftException('Unable to sign DomainKey Hash  ['.openssl_error_string().']');
553 553
     }
554 554
 }
Please login to merge, or discard this patch.
lib/classes/Swift/EmailValidatorBridge.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,6 +30,6 @@
 block discarded – undo
30 30
      */
31 31
     public function isValidSimpleWrapper($email)
32 32
     {
33
-        return (boolean)preg_match('/^(.*<?)(.*)@(.*)(>?)$/', $email);
33
+        return (boolean) preg_match('/^(.*<?)(.*)@(.*)(>?)$/', $email);
34 34
     }
35 35
 }
Please login to merge, or discard this patch.
lib/classes/Swift/Signers/DKIMSigner.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -435,6 +435,9 @@
 block discarded – undo
435 435
 
436 436
     /* Private helpers */
437 437
 
438
+    /**
439
+     * @param string $header
440
+     */
438 441
     protected function _addHeader($header)
439 442
     {
440 443
         switch ($this->_canon) {
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
     {
202 202
         $this->_privateKey = $privateKey;
203 203
         $this->_domainName = $domainName;
204
-        $this->_signerIdentity = '@' . $domainName;
204
+        $this->_signerIdentity = '@'.$domainName;
205 205
         $this->_selector = $selector;
206 206
     }
207 207
 
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
         // Prepare the DKIM-Signature
550 550
         $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);
551 551
         if ($this->_bodyCanon != 'simple') {
552
-            $params['c'] = $this->_headerCanon . '/' . $this->_bodyCanon;
552
+            $params['c'] = $this->_headerCanon.'/'.$this->_bodyCanon;
553 553
         } elseif ($this->_headerCanon != 'simple') {
554 554
             $params['c'] = $this->_headerCanon;
555 555
         }
@@ -574,19 +574,19 @@  discard block
 block discarded – undo
574 574
         }
575 575
         $string = '';
576 576
         foreach ($params as $k => $v) {
577
-            $string .= $k . '=' . $v . '; ';
577
+            $string .= $k.'='.$v.'; ';
578 578
         }
579 579
         $string = trim($string);
580 580
         $headers->addTextHeader('DKIM-Signature', $string);
581 581
         // Add the last DKIM-Signature
582 582
         $tmp = $headers->getAll('DKIM-Signature');
583 583
         $this->_dkimHeader = end($tmp);
584
-        $this->_addHeader(trim($this->_dkimHeader->toString()) . "\r\n b=", true);
584
+        $this->_addHeader(trim($this->_dkimHeader->toString())."\r\n b=", true);
585 585
         $this->_endOfHeaders();
586 586
         if ($this->_debugHeaders) {
587 587
             $headers->addTextHeader('X-DebugHash', base64_encode($this->_headerHash));
588 588
         }
589
-        $this->_dkimHeader->setValue($string . ' b=' . trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' ')));
589
+        $this->_dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' ')));
590 590
 
591 591
         return $this;
592 592
     }
@@ -602,7 +602,7 @@  discard block
 block discarded – undo
602 602
                 $name = Swift::strtolowerWithStaticCache(trim($exploded[0]));
603 603
                 $value = str_replace("\r\n", '', $exploded[1]);
604 604
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
605
-                $header = $name . ':' . trim($value) . ($is_sig ? '' : "\r\n");
605
+                $header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
606 606
             case 'simple':
607 607
                 // Nothing to do
608 608
         }
@@ -723,11 +723,11 @@  discard block
 block discarded – undo
723 723
         }
724 724
         $pkeyId = openssl_get_privatekey($this->_privateKey);
725 725
         if (!$pkeyId) {
726
-            throw new Swift_SwiftException('Unable to load DKIM Private Key [' . openssl_error_string() . ']');
726
+            throw new Swift_SwiftException('Unable to load DKIM Private Key ['.openssl_error_string().']');
727 727
         }
728 728
         if (openssl_sign($this->_headerCanonData, $signature, $pkeyId, $algorithm)) {
729 729
             return $signature;
730 730
         }
731
-        throw new Swift_SwiftException('Unable to sign DKIM Hash [' . openssl_error_string() . ']');
731
+        throw new Swift_SwiftException('Unable to sign DKIM Hash ['.openssl_error_string().']');
732 732
     }
733 733
 }
Please login to merge, or discard this patch.
lib/classes/Swift/Mime/SimpleMimeEntity.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -702,7 +702,7 @@
 block discarded – undo
702 702
     {
703 703
         if (count($this->_immediateChildren)) {
704 704
             $this->_setHeaderParameter('Content-Type', 'boundary',
705
-                                       $this->getBoundary()
705
+                                        $this->getBoundary()
706 706
             );
707 707
             $this->_headers->remove('Content-Transfer-Encoding');
708 708
         } else {
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -810,6 +810,9 @@
 block discarded – undo
810 810
         }
811 811
     }
812 812
 
813
+    /**
814
+     * @param integer $level
815
+     */
813 816
     private function _setNestingLevel($level)
814 817
     {
815 818
         $this->_nestingLevel = $level;
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
     public function getBoundary()
466 466
     {
467 467
         if (!isset($this->_boundary)) {
468
-            $this->_boundary = '_=_swift_v5_' . time() . '_' . md5(getmypid() . mt_rand() . uniqid('', true)) . '_=_';
468
+            $this->_boundary = '_=_swift_v5_'.time().'_'.md5(getmypid().mt_rand().uniqid('', true)).'_=_';
469 469
         }
470 470
 
471 471
         return $this->_boundary;
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
             if ($this->_cache->hasKey($this->_cacheKey, 'body')) {
537 537
                 $body = $this->_cache->getString($this->_cacheKey, 'body');
538 538
             } else {
539
-                $body = "\r\n" . $this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
539
+                $body = "\r\n".$this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
540 540
                 $this->_cache->setString($this->_cacheKey, 'body', $body, Swift_KeyCache::MODE_WRITE);
541 541
             }
542 542
             $string .= $body;
@@ -544,10 +544,10 @@  discard block
 block discarded – undo
544 544
 
545 545
         if (!empty($this->_immediateChildren)) {
546 546
             foreach ($this->_immediateChildren as $child) {
547
-                $string .= "\r\n\r\n--" . $this->getBoundary() . "\r\n";
547
+                $string .= "\r\n\r\n--".$this->getBoundary()."\r\n";
548 548
                 $string .= $child->toString();
549 549
             }
550
-            $string .= "\r\n\r\n--" . $this->getBoundary() . "--\r\n";
550
+            $string .= "\r\n\r\n--".$this->getBoundary()."--\r\n";
551 551
         }
552 552
 
553 553
         return $string;
@@ -614,10 +614,10 @@  discard block
 block discarded – undo
614 614
 
615 615
         if (!empty($this->_immediateChildren)) {
616 616
             foreach ($this->_immediateChildren as $child) {
617
-                $is->write("\r\n\r\n--" . $this->getBoundary() . "\r\n");
617
+                $is->write("\r\n\r\n--".$this->getBoundary()."\r\n");
618 618
                 $child->toByteStream($is);
619 619
             }
620
-            $is->write("\r\n\r\n--" . $this->getBoundary() . "--\r\n");
620
+            $is->write("\r\n\r\n--".$this->getBoundary()."--\r\n");
621 621
         }
622 622
     }
623 623
 
@@ -746,14 +746,14 @@  discard block
 block discarded – undo
746 746
      */
747 747
     protected function getRandomId()
748 748
     {
749
-        $idLeft = md5(getmypid() . '.' . time() . '.' . uniqid(mt_rand(), true));
749
+        $idLeft = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
750 750
         $idRight = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated';
751
-        $id = $idLeft . '@' . $idRight;
751
+        $id = $idLeft.'@'.$idRight;
752 752
 
753 753
         try {
754 754
             $this->_assertValidId($id);
755 755
         } catch (Swift_RfcComplianceException $e) {
756
-            $id = $idLeft . '@swift.generated';
756
+            $id = $idLeft.'@swift.generated';
757 757
         }
758 758
 
759 759
         return $id;
@@ -766,7 +766,7 @@  discard block
 block discarded – undo
766 766
      */
767 767
     private function _generateNewCacheKey()
768 768
     {
769
-        return md5(uniqid(getmypid() . mt_rand(), true));
769
+        return md5(uniqid(getmypid().mt_rand(), true));
770 770
     }
771 771
 
772 772
     private function _readStream(Swift_OutputByteStream $os)
@@ -849,10 +849,10 @@  discard block
 block discarded – undo
849 849
         $lowercaseType = Swift::strtolowerWithStaticCache($child->getContentType());
850 850
 
851 851
         if (isset($filter[$realLevel]) && isset($filter[$realLevel][$lowercaseType])) {
852
-            return (int)$filter[$realLevel][$lowercaseType];
852
+            return (int) $filter[$realLevel][$lowercaseType];
853 853
         }
854 854
 
855
-        return (int)$realLevel;
855
+        return (int) $realLevel;
856 856
     }
857 857
 
858 858
     /**
@@ -948,7 +948,7 @@  discard block
 block discarded – undo
948 948
     private function _assertValidId($id)
949 949
     {
950 950
         if ($this->_emailValidator->isValidWrapper($id) === false) {
951
-            throw new Swift_RfcComplianceException('Invalid ID given <' . $id . '>');
951
+            throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
952 952
         }
953 953
     }
954 954
 
Please login to merge, or discard this patch.
lib/classes/Swift/Mime/MimePart.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@
 block discarded – undo
189 189
     /**
190 190
      * Set the nesting level of this entity
191 191
      *
192
-     * @param $level
192
+     * @param integer $level
193 193
      */
194 194
     protected function _setNestingLevel($level)
195 195
     {
Please login to merge, or discard this patch.
lib/classes/Swift/Transport/NullTransport.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -77,9 +77,9 @@
 block discarded – undo
77 77
         }
78 78
 
79 79
         $count = (
80
-            count((array)$message->getTo())
81
-            + count((array)$message->getCc())
82
-            + count((array)$message->getBcc())
80
+            count((array) $message->getTo())
81
+            + count((array) $message->getCc())
82
+            + count((array) $message->getBcc())
83 83
         );
84 84
 
85 85
         return $count;
Please login to merge, or discard this patch.
lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php 2 patches
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -226,8 +226,8 @@  discard block
 block discarded – undo
226 226
     protected function createMessage1()
227 227
     {
228 228
         return self::NTLMSIG
229
-               . $this->createByte('01') // Message 1
230
-               . $this->createByte('0702'); // Flags
229
+                . $this->createByte('01') // Message 1
230
+                . $this->createByte('0702'); // Flags
231 231
     }
232 232
 
233 233
     /**
@@ -255,19 +255,19 @@  discard block
 block discarded – undo
255 255
         $ntlmSec = $this->createSecurityBuffer($ntlmResponse, ($lmInfo[0] + $lmInfo[1]) / 2, true);
256 256
 
257 257
         return self::NTLMSIG
258
-               . $this->createByte('03') // TYPE 3 message
259
-               . $lmSec // LM response header
260
-               . $ntlmSec // NTLM response header
261
-               . $domainSec // Domain header
262
-               . $userSec // User header
263
-               . $workSec // Workstation header
264
-               . $this->createByte('000000009a', 8) // session key header (empty)
265
-               . $this->createByte('01020000') // FLAGS
266
-               . $this->convertTo16bit($domain) // domain name
267
-               . $this->convertTo16bit($username) // username
268
-               . $this->convertTo16bit($workstation) // workstation
269
-               . $lmResponse
270
-               . $ntlmResponse;
258
+                . $this->createByte('03') // TYPE 3 message
259
+                . $lmSec // LM response header
260
+                . $ntlmSec // NTLM response header
261
+                . $domainSec // Domain header
262
+                . $userSec // User header
263
+                . $workSec // Workstation header
264
+                . $this->createByte('000000009a', 8) // session key header (empty)
265
+                . $this->createByte('01020000') // FLAGS
266
+                . $this->convertTo16bit($domain) // domain name
267
+                . $this->convertTo16bit($username) // username
268
+                . $this->convertTo16bit($workstation) // workstation
269
+                . $lmResponse
270
+                . $ntlmResponse;
271 271
     }
272 272
 
273 273
     /**
@@ -280,12 +280,12 @@  discard block
 block discarded – undo
280 280
     protected function createBlob($timestamp, $client, $targetInfo)
281 281
     {
282 282
         return $this->createByte('0101')
283
-               . $this->createByte('00')
284
-               . $timestamp
285
-               . $client
286
-               . $this->createByte('00')
287
-               . $targetInfo
288
-               . $this->createByte('00');
283
+                . $this->createByte('00')
284
+                . $timestamp
285
+                . $client
286
+                . $this->createByte('00')
287
+                . $targetInfo
288
+                . $this->createByte('00');
289 289
     }
290 290
 
291 291
     /**
@@ -451,16 +451,16 @@  discard block
 block discarded – undo
451 451
         foreach ($material as $k => $v) {
452 452
             $b = $this->castToByte(hexdec($v));
453 453
             $needsParity = (
454
-                               (
455
-                                   $this->uRShift($b, 7)
456
-                                   ^ $this->uRShift($b, 6)
457
-                                   ^ $this->uRShift($b, 5)
458
-                                   ^ $this->uRShift($b, 4)
459
-                                   ^ $this->uRShift($b, 3)
460
-                                   ^ $this->uRShift($b, 2)
461
-                                   ^ $this->uRShift($b, 1)
462
-                               ) & 0x01
463
-                           ) == 0;
454
+                                (
455
+                                    $this->uRShift($b, 7)
456
+                                    ^ $this->uRShift($b, 6)
457
+                                    ^ $this->uRShift($b, 5)
458
+                                    ^ $this->uRShift($b, 4)
459
+                                    ^ $this->uRShift($b, 3)
460
+                                    ^ $this->uRShift($b, 2)
461
+                                    ^ $this->uRShift($b, 1)
462
+                                ) & 0x01
463
+                            ) == 0;
464 464
 
465 465
             list($high, $low) = str_split($v);
466 466
 
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
                 // pad to $bits bit
87 87
                 $bin_length = strlen($bin);
88 88
                 if ($bin_length < $bits) {
89
-                    $bin = str_repeat('0', $bits - $bin_length) . $bin;
89
+                    $bin = str_repeat('0', $bits - $bin_length).$bin;
90 90
                 }
91 91
             } else {
92 92
                 // negative
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
                 $bin = base_convert($si, 10, 2);
95 95
                 $bin_length = strlen($bin);
96 96
                 if ($bin_length > $bits) {
97
-                    $bin = str_repeat('1', $bits - $bin_length) . $bin;
97
+                    $bin = str_repeat('1', $bits - $bin_length).$bin;
98 98
                 }
99 99
             }
100 100
         }
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
     {
200 200
         list($domain, $username) = $this->getDomainAndUsername($username);
201 201
         //$challenge, $context, $targetInfoH, $targetName, $domainName, $workstation, $DNSDomainName, $DNSServerName, $blob, $ter
202
-        list($challenge, , , , , $workstation, , , $blob) = $this->parseMessage2($response);
202
+        list($challenge,,,,, $workstation,,, $blob) = $this->parseMessage2($response);
203 203
 
204 204
         if (!$v2) {
205 205
             // LMv1
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
         $desKey1 = $this->createDesKey($key1);
326 326
         $desKey2 = $this->createDesKey($key2);
327 327
 
328
-        $constantDecrypt = $this->createByte($this->desEncrypt(self::DESCONST, $desKey1) . $this->desEncrypt(self::DESCONST, $desKey2), 21, false);
328
+        $constantDecrypt = $this->createByte($this->desEncrypt(self::DESCONST, $desKey1).$this->desEncrypt(self::DESCONST, $desKey2), 21, false);
329 329
 
330 330
         // SECOND PART
331 331
         list($key1, $key2, $key3) = str_split($constantDecrypt, 7);
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
         $desKey2 = $this->createDesKey($key2);
335 335
         $desKey3 = $this->createDesKey($key3);
336 336
 
337
-        return $this->desEncrypt($challenge, $desKey1) . $this->desEncrypt($challenge, $desKey2) . $this->desEncrypt($challenge, $desKey3);
337
+        return $this->desEncrypt($challenge, $desKey1).$this->desEncrypt($challenge, $desKey2).$this->desEncrypt($challenge, $desKey3);
338 338
     }
339 339
 
340 340
     /**
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
         $desKey2 = $this->createDesKey($key2);
356 356
         $desKey3 = $this->createDesKey($key3);
357 357
 
358
-        return $this->desEncrypt($challenge, $desKey1) . $this->desEncrypt($challenge, $desKey2) . $this->desEncrypt($challenge, $desKey3);
358
+        return $this->desEncrypt($challenge, $desKey1).$this->desEncrypt($challenge, $desKey2).$this->desEncrypt($challenge, $desKey3);
359 359
     }
360 360
 
361 361
     /**
@@ -400,9 +400,9 @@  discard block
 block discarded – undo
400 400
         // if $password > 15 than we can't use this method
401 401
         if (strlen($password) <= 15) {
402 402
             $ntlmHash = $this->md4Encrypt($password);
403
-            $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username) . $domain));
403
+            $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain));
404 404
 
405
-            $lmPass = bin2hex($this->md5Encrypt($ntml2Hash, $challenge . $client) . $client);
405
+            $lmPass = bin2hex($this->md5Encrypt($ntml2Hash, $challenge.$client).$client);
406 406
         }
407 407
 
408 408
         return $this->createByte($lmPass, 24);
@@ -426,14 +426,14 @@  discard block
 block discarded – undo
426 426
     protected function createNTLMv2Hash($password, $username, $domain, $challenge, $targetInfo, $timestamp, $client)
427 427
     {
428 428
         $ntlmHash = $this->md4Encrypt($password);
429
-        $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username) . $domain));
429
+        $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain));
430 430
 
431 431
         // create blob
432 432
         $blob = $this->createBlob($timestamp, $client, $targetInfo);
433 433
 
434
-        $ntlmv2Response = $this->md5Encrypt($ntml2Hash, $challenge . $blob);
434
+        $ntlmv2Response = $this->md5Encrypt($ntml2Hash, $challenge.$blob);
435 435
 
436
-        return $ntlmv2Response . $blob;
436
+        return $ntlmv2Response.$blob;
437 437
     }
438 438
 
439 439
     protected function createDesKey($key)
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
         $len = strlen($key);
443 443
         for ($i = 1; $i < $len; ++$i) {
444 444
             list($high, $low) = str_split(bin2hex($key[$i]));
445
-            $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf) . dechex(hexdec($low) & 0xf)), $i));
445
+            $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
446 446
             $material[] = str_pad(substr(dechex($v), -2), 2, '0', STR_PAD_LEFT); // cast to byte
447 447
         }
448 448
         $material[] = str_pad(substr(dechex($this->castToByte(ord($key[6]) << 1)), -2), 2, '0');
@@ -465,9 +465,9 @@  discard block
 block discarded – undo
465 465
             list($high, $low) = str_split($v);
466 466
 
467 467
             if ($needsParity) {
468
-                $material[$k] = dechex(hexdec($high) | 0x0) . dechex(hexdec($low) | 0x1);
468
+                $material[$k] = dechex(hexdec($high) | 0x0).dechex(hexdec($low) | 0x1);
469 469
             } else {
470
-                $material[$k] = dechex(hexdec($high) & 0xf) . dechex(hexdec($low) & 0xe);
470
+                $material[$k] = dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xe);
471 471
             }
472 472
         }
473 473
 
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
         $length = $is16 ? $length / 2 : $length;
491 491
         $length = $this->createByte(str_pad(dechex($length), 2, '0', STR_PAD_LEFT), 2);
492 492
 
493
-        return $length . $length . $this->createByte(dechex($offset), 4);
493
+        return $length.$length.$this->createByte(dechex($offset), 4);
494 494
     }
495 495
 
496 496
     /**
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
612 612
         $ipadk = $key ^ str_repeat("\x36", $blocksize);
613 613
         $opadk = $key ^ str_repeat("\x5c", $blocksize);
614 614
 
615
-        return pack('H*', md5($opadk . pack('H*', md5($ipadk . $msg))));
615
+        return pack('H*', md5($opadk.pack('H*', md5($ipadk.$msg))));
616 616
     }
617 617
 
618 618
     /**
@@ -666,8 +666,8 @@  discard block
 block discarded – undo
666 666
     {
667 667
         $message = bin2hex($message);
668 668
         $messageId = substr($message, 16, 8);
669
-        echo substr($message, 0, 16) . " NTLMSSP Signature<br />\n";
670
-        echo $messageId . " Type Indicator<br />\n";
669
+        echo substr($message, 0, 16)." NTLMSSP Signature<br />\n";
670
+        echo $messageId." Type Indicator<br />\n";
671 671
 
672 672
         if ($messageId === '02000000') {
673 673
             $map = array(
@@ -686,7 +686,7 @@  discard block
 block discarded – undo
686 686
             $data = $this->parseMessage2($this->hex2bin($message));
687 687
 
688 688
             foreach ($map as $key => $value) {
689
-                echo bin2hex($data[$key]) . ' - ' . $data[$key] . ' ||| ' . $value . "<br />\n";
689
+                echo bin2hex($data[$key]).' - '.$data[$key].' ||| '.$value."<br />\n";
690 690
             }
691 691
         } elseif ($messageId === '03000000') {
692 692
             $i = 0;
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
             );
730 730
 
731 731
             foreach ($map as $key => $value) {
732
-                echo $data[$key] . ' - ' . $this->hex2bin($data[$key]) . ' ||| ' . $value . "<br />\n";
732
+                echo $data[$key].' - '.$this->hex2bin($data[$key]).' ||| '.$value."<br />\n";
733 733
             }
734 734
         }
735 735
 
Please login to merge, or discard this patch.
lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
         if ($i !== null) {
112 112
             $tree[-1] = min(count($replace) - 1, $i);
113 113
             $tree[-2] = $last_size;
114
-            $this->_treeMaxLen = (int)$size;
114
+            $this->_treeMaxLen = (int) $size;
115 115
         }
116 116
         foreach ($replace as $rep) {
117 117
             if (!is_array($rep)) {
Please login to merge, or discard this patch.