Fixes based on code-review

Danielss89 · Danielss89 · commit e5d62e62720e · 2016-06-03T10:07:27.000+02:00
diff --git a/Factory/DiactorosFactory.php b/Factory/DiactorosFactory.php
@@ -86,7 +86,7 @@ private function getFiles(array $uploadedFiles)
         $files = array();
 
         foreach ($uploadedFiles as $key => $value) {
-            if ($value === null) {
+            if (null === $value) {
                 $files[$key] = new DiactorosUploadedFile(null, 0, UPLOAD_ERR_NO_FILE, null, null);
                 continue;
             }
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
@@ -164,18 +164,13 @@ public function testCreateResponseFromBinaryFile()
 
     public function testUploadErrNoFile()
     {
-        $file = new UploadedFile(null, null, null, 0, UPLOAD_ERR_NO_FILE, true);
-        $this->assertEquals(0,$file->getSize());
-        $this->assertEquals(UPLOAD_ERR_NO_FILE,$file->getError());
-
-        // SplFile returns false on error
-        $this->assertEquals('boolean',gettype(($file->getSize())));
+        $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());
+        $this->assertInternalType('integer', $file->getClientSize());
 
-        // This is an integer, oddly enough internally size is declared as a string
-        $this->assertTrue(is_int($file->getClientSize()));
-
-        $request = new Request(array(),array(),array(),array(),
+        $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),

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ private function getFiles(array $uploadedFiles)`
`86`	`86`	`$files = array();`
`87`	`87`
`88`	`88`	`foreach ($uploadedFiles as $key => $value) {`
`89`		`- if ($value === null) {`
	`89`	`+ if (null === $value) {`
`90`	`90`	`$files[$key] = new DiactorosUploadedFile(null, 0, UPLOAD_ERR_NO_FILE, null, null);`
`91`	`91`	`continue;`
`92`	`92`	`}`