Merge pull request #706 from rodrigopedra/2.x

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

Author: joetannenbaum

src/Response.php

@@ -176,6 +176,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();
             }
@@ -184,10 +188,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]);