Upload fields left blank on submission do not count towards max uploads

Author: clue

README.md

@@ -800,7 +800,8 @@ By default, this middleware respects the
 [`max_file_uploads`](http://php.net/manual/en/ini.core.php#ini.max-file-uploads)
 (default `20`) ini setting.
 If you upload more files in a single request, additional files will be ignored
-and the `getUploadedFiles()` method returns a truncated array. 
+and the `getUploadedFiles()` method returns a truncated array.
+Note that upload fields left blank on submission do not count towards this limit.
 You can control the maximum number of file uploads per request by explicitly
 passing the second parameter to the constructor like this:
 

src/Io/MultipartParser.php

@@ -172,11 +172,6 @@ private function parseFile($name, $filename, $contentType, $contents)
 
     private function parseUploadedFile($filename, $contentType, $contents)
     {
-        // ignore excessive number of file uploads
-        if (++$this->filesCount > $this->maxFileUploads) {
-            return;
-        }
-
         $size = strlen($contents);
 
         // no file selected (zero size and empty filename)
@@ -190,6 +185,11 @@ private function parseUploadedFile($filename, $contentType, $contents)
             );
         }
 
+        // ignore excessive number of file uploads
+        if (++$this->filesCount > $this->maxFileUploads) {
+            return;
+        }
+
         // file exceeds "upload_max_filesize" ini setting
         if ($size > $this->uploadMaxFilesize) {
             return new UploadedFile(

tests/Io/MultipartParserTest.php

@@ -790,6 +790,54 @@ public function testUploadTooManyFilesReturnsTruncatedList()
         $this->assertSame('hello', (string)$file->getStream());
     }
 
+    public function testUploadTooManyFilesIgnoresEmptyFilesAndIncludesThemDespiteTruncatedList()
+    {
+        $boundary = "---------------------------12758086162038677464950549563";
+
+        $data  = "--$boundary\r\n";
+        $data .= "Content-Disposition: form-data; name=\"first\"; filename=\"first\"\r\n";
+        $data .= "Content-type: text/plain\r\n";
+        $data .= "\r\n";
+        $data .= "hello\r\n";
+        $data .= "--$boundary\r\n";
+        $data .= "Content-Disposition: form-data; name=\"empty\"; filename=\"\"\r\n";
+        $data .= "Content-type: text/plain\r\n";
+        $data .= "\r\n";
+        $data .= "\r\n";
+        $data .= "--$boundary\r\n";
+        $data .= "Content-Disposition: form-data; name=\"second\"; filename=\"second\"\r\n";
+        $data .= "Content-type: text/plain\r\n";
+        $data .= "\r\n";
+        $data .= "world\r\n";
+        $data .= "--$boundary--\r\n";
+
+        $request = new ServerRequest('POST', 'http://example.com/', array(
+            'Content-Type' => 'multipart/form-data; boundary=' . $boundary,
+        ), $data, 1.1);
+
+        $parser = new MultipartParser(100, 1);
+        $parsedRequest = $parser->parse($request);
+
+        $files = $parsedRequest->getUploadedFiles();
+
+        $this->assertCount(2, $files);
+        $this->assertTrue(isset($files['first']));
+        $this->assertTrue(isset($files['empty']));
+
+        $file = $files['first'];
+        $this->assertSame('first', $file->getClientFilename());
+        $this->assertSame('text/plain', $file->getClientMediaType());
+        $this->assertSame(5, $file->getSize());
+        $this->assertSame(UPLOAD_ERR_OK, $file->getError());
+        $this->assertSame('hello', (string)$file->getStream());
+
+        $file = $files['empty'];
+        $this->assertSame('', $file->getClientFilename());
+        $this->assertSame('text/plain', $file->getClientMediaType());
+        $this->assertSame(0, $file->getSize());
+        $this->assertSame(UPLOAD_ERR_NO_FILE, $file->getError());
+    }
+
     public function testPostMaxFileSize()
     {
         $boundary = "---------------------------12758086162038677464950549563";