@@ -37,7 +37,7 @@ public function __construct(array $params = [])
37
37
$ this ->get = $ params ['get ' ] ?? [];
38
38
$ this ->post = $ params ['post ' ] ?? [];
39
39
$ this ->cookie = $ params ['cookie ' ] ?? [];
40
- $ this ->files = $ params ['files ' ] ?? [];
40
+ $ this ->files = array_map ( fn ( $ value ) => $ this -> resolveFileTree ( $ value ), $ params ['files ' ] ?? []) ;
41
41
}
42
42
43
43
/**
@@ -82,7 +82,7 @@ public function params(): array
82
82
'cookie ' => $ this ->cookie ,
83
83
'query ' => $ this ->get ,
84
84
'parsedBody ' => $ this ->post ,
85
- 'files ' => $ this ->normalizeFiles ( $ this -> files ),
85
+ 'files ' => $ this ->uploadedFiles ( ),
86
86
'version ' => $ this ->protocolVersion ()
87
87
];
88
88
}
@@ -92,7 +92,7 @@ public function params(): array
92
92
*/
93
93
public function uploadedFiles (): array
94
94
{
95
- return $ this ->normalizeFiles ( $ this -> files ) ;
95
+ return $ this ->files ;
96
96
}
97
97
98
98
private function protocolVersion (): string
@@ -162,20 +162,10 @@ private function authorizationHeader(): ?string
162
162
return $ headers ['Authorization ' ] ?? $ headers ['authorization ' ] ?? null ;
163
163
}
164
164
165
- private function normalizeFiles (array $ files ): array
166
- {
167
- $ normalizedFiles = [];
168
- foreach ($ files as $ key => $ value ) {
169
- $ normalizedFiles [$ key ] = ($ value instanceof UploadedFileInterface)
170
- ? $ value
171
- : $ this ->resolveFileTree ($ value );
172
- }
173
-
174
- return $ normalizedFiles ;
175
- }
176
-
177
165
private function resolveFileTree ($ value )
178
166
{
167
+ if ($ value instanceof UploadedFileInterface) { return $ value ; }
168
+
179
169
if (!is_array ($ value )) {
180
170
throw new InvalidArgumentException ('Invalid file data structure ' );
181
171
}
0 commit comments