Merge branch 'develop'

common/Define/Model.php

@@ -3,6 +3,7 @@ namespace ProVM\Common\Define;
 
 use \Model as BaseModel;
 use ProVM\Common\Alias\Model as ModelInterface;
+use ProVM\Common\Factory\Model as ModelFactory;
 
 abstract class Model extends BaseModel implements ModelInterface {
   const SELF_KEY = 'self_key';
@@ -12,7 +13,7 @@ abstract class Model extends BaseModel implements ModelInterface {
   const SELF_CONNECT_KEY = 'self_connect_key';
   const SIBLING_CONNECT_KEY = 'sibling_connect_key';
 
-  public function getTable() {
+  public function getTable(): string {
     return static::$_table;
   }
 

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 {