Merge pull request #590 from TerryKern/fix-data-array

Fix beforeMarshall if file uploads are array

Author: ADmad

src/Model/Behavior/UploadBehavior.php

@@ -74,7 +74,13 @@ public function beforeMarshal(EventInterface $event, ArrayObject $data, ArrayObj
             if (!$validator->isEmptyAllowed($field, false)) {
                 continue;
             }
-            if (!empty($dataArray[$field]) && $dataArray[$field]->getError() !== UPLOAD_ERR_NO_FILE) {
+            if (
+                !empty($dataArray[$field]) &&
+                ($dataArray[$field] instanceof UploadedFileInterface
+                    ? $dataArray[$field]->getError()
+                    : $dataArray[$field]['error']
+                ) !== UPLOAD_ERR_NO_FILE
+            ) {
                 continue;
             }
             if (isset($data[$field])) {

tests/TestCase/Model/Behavior/UploadBehaviorTest.php

@@ -11,6 +11,7 @@
 use Josegonzalez\Upload\Model\Behavior\UploadBehavior;
 use Josegonzalez\Upload\Test\Stub\ChildBehavior;
 use Laminas\Diactoros\UploadedFile;
+use Psr\Http\Message\UploadedFileInterface;
 use ReflectionClass;
 
 class UploadBehaviorTest extends TestCase
@@ -258,6 +259,40 @@ public function testBeforeMarshalEmptyAllowed()
         $this->assertEquals(new ArrayObject($this->dataError), $data);
     }
 
+    public function testBeforeMarshalDataAsArray()
+    {
+        $validator = $this->getMockBuilder('Cake\Validation\Validator')->getMock();
+        $validator->expects($this->atLeastOnce())
+                  ->method('isEmptyAllowed')
+                  ->will($this->returnValue(true));
+
+        $table = $this->getMockBuilder('Cake\ORM\Table')->getMock();
+        $table->expects($this->atLeastOnce())
+                    ->method('getValidator')
+                    ->will($this->returnValue($validator));
+
+        $methods = array_diff($this->behaviorMethods, ['beforeMarshal']);
+        $behavior = $this->getMockBuilder('Josegonzalez\Upload\Model\Behavior\UploadBehavior')
+            ->onlyMethods($methods)
+            ->setConstructorArgs([$table, $this->settings])
+            ->getMock();
+        $behavior->expects($this->any())
+                 ->method('getConfig')
+                 ->will($this->returnValue($this->settings));
+
+        $data = new ArrayObject(
+            $this->transformUploadedFilesToArray($this->dataOk)
+        );
+        $behavior->beforeMarshal(new Event('fake.event'), $data, new ArrayObject());
+        $this->assertEquals(new ArrayObject($this->transformUploadedFilesToArray($this->dataOk)), $data);
+
+        $data = new ArrayObject(
+            $this->transformUploadedFilesToArray($this->dataError)
+        );
+        $behavior->beforeMarshal(new Event('fake.event'), $data, new ArrayObject());
+        $this->assertEquals(new ArrayObject([]), $data);
+    }
+
     public function testBeforeSaveNoUpload()
     {
         $originalValue = rand(1000, 9999);
@@ -763,4 +798,20 @@ public function testNameCallback()
 
         $this->assertEquals($expected, $behavior->constructedFiles);
     }
+
+    private function transformUploadedFilesToArray(array $data): array
+    {
+        return array_map(
+            function (UploadedFileInterface $file) {
+                return [
+                    'tmp_name' => '',
+                    'error' => $file->getError(),
+                    'name' => $file->getClientFilename(),
+                    'type' => $file->getClientMediaType(),
+                    'size' => $file->getSize(),
+                ];
+            },
+            $data
+        );
+    }
 }