Merge branch 'develop'

common/Define/Model.php

@@ -37,7 +37,7 @@ abstract class Model extends BaseModel implements ModelInterface {
     }
     return $definitions;
   }
-  public function parentOf(string $child_model_class, array $relation_definitions): array {
+  public function parentOf(string $child_model_class, array $relation_definitions): ?array {
     $relation_definitions = $this->checkDefinitions($relation_definitions, [
       Model::SELF_KEY,
       Model::CHILD_KEY
@@ -54,7 +54,7 @@ abstract class Model extends BaseModel implements ModelInterface {
       ])
       ->many();
   }
-  public function childOf(string $parent_model_class, array $relation_definitions): ModelInterface {
+  public function childOf(string $parent_model_class, array $relation_definitions): ?ModelInterface {
     $relation_definitions = $this->checkDefinitions($relation_definitions, [
       Model::SELF_KEY,
       Model::PARENT_KEY
@@ -72,7 +72,7 @@ abstract class Model extends BaseModel implements ModelInterface {
       ])
       ->one();
   }
-  public function siblingOf(string $sibling_model_class, string $connecting_table, array $relation_definitions): array {
+  public function siblingOf(string $sibling_model_class, string $connecting_table, array $relation_definitions): ?array {
     $relation_definitions = $this->checkDefinitions($relation_definitions, [
       Model::SELF_KEY,
       Model::SIBLING_KEY,

common/Factory/Model.php

@@ -29,7 +29,7 @@ class Model {
         $model = $model->where([[$f, $v]]);
       }
       $model = $model->one();
-      if ($model !== false) {
+      if ($model !== null) {
         return $model;
       }
     }
@@ -342,28 +342,28 @@ class Model {
     return $orm->offset($this->offset);
   }
 
-  public function one($id = null): ModelInterface {
+  public function one($id = null): ?ModelInterface {
     $result = $this->build()->findOne($id);
     if (!$result) {
-      return false;
+      return null;
     }
     $result->setFactory($this);
     return $result;
   }
-  public function many(): array {
+  public function many(): ?array {
     $results = $this->build()->findMany();
     if (!$results) {
-      return false;
+      return null;
     }
     foreach ($results as &$r) {
       $r->setFactory($this);
     }
     return $results;
   }
-  public function array(): array {
+  public function array(): ?array {
     $results = $this->build()->findArray();
     if (!$results) {
-      return false;
+      return null;
     }
     return $results;
   }