Merge pull request #13690 from littleylv/master

Remove unnecessary quotes and \r\n in FormData format

src/Http/Client/FormData.php

@@ -230,7 +230,7 @@ class FormData implements Countable
             return 'application/x-www-form-urlencoded';
         }
 
-        return 'multipart/form-data; boundary="' . $this->boundary() . '"';
+        return 'multipart/form-data; boundary=' . $this->boundary();
     }
 
     /**
@@ -249,7 +249,7 @@ class FormData implements Countable
                 $out .= (string)$part;
                 $out .= "\r\n";
             }
-            $out .= "--$boundary--\r\n\r\n";
+            $out .= "--$boundary--\r\n";
 
             return $out;
         }

tests/TestCase/Http/Client/FormDataTest.php

@@ -116,7 +116,6 @@ class FormDataTest extends TestCase
             'value',
             '--' . $boundary . '--',
             '',
-            '',
         ];
         $this->assertEquals(implode("\r\n", $expected), (string)$data);
     }
@@ -163,7 +162,6 @@ class FormDataTest extends TestCase
             $contents,
             '--' . $boundary . '--',
             '',
-            ''
         ];
         $this->assertEquals(implode("\r\n", $expected), $result);
     }
@@ -194,7 +192,6 @@ class FormDataTest extends TestCase
             $contents,
             '--' . $boundary . '--',
             '',
-            ''
         ];
         $this->assertEquals(implode("\r\n", $expected), $result);
     }
@@ -217,7 +214,7 @@ class FormDataTest extends TestCase
         $data->addFile('upload', fopen($file, 'r'));
         $boundary = $data->boundary();
         $result = $data->contentType();
-        $expected = 'multipart/form-data; boundary="' . $boundary . '"';
+        $expected = 'multipart/form-data; boundary=' . $boundary;
         $this->assertEquals($expected, $result);
     }
 }