Merge branch '2.3' into 2.6

* 2.3:
  [Form] NativeRequestHandler file handling fix
  [HttpKernel] Throw double-bounce exceptions
  minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
  [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect

Author: nicolas-grekas

src/Symfony/Component/Config/Resource/FileResource.php

@@ -60,7 +60,7 @@ public function isFresh($timestamp)
             return false;
         }
 
-        return filemtime($this->resource) < $timestamp;
+        return filemtime($this->resource) <= $timestamp;
     }
 
     public function serialize()

src/Symfony/Component/Config/Tests/ConfigCacheTest.php

@@ -128,7 +128,7 @@ private function makeCacheFresh()
 
     private function makeCacheStale()
     {
-        touch($this->cacheFile, time() - 3600);
+        touch($this->cacheFile, filemtime($this->resourceFile) - 3600);
     }
 
     private function generateMetaFile()

src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php

@@ -17,11 +17,13 @@ class FileResourceTest extends \PHPUnit_Framework_TestCase
 {
     protected $resource;
     protected $file;
+    protected $time;
 
     protected function setUp()
     {
         $this->file = realpath(sys_get_temp_dir()).'/tmp.xml';
-        touch($this->file);
+        $this->time = time();
+        touch($this->file, $this->time);
         $this->resource = new FileResource($this->file);
     }
 
@@ -42,11 +44,12 @@ public function testToString()
 
     public function testIsFresh()
     {
-        $this->assertTrue($this->resource->isFresh(time() + 10), '->isFresh() returns true if the resource has not changed');
-        $this->assertFalse($this->resource->isFresh(time() - 86400), '->isFresh() returns false if the resource has been updated');
+        $this->assertTrue($this->resource->isFresh($this->time), '->isFresh() returns true if the resource has not changed in same second');
+        $this->assertTrue($this->resource->isFresh($this->time + 10), '->isFresh() returns true if the resource has not changed');
+        $this->assertFalse($this->resource->isFresh($this->time - 86400), '->isFresh() returns false if the resource has been updated');
 
         $resource = new FileResource('/____foo/foobar'.rand(1, 999999));
-        $this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if the resource does not exist');
+        $this->assertFalse($resource->isFresh($this->time), '->isFresh() returns false if the resource does not exist');
     }
 
     public function testSerializeUnserialize()

src/Symfony/Component/Form/NativeRequestHandler.php

@@ -98,8 +98,8 @@ public function handleRequest(FormInterface $form, $request = null)
             }
 
             $fixedFiles = array();
-            foreach ($_FILES as $name => $file) {
-                $fixedFiles[$name] = self::stripEmptyFiles(self::fixPhpFilesArray($file));
+            foreach ($_FILES as $fileKey => $file) {
+                $fixedFiles[$fileKey] = self::stripEmptyFiles(self::fixPhpFilesArray($file));
             }
 
             if ('' === $name) {

src/Symfony/Component/Form/Tests/AbstractRequestHandlerTest.php

@@ -266,6 +266,50 @@ public function testSubmitFileIfNoParam($method)
         $this->requestHandler->handleRequest($form, $this->request);
     }
 
+    /**
+     * @dataProvider methodExceptGetProvider
+     */
+    public function testSubmitMultipleFiles($method)
+    {
+        $form = $this->getMockForm('param1', $method);
+        $file = $this->getMockFile();
+
+        $this->setRequestData($method, array(
+            'param1' => null,
+        ), array(
+            'param2' => $this->getMockFile('2'),
+            'param1' => $file,
+            'param3' => $this->getMockFile('3'),
+        ));
+
+        $form->expects($this->once())
+             ->method('submit')
+             ->with($file, 'PATCH' !== $method);
+
+        $this->requestHandler->handleRequest($form, $this->request);
+    }
+
+    /**
+     * @dataProvider methodExceptGetProvider
+     */
+    public function testSubmitFileWithNamelessForm($method)
+    {
+        $form = $this->getMockForm(null, $method);
+        $file = $this->getMockFile();
+
+        $this->setRequestData($method, array(
+            '' => null,
+        ), array(
+            '' => $file,
+        ));
+
+        $form->expects($this->once())
+             ->method('submit')
+             ->with($file, 'PATCH' !== $method);
+
+        $this->requestHandler->handleRequest($form, $this->request);
+    }
+
     /**
      * @dataProvider getPostMaxSizeFixtures
      */
@@ -314,7 +358,7 @@ abstract protected function setRequestData($method, $data, $files = array());
 
     abstract protected function getRequestHandler();
 
-    abstract protected function getMockFile();
+    abstract protected function getMockFile($suffix = '');
 
     protected function getMockForm($name, $method = null, $compound = true)
     {

src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php

@@ -46,8 +46,8 @@ protected function getRequestHandler()
         return new HttpFoundationRequestHandler($this->serverParams);
     }
 
-    protected function getMockFile()
+    protected function getMockFile($suffix = '')
     {
-        return new UploadedFile(__DIR__.'/../../Fixtures/foo', 'foo');
+        return new UploadedFile(__DIR__.'/../../Fixtures/foo'.$suffix, 'foo'.$suffix);
     }
 }

src/Symfony/Component/Form/Tests/Fixtures/foo2

@@ -206,12 +206,12 @@ protected function getRequestHandler()
         return new NativeRequestHandler($this->serverParams);
     }
 
-    protected function getMockFile()
+    protected function getMockFile($suffix = '')
     {
         return array(
-            'name' => 'upload.txt',
+            'name' => 'upload'.$suffix.'.txt',
             'type' => 'text/plain',
-            'tmp_name' => 'owfdskjasdfsa',
+            'tmp_name' => 'owfdskjasdfsa'.$suffix,
             'error' => UPLOAD_ERR_OK,
             'size' => 100,
         );

src/Symfony/Component/Form/Tests/Fixtures/foo3

@@ -195,12 +195,13 @@ public function prepare(Request $request)
             $path = $this->file->getRealPath();
             if (strtolower($type) == 'x-accel-redirect') {
                 // Do X-Accel-Mapping substitutions.
+                // @link http://wiki.nginx.org/X-accel#X-Accel-Redirect
                 foreach (explode(',', $request->headers->get('X-Accel-Mapping', '')) as $mapping) {
                     $mapping = explode('=', $mapping, 2);
 
                     if (2 == count($mapping)) {
-                        $location = trim($mapping[0]);
-                        $pathPrefix = trim($mapping[1]);
+                        $pathPrefix = trim($mapping[0]);
+                        $location = trim($mapping[1]);
 
                         if (substr($path, 0, strlen($pathPrefix)) == $pathPrefix) {
                             $path = $location.substr($path, strlen($pathPrefix));