Merge branch 'develop'

common/Factory/Model.php

@@ -22,11 +22,25 @@ class Model {
     }
     return $this;
   }
+  public function create(string $model_class, array $data = null): ModelInterface {
+    if ($data !== null) {
+      $model = $this->find($model_class);
+      foreach ($data as $f => $v) {
+        $model = $model->where([[$f, $v]]);
+      }
+      $model = $model->one();
+      if ($model !== false) {
+        return $model;
+      }
+    }
+    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;
   }
@@ -328,13 +342,19 @@ 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);
+    if (!$result) {
+      return false;
+    }
     $result->setFactory($this);
     return $result;
   }
   public function many(): array {
     $results = $this->build()->findMany();
+    if (!$results) {
+      return false;
+    }
     foreach ($results as &$r) {
       $r->setFactory($this);
     }
@@ -342,6 +362,9 @@ class Model {
   }
   public function array(): array {
     $results = $this->build()->findArray();
+    if (!$results) {
+      return false;
+    }
     return $results;
   }
 

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 {}