Merge branch 'develop'

common/Factory/Model.php

@@ -22,11 +22,15 @@ class Model {
     }
     return $this;
   }
+  public function create(string $model_class, array $data = null): ModelInterface {
+    return BaseModel::factory($model_class)->create($data);
+  }
   protected $class;
   public function find(string $model_class): Model {
     if (!class_exists($model_class)) {
       throw new \InvalidArgumentException('El modelo ' . $model_class . ' no existe.');
     }
+    $this->reset();
     $this->class = $model_class;
     return $this;
   }
@@ -79,10 +83,10 @@ class Model {
     }
     foreach ($conditions as $c) {
       $cond = (object) [
-        'column' => $j['column'] ?? $j[0],
+        'column' => $c['column'] ?? $c[0],
-        'value' => $j['value'] ?? $j[1],
+        'value' => $c['value'] ?? $c[1],
-        'sym' => strtolower($j['sym'] ?? ($j[2] ?? '=')),
+        'sym' => strtolower($c['sym'] ?? ($c[2] ?? '=')),
-        'type' => strtolower($j['type']) ?? ''
+        'type' => strtolower($c['type']) ?? ''
       ];
       $this->conditions []= $cond;
     }
@@ -328,8 +332,8 @@ class Model {
     return $orm->offset($this->offset);
   }
 
-  public function one(): ModelInterface {
+  public function one($id = null): ModelInterface {
-    $result = $this->build()->findOne();
+    $result = $this->build()->findOne($id);
     $result->setFactory($this);
     return $result;
   }

common/Form/Model.php

@@ -0,0 +1,6 @@
+<?php
+namespace ProVM\Common\Form;
+
+use ProVM\Common\Define\Model as BaseModel;
+
+abstract class Model extends BaseModel {}