Merge branch '2.4'

* 2.4:
  Fixed the XPath filtering to have the same behavior than Symfony 2.4
  [DomCrawler] Fixed filterXPath() chaining
  [DomCrawler] Added more tests for the XPath filtering
  [PropertyAccess] Fixed inverted logic
  [HttpKernel] fixed file uploads in functional tests when no file was selected
  [PropertyAccess] fixed CS
  Fixed test cases failing when the Intl extension is not installed
  Fixed the Travis build to avoid exiting too early
  [PropertyAccess] Fixed getValue() when accessing non-existing indices of ArrayAccess implementations
  [PropertyAccess] Refactored PropertyAccessorCollectionTest
  [PropertyAccess] Refactored PropertyAccessorTest

Author: fabpot

Client.php

@@ -143,7 +143,9 @@ protected function filterRequest(DomRequest $request)
     {
         $httpRequest = Request::create($request->getUri(), $request->getMethod(), $request->getParameters(), $request->getCookies(), $request->getFiles(), $request->getServer(), $request->getContent());
 
-        $httpRequest->files->replace($this->filterFiles($httpRequest->files->all()));
+        foreach ($this->filterFiles($httpRequest->files->all()) as $key => $value) {
+            $httpRequest->files->set($key, $value);
+        }
 
         return $httpRequest;
     }
@@ -189,8 +191,6 @@ protected function filterFiles(array $files)
                         true
                     );
                 }
-            } else {
-                $filtered[$key] = $value;
             }
         }
 

Tests/ClientTest.php

@@ -128,6 +128,21 @@ public function testUploadedFile()
         unlink($target);
     }
 
+    public function testUploadedFileWhenNoFileSelected()
+    {
+        $kernel = new TestHttpKernel();
+        $client = new Client($kernel);
+
+        $file = array('tmp_name' => '', 'name' => '', 'type' => '', 'size' => 0, 'error' => UPLOAD_ERR_NO_FILE);
+
+        $client->request('POST', '/', array(), array('foo' => $file));
+
+        $files = $client->getRequest()->files->all();
+
+        $this->assertCount(1, $files);
+        $this->assertNull($files['foo']);
+    }
+
     public function testUploadedFileWhenSizeExceedsUploadMaxFileSize()
     {
         $source = tempnam(sys_get_temp_dir(), 'source');