Skip to content

refactor: Entity variable #7499

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

Merged
merged 3 commits into from
May 19, 2023
Merged

refactor: Entity variable #7499

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
302f2f1
refactor: do not reassign $key
kenjis May 14, 2023
af0c2f1
refactor: rename variable name
kenjis May 14, 2023
9b74099
docs: improve comment
kenjis May 14, 2023
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
46 changes: 23 additions & 23 deletions system/Entity/Entity.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,19 +259,19 @@ public function hasChanged(?string $key = null): bool
return $this->original !== $this->attributes;
}

$key = $this->mapProperty($key);
$dbColumn = $this->mapProperty($key);

// Key doesn't exist in either
if (! array_key_exists($key, $this->original) && ! array_key_exists($key, $this->attributes)) {
if (! array_key_exists($dbColumn, $this->original) && ! array_key_exists($dbColumn, $this->attributes)) {
return false;
}

// It's a new element
if (! array_key_exists($key, $this->original) && array_key_exists($key, $this->attributes)) {
if (! array_key_exists($dbColumn, $this->original) && array_key_exists($dbColumn, $this->attributes)) {
return true;
}

return $this->original[$key] !== $this->attributes[$key];
return $this->original[$dbColumn] !== $this->attributes[$dbColumn];
}

/**
Expand Down Expand Up @@ -435,19 +435,19 @@ public function cast(?bool $cast = null)
*/
public function __set(string $key, $value = null)
{
$key = $this->mapProperty($key);
$dbColumn = $this->mapProperty($key);

// Check if the field should be mutated into a date
if (in_array($key, $this->dates, true)) {
if (in_array($dbColumn, $this->dates, true)) {
$value = $this->mutateDate($value);
}

$value = $this->castAs($value, $key, 'set');
$value = $this->castAs($value, $dbColumn, 'set');

// if a set* method exists for this key, use that method to
// insert this value. should be outside $isNullable check,
// so maybe wants to do sth with null value automatically
$method = 'set' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
$method = 'set' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $dbColumn)));

if (method_exists($this, $method)) {
$this->{$method}($value);
Expand All @@ -459,7 +459,7 @@ public function __set(string $key, $value = null)
// class properties that are undefined, though they cannot be
// saved. Useful for grabbing values through joins, assigning
// relationships, etc.
$this->attributes[$key] = $value;
$this->attributes[$dbColumn] = $value;

return $this;
}
Expand All @@ -480,12 +480,12 @@ public function __set(string $key, $value = null)
*/
public function __get(string $key)
{
$key = $this->mapProperty($key);
$dbColumn = $this->mapProperty($key);

$result = null;

// Convert to CamelCase for the method
$method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
$method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $dbColumn)));

// if a get* method exists for this key,
// use that method to insert this value.
Expand All @@ -495,17 +495,17 @@ public function __get(string $key)

// Otherwise return the protected property
// if it exists.
elseif (array_key_exists($key, $this->attributes)) {
$result = $this->attributes[$key];
elseif (array_key_exists($dbColumn, $this->attributes)) {
$result = $this->attributes[$dbColumn];
}

// Do we need to mutate this into a date?
if (in_array($key, $this->dates, true)) {
if (in_array($dbColumn, $this->dates, true)) {
$result = $this->mutateDate($result);
}
// Or cast it as something?
elseif ($this->_cast) {
$result = $this->castAs($result, $key);
$result = $this->castAs($result, $dbColumn);
}

return $result;
Expand All @@ -521,15 +521,15 @@ public function __isset(string $key): bool
return false;
}

$key = $this->mapProperty($key);
$dbColumn = $this->mapProperty($key);

$method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
$method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $dbColumn)));

if (method_exists($this, $method)) {
return true;
}

return isset($this->attributes[$key]);
return isset($this->attributes[$dbColumn]);
}

/**
Expand All @@ -541,20 +541,20 @@ public function __unset(string $key): void
return;
}

$key = $this->mapProperty($key);
$dbColumn = $this->mapProperty($key);

unset($this->attributes[$key]);
unset($this->attributes[$dbColumn]);
}

/**
* Whether this key is mapped db column name?
*/
protected function isMappedDbColumn(string $key): bool
{
$maybeColumnName = $this->mapProperty($key);
$dbColumn = $this->mapProperty($key);

// Property name which has mapped column name
if ($key !== $maybeColumnName) {
// The $key is a property name which has mapped db column name
if ($key !== $dbColumn) {
return false;
}

Expand Down