Fixes php-http#226 TypeError thrown by requests with nested files

Author: mfb

src/Psr17Factory.php

@@ -266,17 +266,57 @@ private function normalizeFiles(array $files): array
                 continue;
             } elseif (!isset($value['tmp_name'])) {
                 $normalized[$key] = $this->normalizeFiles($value);
-            } elseif (\is_array($value['tmp_name'])) {
-                foreach ($value['tmp_name'] as $k => $v) {
-                    $file = $this->createStreamFromFile($value['tmp_name'][$k], 'r');
-                    $normalized[$key][$k] = $this->createUploadedFile($file, $value['size'][$k], $value['error'][$k], $value['name'][$k], $value['type'][$k]);
-                }
             } else {
-                $file = $this->createStreamFromFile($value['tmp_name'], 'r');
-                $normalized[$key] = $this->createUploadedFile($file, $value['size'], $value['error'], $value['name'], $value['type']);
+                $normalized[$key] = $this->createUploadedFileFromSpec($value);
             }
         }
 
         return $normalized;
     }
+
+    /**
+     * Create and return an UploadedFile instance from a $_FILES specification.
+     *
+     * If the specification represents an array of values, this method will
+     * delegate to normalizeNestedFileSpec() and return that return value.
+     *
+     * @param array $value $_FILES struct
+     *
+     * @return UploadedFileInterface|UploadedFileInterface[]
+     */
+    private function createUploadedFileFromSpec(array $value)
+    {
+        if (is_array($value['tmp_name'])) {
+            return $this->normalizeNestedFileSpec($value);
+        }
+
+        $file = $this->createStreamFromFile($value['tmp_name'], 'r');
+        return $this->createUploadedFile($file, $value['size'], $value['error'], $value['name'], $value['type']);
+    }
+
+    /**
+     * Normalize an array of file specifications.
+     *
+     * Loops through all nested files and returns a normalized array of
+     * UploadedFileInterface instances.
+     *
+     * @return UploadedFileInterface[]
+     */
+    private function normalizeNestedFileSpec(array $files = []): array
+    {
+        $normalizedFiles = [];
+
+        foreach (array_keys($files['tmp_name']) as $key) {
+            $spec = [
+                'tmp_name' => $files['tmp_name'][$key],
+                'size'     => $files['size'][$key] ?? null,
+                'error'    => $files['error'][$key] ?? null,
+                'name'     => $files['name'][$key] ?? null,
+                'type'     => $files['type'][$key] ?? null,
+            ];
+            $normalizedFiles[$key] = $this->createUploadedFileFromSpec($spec);
+        }
+
+        return $normalizedFiles;
+    }
 }

tests/Psr17FactoryTest.php

@@ -285,7 +285,14 @@ public function testFromGlobals()
                 'tmp_name' => 'php://memory',
                 'error' => UPLOAD_ERR_OK,
                 'size' => 123,
-            ]
+            ],
+            'files' => [
+                'name' => ['file_0' => [0 => 'NestedFile.txt']],
+                'type' => ['file_0' => [0 => 'text/plain']],
+                'tmp_name' => ['file_0' => [0 => 'php://memory']],
+                'error' => ['file_0' => [0 => UPLOAD_ERR_OK]],
+                'size' => ['file_0' => [0 => 123]],
+            ],
         ];
 
         $factory = new Psr17Factory();
@@ -318,6 +325,17 @@ public function testFromGlobals()
                 'MyFile.txt',
                 'text/plain'
             ),
+            'files' => [
+                'file_0' => [
+                    0 => $factory->createUploadedFile(
+                        $server->getUploadedFiles()['files']['file_0'][0]->getStream(),
+                        123,
+                        UPLOAD_ERR_OK,
+                        'NestedFile.txt',
+                        'text/plain'
+                    ),
+                ],
+            ],
         ];
 
         self::assertEquals($expectedFiles, $server->getUploadedFiles());