refactor: RecursiveToArray

the-pulli · Sep 22, 2023 · aac785e · aac785e
1 parent c618533
commit aac785e
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/Macros/RecursiveToArray.php b/src/Macros/RecursiveToArray.php
@@ -2,14 +2,27 @@
 
 namespace Pulli\CollectionMacros\Macros;
 
+use Closure;
 use Illuminate\Support\Collection;
 
 class RecursiveToArray
 {
- public function __invoke(): \Closure
+ public function __invoke(): Closure
  {
  return function(array $ary): array {
- return Collection::mapToCollection($ary, true)->toArray();
+ $closure = function (&$ary) {
+ if (is_array($ary)) {
+ $ary = Collection::recursiveToArray($ary);
+ }
+
+ if (is_object($ary) && method_exists($ary, 'toArray')) {
+ $ary = Collection::recursiveToArray($ary->toArray());
+ }
+ };
+
+ array_walk($ary, $closure);
+
+ return $ary;
  };
  }
 }