Skip to content

[12.x] Follow up improvements to #57557 #57595

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

Closed
wants to merge 3 commits into from
Closed

[12.x] Follow up improvements to #57557 #57595

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
398526d
refactor: removed duplicate object var read and extracted method
NickSdot Oct 30, 2025
44f8234
call `version_compare()` with third argument
NickSdot Oct 30, 2025
77a1e7c
refactor: added missing phpdoc
NickSdot Oct 30, 2025
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
34 changes: 23 additions & 11 deletions src/Illuminate/Database/Eloquent/Model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2581,6 +2581,28 @@ public function escapeWhenCastingToString($escape = true)
return $this;
}

/**
* Get the properties for serialization.
*
* @return array
*/
protected function getPropertiesForSerialization(): array
{
if (version_compare(PHP_VERSION, '8.4.0', '<')) {
return array_keys(get_object_vars($this));
}

$keys = [];

foreach ((new ReflectionClass($this))->getProperties() as $property) {
if (!$property->isStatic() && !$property->hasHooks()) {
$keys[] = $property->getName();
}
}

return $keys;
}

/**
* Prepare the object for serialization.
*
Expand All @@ -2595,17 +2617,7 @@ public function __sleep()
$this->relationAutoloadCallback = null;
$this->relationAutoloadContext = null;

$keys = get_object_vars($this);

if (version_compare(PHP_VERSION, '8.4.0', '>=')) {
foreach ((new ReflectionClass($this))->getProperties() as $property) {
if ($property->hasHooks()) {
unset($keys[$property->getName()]);
}
}
}

return array_keys($keys);
return $this->getPropertiesForSerialization();
}

/**
Expand Down