From e078b4578cdf85090256a1014fd8935038ab9c69 Mon Sep 17 00:00:00 2001
From: Rodrigo Pedra Brum <rodrigo.pedra@gmail.com>
Date: Wed, 15 Jan 2025 16:09:50 -0300
Subject: [PATCH] resolve closure first

---
 src/Response.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Response.php b/src/Response.php
index b30ea096..31a5630d 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -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();
             }
@@ -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]);