Merge branch 'develop' into release

src/Alias/Model/Repository.php

@@ -150,25 +150,35 @@ abstract class Repository implements RepositoryInterface
     public function fillData(Model $model, array $data): Model
     {
         foreach ($this->getRequired() as $column) {
-            $m = 'set' . ucwords($column);
+            $m = $this->getMethod($column, false);
+            if (!method_exists($model, $m)) {
+                continue;
+            }
             $model->{$m}($data[$column]);
         }
         foreach ($this->getOptional() as $column) {
-            if (isset($data[$column])) {
+            if (!isset($data[$column])) {
-                $m = 'set' . ucwords($column);
+                continue;
-                $model->{$m}($data[$column]);
             }
+            $m = $this->getMethod($column, false);
+            if (!method_exists($model, $m)) {
+                continue;
+            }
+            $model->{$m}($data[$column]);
         }
         return $model;
     }
     public function mapArray(Model $model, array $data): array
     {
         foreach ($this->getColumns() as $column) {
-            $m = $this->getMethod($column);
-            $val = $model->{$m}();
             if (isset($data[$column])) {
                 continue;
             }
+            $m = $this->getMethod($column);
+            if (!method_exists($model, $m)) {
+                continue;
+            }
+            $val = $model->{$m}();
             $data[$column] = $val;
         }
         return $data;
@@ -215,7 +225,10 @@ abstract class Repository implements RepositoryInterface
     {
         foreach ($this->getColumns() as $col) {
             if (isset($data[$col])) {
-                $m = 'set' . ucwords($col);
+                $m = $this->getMethod($col, false);
+                if (!method_exists($model, $m)) {
+                    continue;
+                }
                 $model->{$m}($data[$col]);
             }
         }