From 8312261cf23a7fcdebef3161aa7d7fd5bffd8a80 Mon Sep 17 00:00:00 2001
From: Jan Tvrdik <jan.tvrdik@gmail.com>
Date: Sun, 7 Dec 2014 21:45:58 +0100
Subject: [PATCH] Request: calling getFile() with multiple keys is deprecated
 (BC break)

---
 src/Http/IRequest.php         | 2 +-
 src/Http/Request.php          | 9 +++++++--
 tests/Http/Request.files.phpt | 2 --
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Http/IRequest.php b/src/Http/IRequest.php
index 338f4e90..8398e0d0 100644
--- a/src/Http/IRequest.php
+++ b/src/Http/IRequest.php
@@ -53,7 +53,7 @@ function getPost($key = NULL, $default = NULL);
 
 	/**
 	 * Returns uploaded file.
-	 * @param  string key (or more keys)
+	 * @param  string key
 	 * @return FileUpload|NULL
 	 */
 	function getFile($key);
diff --git a/src/Http/Request.php b/src/Http/Request.php
index d40eab72..03c340b1 100644
--- a/src/Http/Request.php
+++ b/src/Http/Request.php
@@ -139,12 +139,17 @@ public function getPost($key = NULL, $default = NULL)
 
 	/**
 	 * Returns uploaded file.
-	 * @param  string key (or more keys)
+	 * @param  string key
 	 * @return FileUpload|NULL
 	 */
 	public function getFile($key)
 	{
-		return Nette\Utils\Arrays::get($this->files, func_get_args(), NULL);
+		if (func_num_args() > 1) {
+			trigger_error('Calling getFile() with multiple keys is deprecated.', E_USER_DEPRECATED);
+			return Nette\Utils\Arrays::get($this->files, func_get_args(), NULL);
+		}
+
+		return isset($this->files[$key]) ? $this->files[$key] : NULL;
 	}
 
 
diff --git a/tests/Http/Request.files.phpt b/tests/Http/Request.files.phpt
index 96f3edc5..8f8b3d2d 100644
--- a/tests/Http/Request.files.phpt
+++ b/tests/Http/Request.files.phpt
@@ -108,7 +108,5 @@ Assert::type( 'Nette\Http\FileUpload', $request->files['file3'][1] );
 Assert::false( isset($request->files['file0']) );
 Assert::true( isset($request->files['file1']) );
 
-Assert::null( $request->getFile('file1', 'a') );
-
 Assert::null( $request->getFile('empty1') );
 Assert::same( array(NULL), $request->getFile('empty2') );