Fix post data that interleaves with FILES not being handled.

Refs #3997

src/Network/Request.php

@@ -405,7 +405,8 @@ class Request implements \ArrayAccess {
 				if (isset($data['tmp_name']) && is_string($data['tmp_name'])) {
 					$post[$key] = $data;
 				} else {
-					$post[$key] = $this->_processFileData([], $data);
+					$keyData = isset($post[$key]) ? $post[$key] : [];
+					$post[$key] = $this->_processFileData($keyData, $data);
 				}
 			}
 		}

tests/TestCase/Network/RequestTest.php

@@ -297,7 +297,15 @@ class RequestTest extends TestCase {
 				],
 			]
 		];
-		$request = new Request(compact('files'));
+		$post = [
+			'pictures' => [
+				0 => ['name' => 'A cat']
+			],
+			0 => [
+				'name' => 'A dog'
+			]
+		];
+		$request = new Request(compact('files', 'post'));
 		$expected = [
 			'image_main' => [
 				'file' => [
@@ -310,6 +318,7 @@ class RequestTest extends TestCase {
 			],
 			'pictures' => [
 				0 => [
+					'name' => 'A cat',
 					'file' => [
 						'name' => 'a-file.png',
 						'type' => 'image/png',
@@ -320,6 +329,7 @@ class RequestTest extends TestCase {
 				]
 			],
 			0 => [
+				'name' => 'A dog',
 				'image' => [
 					'name' => 'scratch.text',
 					'type' => 'text/plain',