Merge branch 'develop'
This commit is contained in:
@ -29,7 +29,7 @@ class Model {
|
|||||||
$model = $model->where([[$f, $v]]);
|
$model = $model->where([[$f, $v]]);
|
||||||
}
|
}
|
||||||
$model = $model->one();
|
$model = $model->one();
|
||||||
if ($model !== false) {
|
if ($model !== null) {
|
||||||
return $model;
|
return $model;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -345,7 +345,7 @@ class Model {
|
|||||||
public function one($id = null): ?ModelInterface {
|
public function one($id = null): ?ModelInterface {
|
||||||
$result = $this->build()->findOne($id);
|
$result = $this->build()->findOne($id);
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
return false;
|
return null;
|
||||||
}
|
}
|
||||||
$result->setFactory($this);
|
$result->setFactory($this);
|
||||||
return $result;
|
return $result;
|
||||||
@ -353,7 +353,7 @@ class Model {
|
|||||||
public function many(): ?array {
|
public function many(): ?array {
|
||||||
$results = $this->build()->findMany();
|
$results = $this->build()->findMany();
|
||||||
if (!$results) {
|
if (!$results) {
|
||||||
return false;
|
return null;
|
||||||
}
|
}
|
||||||
foreach ($results as &$r) {
|
foreach ($results as &$r) {
|
||||||
$r->setFactory($this);
|
$r->setFactory($this);
|
||||||
@ -363,7 +363,7 @@ class Model {
|
|||||||
public function array(): ?array {
|
public function array(): ?array {
|
||||||
$results = $this->build()->findArray();
|
$results = $this->build()->findArray();
|
||||||
if (!$results) {
|
if (!$results) {
|
||||||
return false;
|
return null;
|
||||||
}
|
}
|
||||||
return $results;
|
return $results;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user