diff --git a/src/Symfony/Component/HttpFoundation/FileBag.php b/src/Symfony/Component/HttpFoundation/FileBag.php index 4cd4d02dcf3d..3b9c578d796a 100644 --- a/src/Symfony/Component/HttpFoundation/FileBag.php +++ b/src/Symfony/Component/HttpFoundation/FileBag.php @@ -133,7 +133,8 @@ protected function fixPhpFilesArray($data) foreach (array_keys($data['name']) as $key) { $files[$key] = $this->fixPhpFilesArray(array( 'error' => $data['error'][$key], - 'name' => $data['name'][$key], 'type' => $data['type'][$key], + 'name' => $data['name'][$key], + 'type' => $data['type'][$key], 'tmp_name' => $data['tmp_name'][$key], 'size' => $data['size'][$key] )); diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index 2cae8b17f9a8..3c9c3ed5eadc 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -12,7 +12,6 @@ namespace Symfony\Component\HttpFoundation; use Symfony\Component\HttpFoundation\SessionStorage\NativeSessionStorage; -use Symfony\Component\HttpFoundation\File\UploadedFile; /** * Request represents an HTTP request. diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/FormTypeTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/FormTypeTest.php index a1aab6693bce..60e33b94c1e3 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/Type/FormTypeTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/Type/FormTypeTest.php @@ -23,7 +23,6 @@ use Symfony\Component\Form\Util\PropertyPath; use Symfony\Component\Form\CallbackTransformer; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\Validator\ConstraintViolation; use Symfony\Component\Validator\ConstraintViolationList; use Symfony\Component\Validator\ExecutionView; diff --git a/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php b/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php index 30f51c003355..88a01bb3ed32 100644 --- a/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php +++ b/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php @@ -12,7 +12,6 @@ namespace Symfony\Tests\Component\HttpFoundation; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\File\UploadedFile; class RequestTest extends \PHPUnit_Framework_TestCase {