Merge branch 'develop'

common/Define/Model.php

@@ -61,10 +61,10 @@ abstract class Model extends BaseModel implements ModelInterface {
     ], [
       Model::PARENT_KEY => 'id'
     ]);
-    $parent_table = (new $parent_class())->getTable();
+    $parent_table = (new $parent_model_class())->getTable();
     return $this->factory
       ->find($parent_model_class)
-      ->wherer([
+      ->where([
         [
           $relation_definitions[Model::PARENT_KEY],
           $this->{$relation_definitions[Model::SELF_KEY]}
@@ -82,7 +82,7 @@ abstract class Model extends BaseModel implements ModelInterface {
       Model::SELF_KEY => 'id',
       Model::SIBLING_KEY => 'id'
     ]);
-    $sibling_table = (new $sibling_class())->getTable();
+    $sibling_table = (new $sibling_model_class())->getTable();
     return $this->find($sibling_model_class)
       ->select([
         [

common/Factory/Model.php

@@ -27,6 +27,7 @@ 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 +80,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;
     }

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