Simplified tree building for uploaded files

Author: shudd3r

src/ServerData.php

@@ -37,7 +37,7 @@ public function __construct(array $params = [])
         $this->get    = $params['get'] ?? [];
         $this->post   = $params['post'] ?? [];
         $this->cookie = $params['cookie'] ?? [];
-        $this->files  = $params['files'] ?? [];
+        $this->files  = array_map(fn ($value) => $this->resolveFileTree($value), $params['files'] ?? []);
     }
 
     /**
@@ -82,7 +82,7 @@ public function params(): array
             'cookie'     => $this->cookie,
             'query'      => $this->get,
             'parsedBody' => $this->post,
-            'files'      => $this->normalizeFiles($this->files),
+            'files'      => $this->uploadedFiles(),
             'version'    => $this->protocolVersion()
         ];
     }
@@ -92,7 +92,7 @@ public function params(): array
      */
     public function uploadedFiles(): array
     {
-        return $this->normalizeFiles($this->files);
+        return $this->files;
     }
 
     private function protocolVersion(): string
@@ -162,20 +162,10 @@ private function authorizationHeader(): ?string
         return $headers['Authorization'] ?? $headers['authorization'] ?? null;
     }
 
-    private function normalizeFiles(array $files): array
-    {
-        $normalizedFiles = [];
-        foreach ($files as $key => $value) {
-            $normalizedFiles[$key] = ($value instanceof UploadedFileInterface)
-                ? $value
-                : $this->resolveFileTree($value);
-        }
-
-        return $normalizedFiles;
-    }
-
     private function resolveFileTree($value)
     {
+        if ($value instanceof UploadedFileInterface) { return $value; }
+
         if (!is_array($value)) {
             throw new InvalidArgumentException('Invalid file data structure');
         }

tests/ServerDataTest.php

@@ -178,9 +178,8 @@ public function testMixedStructureUploadedFiles()
 
     public function testInvalidFileDataStructure_ThrowsException()
     {
-        $server = $this->serverData(['files' => ['field' => 'filename.txt']]);
         $this->expectException(InvalidArgumentException::class);
-        $server->params();
+        $this->serverData(['files' => ['field' => 'filename.txt']]);
     }
 
     private function serverData(array $data = []): ServerData