Merge pull request #216 from davidyell/develop

Merge for release

src/Model/Behavior/ProfferBehavior.php

@@ -80,6 +80,7 @@ public function beforeMarshal(Event $event, ArrayObject $data, ArrayObject $opti
      */
     public function beforeSave(Event $event, EntityInterface $entity, ArrayObject $options, ProfferPathInterface $path = null)
     {
+
         foreach ($this->config() as $field => $settings) {
             $tableEntityClass = $this->_table->entityClass();
 
@@ -115,9 +116,10 @@ public function beforeSave(Event $event, EntityInterface $entity, ArrayObject $o
     protected function process($field, array $settings, EntityInterface $entity, ProfferPathInterface $path = null)
     {
         $path = $this->createPath($entity, $field, $settings, $path);
-        $tableEntityClass = $this->_table->entityClass();
 
-        if ($tableEntityClass !== null && $entity instanceof $tableEntityClass) {
+        if (is_array($entity->get($field)) && count(array_filter(array_keys($entity->get($field)), 'is_string')) > 0) {
+            $uploadList = [$entity->get($field)];
+        } else {
             $uploadList = [
                 [
                     'name' => $entity->get('name'),
@@ -127,11 +129,6 @@ protected function process($field, array $settings, EntityInterface $entity, Pro
                     'size' => $entity->get('size'),
                 ]
             ];
-        } else {
-            $uploadList = $entity->get($field);
-            if (count(array_filter(array_keys($entity->get($field)), 'is_string')) > 0) {
-                $uploadList = [$entity->get($field)];
-            }
         }
 
         foreach ($uploadList as $upload) {