Bugfix for empty singleton

MGatner · MGatner · commit 1c1eb7589c30 · 2019-10-01T20:52:19.000Z
diff --git a/src/Model.php b/src/Model.php
@@ -226,7 +226,7 @@ protected function addRelated($rows): ?array
 					if (self::$schema->tables->{$this->table}->relations->{$tableName}->singleton)
 					{
 						$key        = singular($tableName);
-						$object     = reset($related[$id]) ?? null;
+						$object     = empty($related[$id]) ? null : reset($related[$id]);
 						$item[$key] = $object;
 					}
 					else
@@ -247,7 +247,7 @@ protected function addRelated($rows): ?array
 					if (self::$schema->tables->{$this->table}->relations->{$tableName}->singleton)
 					{
 						$property        = singular($tableName);
-						$object          = reset($related[$id]) ?? null;
+						$object          = empty($related[$id]) ? null : reset($related[$id]);
 						$item->$property = $object;
 					}
 					else

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ protected function addRelated($rows): ?array`
`226`	`226`	`if (self::$schema->tables->{$this->table}->relations->{$tableName}->singleton)`
`227`	`227`	`{`
`228`	`228`	`$key = singular($tableName);`
`229`		`- $object = reset($related[$id]) ?? null;`
	`229`	`+ $object = empty($related[$id]) ? null : reset($related[$id]);`
`230`	`230`	`$item[$key] = $object;`
`231`	`231`	`}`
`232`	`232`	`else`
`@@ -247,7 +247,7 @@ protected function addRelated($rows): ?array`
`247`	`247`	`if (self::$schema->tables->{$this->table}->relations->{$tableName}->singleton)`
`248`	`248`	`{`
`249`	`249`	`$property = singular($tableName);`
`250`		`- $object = reset($related[$id]) ?? null;`
	`250`	`+ $object = empty($related[$id]) ? null : reset($related[$id]);`
`251`	`251`	`$item->$property = $object;`
`252`	`252`	`}`
`253`	`253`	`else`