Request::getFile() accepts array of keys and returns FileUpload|null …

…(BC break) WIP
nette · Aug 2, 2020 · 0c8dfce · 0c8dfce
1 parent cbe302b
commit 0c8dfce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -131,11 +131,15 @@ public function getPost(string $key = null)
 
 	/**
 	 * Returns uploaded file.
-	 * @return FileUpload|array|null
+	 * @param  string|string[]  $key
+	 * @return ?FileUpload
 	 */
-	public function getFile(string $key)
+	public function getFile($key)
 	{
-		return $this->files[$key] ?? null;
+		$res = Nette\Utils\Arrays::get($this->files, $key, null);
+		return $res instanceof FileUpload
+			? $res
+			: null;
 	}
 
 

diff --git a/tests/Http/Request.files.phpt b/tests/Http/Request.files.phpt
@@ -111,4 +111,4 @@ Assert::false(isset($request->files['file0']));
 Assert::true(isset($request->files['file1']));
 
 Assert::null($request->getFile('empty1'));
-Assert::same([null], $request->getFile('empty2'));
+Assert::null($request->getFile('empty2'));