Skip to content

Commit 0c8dfce

Browse files
committed
Request::getFile() accepts array of keys and returns FileUpload|null (BC break) WIP
1 parent cbe302b commit 0c8dfce

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
@@ -131,11 +131,15 @@ public function getPost(string $key = null)
131131

132132
/**
133133
* Returns uploaded file.
134-
* @return FileUpload|array|null
134+
* @param string|string[] $key
135+
* @return ?FileUpload
135136
*/
136-
public function getFile(string $key)
137+
public function getFile($key)
137138
{
138-
return $this->files[$key] ?? null;
139+
$res = Nette\Utils\Arrays::get($this->files, $key, null);
140+
return $res instanceof FileUpload
141+
? $res
142+
: null;
139143
}
140144

141145

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)