Merge branch 'develop' into master

common/Alias/Model.php

@@ -124,33 +124,36 @@ abstract class Model extends BaseModel implements ModelInterface {
   }
 
   protected static function parseInput($input): array {
-    return array_intersect_key((array) $input, array_combine(static::$fields, static::$fields));
+    return array_intersect_key((array) $input, array_combine(self::$fields, self::$fields));
   }
-  public static function add(ModelFactory $factory, $input): ?ModelInterface {
-    $data = static::parseInput($input);
+  public static function add(ModelFactory $factory, $input): bool {
+    $data = self::parseInput($input);
     $class = get_called_class();
     if (method_exists($class, 'find')) {
-      $obj = static::find($factory, $input);
+      $obj = self::find($factory, $input);
     } else {
       $where = $data;
-      array_walk($where, function(&$item, $key) {
+      $where = array_values(array_walk($where, function(&$item, $key) {
         $item = [$key, $item];
-      });
-      $where = array_values($where);
+      }));
       $obj = $factory->find($class)->where($where)->one();
     }
-    if ($obj === null) {
+    if ($obj === false) {
       $obj = $factory->create($class, $data);
+      return $obj->save();
     }
-    return $obj;
+    return false;
   }
   public function edit($input): bool {
-    $data = static::parseInput($input);
-    foreach (static::$fields as $field) {
+    $data = self::parseInput($input);
+    foreach (self::$fields as $field) {
       if ($this->{$field} != $data[$field]) {
         $this->{$field} = $data[$field];
       }
     }
+    if ($this->isDirty()) {
       return $this->save();
     }
+    return false;
+  }
 }

common/Define/Model.php

@@ -12,6 +12,6 @@ interface Model {
 
   public function toArray(): array;
 
-  public static function add(ModelFactory $factory, $input): ?Model;
+  public static function add(ModelFactory $factory, $input): bool;
   public function edit($input): bool;
 }

common/Factory/Model.php

@@ -79,9 +79,9 @@ 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'] ?? ''),
+        'type' => strtolower($j['type']) ?? '',
         'params' => $j['params'] ?? ''
       ];
       $this->joins []= $join;
@@ -97,8 +97,8 @@ class Model {
       $cond = (object) [
         'column' => $c['column'] ?? $c[0],
         'value' => $c['value'] ?? $c[1],
-        'symb' => strtolower($c['symb'] ?? ($c[2] ?? '=')),
-        'type' => strtolower($c['type'] ?? '')
+        '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;
@@ -363,13 +363,10 @@ class Model {
     return $results;
   }
   public function array(): ?array {
-    $results = $this->many();
-    if (!$results or $results === null) {
+    $results = $this->build()->findArray();
+    if (!$results) {
       return null;
     }
-    array_walk($results, function(&$item) {
-      $item = $item->toArray();
-    });
     return $results;
   }