Fixed the regex

Author: Nyholm

src/Http/Request.php

@@ -282,21 +282,23 @@ private function addFile(array &$files, string $fieldName, string $filename, str
             'size' => filesize($tmpPath),
         ];
 
-        if (!preg_match('|([^\[]+)(?:\[([^\]]+)\])*(\[\])?|', $fieldName, $matches)) {
+        $matches = preg_split('|(\[[^\]]*\])|', $fieldName, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        $count = count($matches);
+        if (1 === $count) {
             $files[$fieldName] = $data;
         } else {
             $current = &$files;
-            $count = count($matches);
-            for ($i = 1; $i < $count; $i++) {
-                if (empty($matches[$i])) {
+            foreach ($matches as $i => $match) {
+                if ($match === '[]') {
+                    $current[] = $data;
                     continue;
                 }
-                if ($matches[$i] === '[]') {
-                    $current[] = $data;
-                } elseif ($i === $count -1) {
-                    $current[$matches[$i]] = $data;
+
+                $trimmedMatch = trim($match, '[]');
+                if ($i === $count -1) {
+                    $current[$trimmedMatch] = $data;
                 } else {
-                    $current = &$current[$matches[$i]];
+                    $current = &$current[$trimmedMatch];
                 }
             }
         }

test/Http/RequestTest.php

@@ -192,15 +192,16 @@ public function testMultipartContentWithMultipleFiles()
 ???
 IHDR??? ??? ?????? ???? IDATx
c???51?)?:??????IEND?B`?
 --578de3b0e3c46.2334ba3
-Content-Disposition: form-data; name="four[item_a][item_b[]"; filename="foo.png"
+Content-Disposition: form-data; name="four[item_a][item_b][]"; filename="foo.png"
 Content-Length: 71
 Content-Type: image/png
 
 ?PNG
 
 ???
 IHDR??? ??? ?????? ???? IDATx
c???51?)?:??????IEND?B`?
-Content-Disposition: form-data; name="four[item_a][item_b[]"; filename="bar.png"
+--578de3b0e3c46.2334ba3
+Content-Disposition: form-data; name="four[item_a][item_b][]"; filename="bar.png"
 Content-Length: 71
 Content-Type: image/png
 
@@ -246,13 +247,13 @@ public function testMultipartContentWithMultipleFiles()
         $this->assertNotEmpty($files['four']);
         $this->assertNotEmpty($files['four']['item_a']);
         $this->assertNotEmpty($files['four']['item_a']['item_b']);
-        $this->assertCount(2, $files['three']['item_a']['item_b']);
+        $this->assertCount(2, $files['four']['item_a']['item_b']);
 
         // Check the HttpFoundation request
         rewind($stream);
         $httpFoundationRequest = $request->getHttpFoundationRequest();
         $this->assertEquals($expectedPost, $httpFoundationRequest->request->all());
-        $this->assertCount(7,              $httpFoundationRequest->files->all());
+        $this->assertCount(4,              $httpFoundationRequest->files->all());
 
     }
 }