Merge branch 'develop' into master

common/Factory/Model.php

@@ -79,7 +79,7 @@ class Model {
         'table' => $j['table'] ?? $j[0],
         'from' => $j['from'] ?? $j[1],
         'to' => $j['to'] ?? $j[2],
-        'symb' => $j['symb'] ?? ($j[3] ?? '='),
+        'sym' => $j['sym'] ?? ($j[3] ?? '='),
         'alias' => $j['alias'] ?? '',
         'type' => strtolower($j['type'] ?? ''),
         'params' => $j['params'] ?? ''
@@ -97,7 +97,7 @@ class Model {
       $cond = (object) [
         'column' => $c['column'] ?? $c[0],
         'value' => $c['value'] ?? $c[1],
-        'symb' => strtolower($c['symb'] ?? ($c[2] ?? '=')),
+        'sym' => strtolower($c['sym'] ?? ($c[2] ?? '=')),
         'type' => strtolower($c['type'] ?? '')
       ];
       $this->conditions []= $cond;
@@ -154,7 +154,7 @@ class Model {
       return $orm;
     }
     foreach ($this->columns as $col) {
-      $orm = $orm->select(trim(implode('.', (array) $col), '.'));
+      $orm = $orm->select(trim(implode('.', $col), '.'));
     }
     return $orm;
   }
@@ -192,7 +192,7 @@ class Model {
       }
       if ($join->type == 'raw') {
         $orm = $orm->{$method}($join->table, [$join->from, $join->symb, $join->to], $join->alias, $join->params);
-      } elseif ($join->alias !== '') {
+      } elseif ($join->alias === '') {
         $orm = $orm->{$method}($join->table, [$join->from, $join->symb, $join->to], $join->alias);
       } else {
         $orm = $orm->{$method}($join->table, [$join->from, $join->symb, $join->to]);
@@ -206,7 +206,7 @@ class Model {
     }
     foreach ($this->conditions as $cond) {
       $method = 'where';
-      switch ($cond->symb) {
+      switch ($cond->sym) {
         case '<':
           $method = 'whereLt';
           break;