Fix bug in RequestTransformer::convertFile().

It threw an exception when no file was uploaded.
cakephp · Jul 12, 2016 · 2d7e239 · 2d7e239
1 parent 2d1505f
commit 2d7e239
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/Http/RequestTransformer.php b/src/Http/RequestTransformer.php
@@ -134,11 +134,17 @@ protected static function convertFiles($data, $files, $path = '')
      */
     protected static function convertFile($file)
     {
+        $error = $file->getError();
+        $tmpName = '';
+        if ($error === UPLOAD_ERR_OK) {
+            $tmpName = $file->getStream()->getMetadata('uri');
+        }
+
         return [
             'name' => $file->getClientFilename(),
             'type' => $file->getClientMediaType(),
-            'tmp_name' => $file->getStream()->getMetadata('uri'),
-            'error' => $file->getError(),
+            'tmp_name' => $tmpName,
+            'error' => $error,
             'size' => $file->getSize(),
         ];
     }

diff --git a/tests/TestCase/Http/RequestTransformerTest.php b/tests/TestCase/Http/RequestTransformerTest.php
@@ -147,6 +147,13 @@ public function testToCakeParamsPopulated()
     public function testToCakeUploadedFiles()
     {
         $files = [
+            'no_file' => [
+                'name' => ['file' => ''],
+                'type' => ['file' => ''],
+                'tmp_name' => ['file' => ''],
+                'error' => ['file' => UPLOAD_ERR_NO_FILE],
+                'size' => ['file' => 0]
+            ],
             'image_main' => [
                 'name' => ['file' => 'born on.txt'],
                 'type' => ['file' => 'text/plain'],
@@ -205,6 +212,15 @@ public function testToCakeUploadedFiles()
                     'size' => 17178,
                 ]
             ],
+            'no_file' => [
+                'file' => [
+                    'name' => '',
+                    'type' => '',
+                    'tmp_name' => '',
+                    'error' => UPLOAD_ERR_NO_FILE,
+                    'size' => 0,
+                ]
+            ],
             'pictures' => [
                 0 => [
                     'name' => 'A cat',