Merge branch 'develop'

This commit is contained in:
2020-08-03 23:51:05 -04:00

View File

@ -37,7 +37,7 @@ abstract class Model extends BaseModel implements ModelInterface {
} }
return $definitions; 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, [ $relation_definitions = $this->checkDefinitions($relation_definitions, [
Model::SELF_KEY, Model::SELF_KEY,
Model::CHILD_KEY Model::CHILD_KEY
@ -54,7 +54,7 @@ abstract class Model extends BaseModel implements ModelInterface {
]) ])
->many(); ->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, [ $relation_definitions = $this->checkDefinitions($relation_definitions, [
Model::SELF_KEY, Model::SELF_KEY,
Model::PARENT_KEY Model::PARENT_KEY
@ -72,7 +72,7 @@ abstract class Model extends BaseModel implements ModelInterface {
]) ])
->one(); ->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, [ $relation_definitions = $this->checkDefinitions($relation_definitions, [
Model::SELF_KEY, Model::SELF_KEY,
Model::SIBLING_KEY, Model::SIBLING_KEY,