Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Model/BaseModel - Fix primary key and add @throws for builder method #4071

Merged
merged 2 commits into from
Jan 7, 2021
Merged

Model/BaseModel - Fix primary key and add @throws for builder method #4071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55807d7
BaseModel - Remove usage of primaryKey property which was left out wh…
najdanovicivan Jan 6, 2021
b01cb98
Model - Added @throws tag in Builder Method
najdanovicivan Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions system/BaseModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,13 +1675,6 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur
if (method_exists($data, 'toRawArray'))
{
$properties = $data->toRawArray($onlyChanged, $recursive);

// Always grab the primary key otherwise updates will fail.
if (! empty($properties) && ! empty($this->primaryKey) && ! in_array($this->primaryKey, $properties, true)
&& ! empty($data->{$this->primaryKey}))
{
$properties[$this->primaryKey] = $data->{$this->primaryKey};
}
}
else
{
Expand Down
1 change: 1 addition & 0 deletions system/Model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ public function countAllResults(bool $reset = true, bool $test = false)
* @param string|null $table Table name
*
* @return BaseBuilder
* @throws ModelException
*/
public function builder(?string $table = null)
{
Expand Down