ProVM/models
3
0
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Merge branch 'develop' into master

Browse Source
This commit is contained in:
Aldarien
2021-08-01 20:51:44 -04:00
parent 6cd26a88ea 2bf938a9b7
commit 65c224c636
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/Alias/Model.php
View File

@ -133,9 +133,10 @@ abstract class Model extends BaseModel implements ModelInterface {
$obj = static::find($factory, $input); $obj = static::find($factory, $input);
} else { } else {
$where = $data; $where = $data;
$where = array_values(array_walk($where, function(&$item, $key) { array_walk($where, function(&$item, $key) {
$item = [$key, $item]; $item = [$key, $item];
})); });
$where = array_values($where);
$obj = $factory->find($class)->where($where)->one(); $obj = $factory->find($class)->where($where)->one();
} }
if ($obj === null) { if ($obj === null) {

11
common/Factory/Model.php
View File

@ -81,7 +81,7 @@ class Model {
'to' => $j['to'] ?? $j[2], 'to' => $j['to'] ?? $j[2],
'sym' => $j['sym'] ?? ($j[3] ?? '='), 'sym' => $j['sym'] ?? ($j[3] ?? '='),
'alias' => $j['alias'] ?? '', 'alias' => $j['alias'] ?? '',
'type' => strtolower($j['type']) ?? '', 'type' => strtolower($j['type'] ?? ''),
'params' => $j['params'] ?? '' 'params' => $j['params'] ?? ''
]; ];
$this->joins []= $join; $this->joins []= $join;
@ -98,7 +98,7 @@ class Model {
'column' => $c['column'] ?? $c[0], 'column' => $c['column'] ?? $c[0],
'value' => $c['value'] ?? $c[1], 'value' => $c['value'] ?? $c[1],
'sym' => strtolower($c['sym'] ?? ($c[2] ?? '=')), 'sym' => strtolower($c['sym'] ?? ($c[2] ?? '=')),
'type' => strtolower($c['type']) ?? '' 'type' => strtolower($c['type'] ?? '')
]; ];
$this->conditions []= $cond; $this->conditions []= $cond;
} }
@ -363,10 +363,13 @@ class Model {
return $results; return $results;
} }
public function array(): ?array { public function array(): ?array {
$results = $this->build()->findArray(); $results = $this->many();
if (!$results) { if (!$results or $results === null) {
return null; return null;
} }
array_walk($results, function(&$item) {
$item = $item->toArray();
});
return $results; return $results;
} }