Merge pull request #6 from ftassi/multipart-post-data

Incomplete body for multipart request

Author: igorw

src/Igorw/CgiHttpKernel/CgiHttpKernel.php

@@ -37,7 +37,8 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
         if (count($request->files)) {
             $boundary = $this->getMimeBoundary();
             $request->headers->set('Content-Type', 'multipart/form-data; boundary='.$boundary);
-            $requestBody = $this->encodeMultipartFiles($boundary, $request->files);
+            $requestBody = $this->buildMultipartParameters($boundary, $request->request);
+            $requestBody .= $this->encodeMultipartFiles($boundary, $request->files);
         }
 
         $builder = ProcessBuilder::create()
@@ -189,6 +190,21 @@ private function getUrlEncodedParameterBag(ParameterBag $bag)
         return http_build_query($bag->all());
     }
 
+    private function buildMultipartParameters($boundary, ParameterBag $parameters)
+    {
+        $mimeBoundary = '--'.$boundary."\r\n";
+
+        $data = '';
+        foreach ($parameters->all() as $name => $parameter) {
+            $data .= $mimeBoundary;
+            $data .= $this->buildMultipartParameter($name, $parameter);
+            $data .= $mimeBoundary;
+        }
+        $data .= "\r\n";
+
+        return $data;
+    }
+
     private function encodeMultipartFiles($boundary, FileBag $files)
     {
         $mimeBoundary = '--'.$boundary."\r\n";
@@ -222,6 +238,17 @@ private function encodeMultipartFile($name, UploadedFile $file)
         return $data;
     }
 
+    private function buildMultipartParameter($fieldName, $fieldValue)
+    {
+        $eol = "\r\n";
+
+        $data = '';
+        $data .= sprintf('Content-Disposition: form-data; name="%s"',$fieldName);
+        $data .= $eol . $eol . $fieldValue . $eol;
+
+        return $data;
+    }
+
     private function getMimeBoundary()
     {
         return md5('cgi-http-kernel');

tests/functional/CgiHttpKernelTest.php

@@ -219,11 +219,12 @@ public function uploadShouldPutFileInFiles()
     {
         $file = new UploadedFile(__DIR__.'/Fixtures/sadkitten.gif', 'sadkitten.gif', 'image/gif');
 
-        $request = Request::create('/upload.php', 'POST');
+        $request = Request::create('/upload.php', 'POST', array('foo' => 'bar'));
         $request->files->add(array('kitten' => $file));
         $response = $this->kernel->handle($request);
 
         $expected = implode("\n", array(
+            'bar',
             'sadkitten.gif',
             'image/gif',
             '1304444',

tests/functional/Fixtures/upload.php

@@ -1,5 +1,6 @@
 <?php
 
+echo $_POST['foo']."\n";
 echo $_FILES['kitten']['name']."\n";
 echo $_FILES['kitten']['type']."\n";
 echo $_FILES['kitten']['size']."\n";