Merge pull request #6256 from eduard44/master

[5.0] Fix Broken File Upload When Submitting A Form Without Selecting A File
laravel · Nov 20, 2014 · 604ad07 · 604ad07
2 parents cda27de + 20c508f
commit 604ad07
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -607,6 +607,16 @@ public static function createFromBase(SymfonyRequest $request)
 		);
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
+	public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
+	{
+		$files = array_filter((array) $files);
+
+		return parent::duplicate($query, $request, $attributes, $cookies, $files, $server);
+	}
+
 	/**
 	 * Get the session associated with the request.
 	 *

diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use Mockery as m;
+use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 use Illuminate\Http\Request;
 
 class HttpRequestTest extends PHPUnit_Framework_TestCase {
@@ -349,6 +350,24 @@ public function testAllInputWithNumericKeysReturnsInputAfterReplace()
 	}
 
 
+	public function testInputWithEmptyFilename()
+	{
+		$invalidFiles = [
+			'file' => [
+				'name' => null,
+				'type' => null,
+				'tmp_name' => null,
+				'error' => 4,
+				'size' => 0
+			]
+		];
+
+		$baseRequest = SymfonyRequest::create('/?boom=breeze', 'GET', array('foo' => array('bar' => 'baz')), array(), $invalidFiles);
+
+		$request = Request::createFromBase($baseRequest);
+	}
+
+
 	public function testOldMethodCallsSession()
 	{
 		$request = Request::create('/', 'GET');