Merge branch 'hotfix/6423'

Close zendframework/zendframework#6423
zendframework · Aug 11, 2014 · 9f6a11a · 9f6a11a
commit 9f6a11a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/File/UploadFile.php b/src/File/UploadFile.php
@@ -72,14 +72,11 @@ public function isValid($value)
         }
         $this->setValue($filename);
 
-        if (empty($file) || false === stream_resolve_include_path($file)) {
-            $this->error(self::FILE_NOT_FOUND);
-            return false;
-        }
-
         switch ($error) {
             case UPLOAD_ERR_OK:
-                if (!is_uploaded_file($file)) {
+                if (empty($file) || false === stream_resolve_include_path($file)) {
+                    $this->error(self::FILE_NOT_FOUND);
+                } elseif (! is_uploaded_file($file)) {
                     $this->error(self::ATTACK);
                 }
                 break;

diff --git a/test/File/UploadFileTest.php b/test/File/UploadFileTest.php
@@ -90,6 +90,11 @@ public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
 
         $this->assertFalse($validator->isValid(''));
         $this->assertArrayHasKey(File\UploadFile::FILE_NOT_FOUND, $validator->getMessages());
+    }
+
+    public function testUploadErrorCodeShouldPrecedeEmptyFileCheck()
+    {
+        $validator = new File\UploadFile();
 
         $filesArray = array(
             'name'      => '',
@@ -100,6 +105,7 @@ public function testEmptyFileShouldReturnFalseAndDisplayNotFoundMessage()
         );
 
         $this->assertFalse($validator->isValid($filesArray));
-        $this->assertArrayHasKey(File\UploadFile::FILE_NOT_FOUND, $validator->getMessages());
+        $this->assertArrayHasKey(File\UploadFile::NO_FILE, $validator->getMessages());
+        $this->assertArrayNotHasKey(File\UploadFile::FILE_NOT_FOUND, $validator->getMessages());
     }
 }