Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into 4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
kenjis committed Jun 6, 2023
2 parents 0af105b + 335ab86 commit 11b585b
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions system/Entity/Entity.php
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ public function cast(?bool $cast = null)
*
* @param array|bool|float|int|object|string|null $value
*
* @return $this
* @return void
*
* @throws Exception
*/
Expand Down Expand Up @@ -472,16 +472,14 @@ public function __set(string $key, $value = null)
if (method_exists($this, $method) && $method !== 'setAttributes') {
$this->{$method}($value);

return $this;
return;
}

// Otherwise, just the value. This allows for creation of new
// class properties that are undefined, though they cannot be
// saved. Useful for grabbing values through joins, assigning
// relationships, etc.
$this->attributes[$dbColumn] = $value;

return $this;
}

/**
Expand Down

0 comments on commit 11b585b

Please sign in to comment.