bug #23 Fixes #9 Bridge error when no file is selected (ahundiak, Danielss89)

fabpot · fabpot · commit 7a5aa925c686 · 2016-08-18T07:44:25.000-07:00
This PR was merged into the master branch. Discussion ---------- Fixes #9 Bridge error when no file is selected Q A Bug fix? yes New feature? no BC breaks? no Deprecations? no Tests pass? yes Fixed tickets #9 License MIT Doc PR Commits ------- a1a631a Update assert error message e5d62e6 Fixes based on code-review 101b608 Handles null file in createrequest bridge.
diff --git a/Factory/DiactorosFactory.php b/Factory/DiactorosFactory.php
@@ -86,6 +86,10 @@ private function getFiles(array $uploadedFiles)
         $files = array();
 
         foreach ($uploadedFiles as $key => $value) {
+            if (null === $value) {
+                $files[$key] = new DiactorosUploadedFile(null, 0, UPLOAD_ERR_NO_FILE, null, null);
+                continue;
+            }
             if ($value instanceof UploadedFile) {
                 $files[$key] = $this->createUploadedFile($value);
             } else {
@@ -107,7 +111,7 @@ private function createUploadedFile(UploadedFile $symfonyUploadedFile)
     {
         return new DiactorosUploadedFile(
             $symfonyUploadedFile->getRealPath(),
-            $symfonyUploadedFile->getSize(),
+            $symfonyUploadedFile->getClientSize(),
             $symfonyUploadedFile->getError(),
             $symfonyUploadedFile->getClientOriginalName(),
             $symfonyUploadedFile->getClientMimeType()
diff --git a/Factory/HttpFoundationFactory.php b/Factory/HttpFoundationFactory.php
@@ -80,10 +80,14 @@ private function getFiles(array $uploadedFiles)
      */
     private function createUploadedFile(UploadedFileInterface $psrUploadedFile)
     {
-        $temporaryPath = $this->getTemporaryPath();
-        $psrUploadedFile->moveTo($temporaryPath);
+        $temporaryPath = '';
+        $clientFileName = '';
+        if (UPLOAD_ERR_NO_FILE !== $psrUploadedFile->getError()) {
+            $temporaryPath = $this->getTemporaryPath();
+            $psrUploadedFile->moveTo($temporaryPath);
 
-        $clientFileName = $psrUploadedFile->getClientFilename();
+            $clientFileName = $psrUploadedFile->getClientFilename();
+        }
 
         return new UploadedFile(
             $temporaryPath,
diff --git a/Tests/Factory/DiactorosFactoryTest.php b/Tests/Factory/DiactorosFactoryTest.php
@@ -172,4 +172,33 @@ public function testCreateResponseFromBinaryFile()
 
         $this->assertEquals('Binary', $psrResponse->getBody()->__toString());
     }
+
+    public function testUploadErrNoFile()
+    {
+        $file = new UploadedFile('', '', null, 0, UPLOAD_ERR_NO_FILE, true);
+        $this->assertEquals(0, $file->getSize());
+        $this->assertEquals(UPLOAD_ERR_NO_FILE, $file->getError());
+        $this->assertFalse($file->getSize(), 'SplFile::getSize() returns false on error');
+        $this->assertInternalType('integer', $file->getClientSize());
+
+        $request = new Request(array(), array(), array(), array(),
+          array(
+            'f1' => $file,
+            'f2' => array('name' => null, 'type' => null, 'tmp_name' => null, 'error' => UPLOAD_ERR_NO_FILE, 'size' => 0),
+          ),
+          array(
+            'REQUEST_METHOD' => 'POST',
+            'HTTP_HOST' => 'dunglas.fr',
+            'HTTP_X_SYMFONY' => '2.8',
+          ),
+          'Content'
+        );
+
+        $psrRequest = $this->factory->createRequest($request);
+
+        $uploadedFiles = $psrRequest->getUploadedFiles();
+
+        $this->assertEquals(UPLOAD_ERR_NO_FILE, $uploadedFiles['f1']->getError());
+        $this->assertEquals(UPLOAD_ERR_NO_FILE, $uploadedFiles['f2']->getError());
+    }
 }
