Skip to content

Commit 7a40de9

Browse files
committed
Request::getFile() accepts array of keys and returns FileUpload|null (BC break) WIP
1 parent e52907a commit 7a40de9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/Http/Request.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,15 @@ public function getPost(string $key = null)
134134

135135
/**
136136
* Returns uploaded file.
137-
* @return FileUpload|array|null
137+
* @param string|string[] $key
138+
* @return ?FileUpload
138139
*/
139-
public function getFile(string $key)
140+
public function getFile($key)
140141
{
141-
return $this->files[$key] ?? null;
142+
$res = Nette\Utils\Arrays::get($this->files, $key, null);
143+
return $res instanceof FileUpload
144+
? $res
145+
: null;
142146
}
143147

144148

tests/Http/Request.files.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@ Assert::false(isset($request->files['file0']));
111111
Assert::true(isset($request->files['file1']));
112112

113113
Assert::null($request->getFile('empty1'));
114-
Assert::same([null], $request->getFile('empty2'));
114+
Assert::null($request->getFile('empty2'));

0 commit comments

Comments
 (0)