Merge pull request #21 from JanTvrdik/multiple_keys

Fix Http\Request::getFile() inconsistency
nette · Dec 8, 2014 · 88784b1 · 88784b1
2 parents 57b6dbd + 8312261
commit 88784b1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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') );