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

@@ -86,7 +86,7 @@ class Model {
       ];
       $this->conditions []= $cond;
     }
-    return $this->conditions;
+    return $this;
   }
   protected $grouping;
   public function group($groups): Model {