Merge branch '6.0' into 6.1

* 6.0:
  Fix CS
  Fix CS

Author: fabpot

Tests/Encoder/Base64EncoderTest.php

@@ -97,12 +97,12 @@ public function testMaximumLineLengthIs76Characters()
         'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
         $output =
-        'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQk'.//38
-        'NERUZHSElKS0xNTk9QUVJTVFVWV1hZWjEyMzQ1'."\r\n".//76 *
-        'Njc4OTBhYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3'.//38
-        'h5ekFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFla'."\r\n".//76 *
-        'MTIzNDU2Nzg5MEFCQ0RFRkdISUpLTE1OT1BRUl'.//38
-        'NUVVZXWFla';                                       //48
+        'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQk'.// 38
+        'NERUZHSElKS0xNTk9QUVJTVFVWV1hZWjEyMzQ1'."\r\n".// 76 *
+        'Njc4OTBhYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3'.// 38
+        'h5ekFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFla'."\r\n".// 76 *
+        'MTIzNDU2Nzg5MEFCQ0RFRkdISUpLTE1OT1BRUl'.// 38
+        'NUVVZXWFla';                                       // 48
 
         $encoder = new Base64Encoder();
         $this->assertEquals($output, $encoder->encodeString($input), 'Lines should be no more than 76 characters');
@@ -120,14 +120,14 @@ public function testMaximumLineLengthCanBeSpecified()
         'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
         $output =
-        'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQk'.//38
-        'NERUZHSElKS0'."\r\n".//50 *
-        'xNTk9QUVJTVFVWV1hZWjEyMzQ1Njc4OTBhYmNk'.//38
-        'ZWZnaGlqa2xt'."\r\n".//50 *
-        'bm9wcXJzdHV2d3h5ekFCQ0RFRkdISUpLTE1OT1'.//38
-        'BRUlNUVVZXWF'."\r\n".//50 *
-        'laMTIzNDU2Nzg5MEFCQ0RFRkdISUpLTE1OT1BR'.//38
-        'UlNUVVZXWFla';                                     //50 *
+        'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQk'.// 38
+        'NERUZHSElKS0'."\r\n".// 50 *
+        'xNTk9QUVJTVFVWV1hZWjEyMzQ1Njc4OTBhYmNk'.// 38
+        'ZWZnaGlqa2xt'."\r\n".// 50 *
+        'bm9wcXJzdHV2d3h5ekFCQ0RFRkdISUpLTE1OT1'.// 38
+        'BRUlNUVVZXWF'."\r\n".// 50 *
+        'laMTIzNDU2Nzg5MEFCQ0RFRkdISUpLTE1OT1BR'.// 38
+        'UlNUVVZXWFla';                                     // 50 *
 
         $encoder = new Base64Encoder();
         $this->assertEquals($output, $encoder->encodeString($input, 'utf-8', 0, 50), 'Lines should be no more than 100 characters');
@@ -145,12 +145,12 @@ public function testFirstLineLengthCanBeDifferent()
         'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
         $output =
-        'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQk'.//38
-        'NERUZHSElKS0xNTk9QU'."\r\n".//57 *
-        'VJTVFVWV1hZWjEyMzQ1Njc4OTBhYmNkZWZnaGl'.//38
-        'qa2xtbm9wcXJzdHV2d3h5ekFCQ0RFRkdISUpLT'."\r\n".//76 *
-        'E1OT1BRUlNUVVZXWFlaMTIzNDU2Nzg5MEFCQ0R'.//38
-        'FRkdISUpLTE1OT1BRUlNUVVZXWFla';                    //67
+        'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQk'.// 38
+        'NERUZHSElKS0xNTk9QU'."\r\n".// 57 *
+        'VJTVFVWV1hZWjEyMzQ1Njc4OTBhYmNkZWZnaGl'.// 38
+        'qa2xtbm9wcXJzdHV2d3h5ekFCQ0RFRkdISUpLT'."\r\n".// 76 *
+        'E1OT1BRUlNUVVZXWFlaMTIzNDU2Nzg5MEFCQ0R'.// 38
+        'FRkdISUpLTE1OT1BRUlNUVVZXWFla';                    // 67
 
         $encoder = new Base64Encoder();
         $this->assertEquals($output, $encoder->encodeString($input, 'utf-8', 19), 'First line offset is 19 so first line should be 57 chars long');

Tests/Header/UnstructuredHeaderTest.php

@@ -61,7 +61,7 @@ public function testLongHeadersAreFoldedAtWordBoundary()
         */
         $this->assertEquals(
             'X-Custom-Header: The quick brown fox jumped over the fence, he was a'.
-            ' very'."\r\n".//Folding
+            ' very'."\r\n".// Folding
             ' very scary brown fox with a bushy tail',
             $header->toString(), '%s: The header should have been folded at 76th char'
         );
@@ -149,10 +149,10 @@ public function testEncodedWordsAreNoMoreThan75CharsPerLine()
 
         $nonAsciiChar = pack('C', 0x8F);
 
-        //Note that multi-line headers begin with LWSP which makes 75 + 1 = 76
-        //Note also that =?utf-8?q??= is 12 chars which makes 75 - 12 = 63
+        // Note that multi-line headers begin with LWSP which makes 75 + 1 = 76
+        // Note also that =?utf-8?q??= is 12 chars which makes 75 - 12 = 63
 
-        //* X-Test: is 8 chars
+        // * X-Test: is 8 chars
         $header = new UnstructuredHeader('X-Test', $nonAsciiChar);
         $header->setCharset('iso-8859-1');
         $this->assertEquals('X-Test: =?'.$header->getCharset().'?Q?=8F?=', $header->toString());
@@ -169,7 +169,7 @@ public function testFWSPIsUsedWhenEncoderReturnsMultipleLines()
         // Note that multi-line headers begin with LWSP which makes 75 + 1 = 76
         // Note also that =?utf-8?q??= is 12 chars which makes 75 - 12 = 63
 
-        //* X-Test: is 8 chars
+        // * X-Test: is 8 chars
         $header = new UnstructuredHeader('X-Test', pack('C', 0x8F).'line_one_here'."\r\n".'line_two_here');
         $header->setCharset('iso-8859-1');
         $this->assertEquals('X-Test: =?'.$header->getCharset().'?Q?=8Fline=5Fone=5Fhere?='."\r\n".' =?'.$header->getCharset().'?Q?line=5Ftwo=5Fhere?=', $header->toString());