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

[2.x] Resolve Closure before checking if a prop implements the Arrayable contract #706

Open
wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

[2.x] Resolve Closure before checking if a prop implements the Arrayable contract #706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/Response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ public function resolvePartialProperties(array $props, Request $request): array
public function resolveArrayableProperties(array $props, Request $request, bool $unpackDotProps = true): array
{
foreach ($props as $key => $value) {
if ($value instanceof Closure) {
$value = App::call($value);
}

if ($value instanceof Arrayable) {
$value = $value->toArray();
}
Expand All @@ -186,10 +190,6 @@ public function resolveArrayableProperties(array $props, Request $request, bool
$value = $this->resolveArrayableProperties($value, $request, false);
}

if ($value instanceof Closure) {
$value = App::call($value);
}

if ($unpackDotProps && str_contains($key, '.')) {
Arr::set($props, $key, $value);
unset($props[$key]);
Expand Down