Merge remote-tracking branch 'origin' into dev-sql-escape

src/EntityTrait.php

@@ -196,8 +196,21 @@ trait EntityTrait {
         foreach($entityResolver->fieldList() as $key => $field) {
             $annotation = $entityResolver->searchFieldAnnotation($key, new Field() );
 
-            if ( isset($this->$key) ) {                
-                $dataset[ $annotation->name ?? $key ] = is_object($this->$key) ? Ulmus::convertObject($this->$key) : $this->$key;
+            if ( isset($this->$key) ) { 
+                $realKey = $annotation->name ?? $key;
+                
+                switch (true) {
+                    case is_object($this->$key):
+                        $dataset[$realKey] = Ulmus::convertObject($this->$key);
+                    break;
+                        
+                    case is_array($this->$key):    
+                        $dataset[$realKey] = Ulmus::encodeArray($this->$key);
+                    break;
+                    
+                    default:
+                       $dataset[$realKey] = $this->$key;
+                }
             }
             elseif ( $field['nullable'] ) {
                 $dataset[ $annotation->name ?? $key ] = null;