Merge pull request #542 from FriendsOfCake/issue-541

Fix "undefined index" error.

Author: ADmad

src/Model/Behavior/UploadBehavior.php

@@ -75,7 +75,9 @@ public function beforeMarshal(EventInterface $event, ArrayObject $data, ArrayObj
             if (!empty($dataArray[$field]) && $dataArray[$field]->getError() !== UPLOAD_ERR_NO_FILE) {
                 continue;
             }
-            unset($data[$field]);
+            if (isset($data[$field])) {
+                unset($data[$field]);
+            }
         }
     }
 

tests/TestCase/Model/Behavior/UploadBehaviorTest.php

@@ -182,12 +182,12 @@ public function testInitializeAddBehaviorOptionsInterfaceConfig()
     public function testBeforeMarshalOk()
     {
         $validator = $this->getMockBuilder('Cake\Validation\Validator')->getMock();
-        $validator->expects($this->once())
+        $validator->expects($this->atLeastOnce())
                   ->method('isEmptyAllowed')
                   ->will($this->returnValue(true));
 
         $table = $this->getMockBuilder('Cake\ORM\Table')->getMock();
-        $table->expects($this->once())
+        $table->expects($this->atLeastOnce())
                     ->method('getValidator')
                     ->will($this->returnValue($validator));
 
@@ -203,6 +203,10 @@ public function testBeforeMarshalOk()
         $data = new ArrayObject($this->dataOk);
         $behavior->beforeMarshal(new Event('fake.event'), $data, new ArrayObject());
         $this->assertEquals(new ArrayObject($this->dataOk), $data);
+
+        $data = new ArrayObject();
+        $behavior->beforeMarshal(new Event('fake.event'), $data, new ArrayObject());
+        $this->assertEquals(new ArrayObject([]), $data);
     }
 
     public function testBeforeMarshalError()