Fix isArrayable for stdClass

Author: tomas-novotny

CHANGELOG.md

@@ -6,9 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 
-## [Unreleased](https://github.com/inspirum/arrayable-php/compare/v1.2.0...master)
+## [Unreleased](https://github.com/inspirum/arrayable-php/compare/v1.2.1...master)
 
 
+## [v1.2.1 (2023-09-10)](https://github.com/inspirum/balikobot-php/compare/v1.2.0...v1.2.1)
+### Fixed
+- Fixed `isArrayable` for `stdClass`
+
 ## [v1.2.0 (2023-03-19)](https://github.com/inspirum/balikobot-php/compare/v1.1.0...v1.2.0)
 ### Added
 - Added support for **PHP 8.2**

src/Convertor.php

@@ -5,12 +5,9 @@
 namespace Inspirum\Arrayable;
 
 use RuntimeException;
-use Traversable;
 use UnexpectedValueException;
 use stdClass;
-use function is_array;
 use function is_iterable;
-use function iterator_to_array;
 use const PHP_INT_MAX;
 
 final class Convertor
@@ -20,7 +17,7 @@ final class Convertor
      */
     public static function isArrayable(mixed $data): bool
     {
-        return is_iterable($data) || $data instanceof Arrayable;
+        return is_iterable($data) || $data instanceof Arrayable || $data instanceof stdClass;
     }
 
     /**
@@ -50,19 +47,22 @@ private static function toArrayWithDepth(mixed $data, int $limit, int $depth): m
             return $data;
         }
 
-        if ($data instanceof Traversable) {
-            $data = iterator_to_array($data);
-        } elseif ($data instanceof Arrayable) {
+        if ($data instanceof Arrayable) {
             $data = $data->__toArray();
         } elseif ($data instanceof stdClass) {
             $data = (array) $data;
         }
 
-        if (is_array($data)) {
+        if (is_iterable($data)) {
+            $arrayData = [];
             foreach ($data as $k => $v) {
-                $data[$k] = self::toArrayWithDepth($v, $limit, $depth + 1);
+                $arrayData[$k] = self::toArrayWithDepth($v, $limit, $depth + 1);
             }
-        } elseif ($depth === 1) {
+
+            return $arrayData;
+        }
+
+        if ($depth === 1) {
             throw new RuntimeException('Cannot cast to array');
         }
 

tests/ConvertorTest.php

@@ -48,7 +48,21 @@ public static function providesToArray(): iterable
         ];
 
         yield [
-            'data'   => [
+            'data' => (static function () {
+                $o        = new stdClass();
+                $o->foo   = 'bar';
+                $o->debug = true;
+
+                return $o;
+            })(),
+            'result' => [
+                'foo' => 'bar',
+                'debug' => true,
+            ],
+        ];
+
+        yield [
+            'data' => [
                 2,
                 (static function () {
                     $o        = new stdClass();
@@ -61,14 +75,14 @@ public static function providesToArray(): iterable
             'result' => [
                 2,
                 [
-                    'foo'   => 'bar',
+                    'foo' => 'bar',
                     'debug' => true,
                 ],
             ],
         ];
 
         yield [
-            'data'   => new class implements Arrayable {
+            'data' => new class implements Arrayable {
                 /**
                  * @return array<mixed>
                  */
@@ -81,7 +95,7 @@ public function __toArray(): array
         ];
 
         yield [
-            'data'   => new class implements CoreArrayable {
+            'data' => new class implements CoreArrayable {
                 /**
                  * @return array<mixed>
                  */
@@ -94,20 +108,20 @@ public function __toArray(): array
         ];
 
         yield [
-            'data'   => new ArrayIterator([3, 4, 5]),
+            'data' => new ArrayIterator([3, 4, 5]),
             'result' => [3, 4, 5],
         ];
 
         yield [
-            'data'   => (static function () {
+            'data' => (static function () {
                 yield 2.3;
                 yield 8.10;
             })(),
             'result' => [2.3, 8.10],
         ];
 
         yield [
-            'data'   => [
+            'data' => [
                 1,
                 3,
                 [
@@ -134,32 +148,41 @@ public function __toArray(): array
         ];
 
         yield [
-            'data'   => new ArrayIterator([1, new ArrayIterator([3, new ArrayIterator([4, new ArrayIterator([3, 4, 5])])])]),
+            'data' => new ArrayIterator([
+                1,
+                new ArrayIterator([3, new ArrayIterator([4, new ArrayIterator([3, 4, 5])])]),
+            ]),
             'result' => [1, [3, [4, [3, 4, 5]]]],
         ];
 
         yield [
-            'data'   => new ArrayIterator([1, new ArrayIterator([3, new ArrayIterator([4, new ArrayIterator([3, 4, 5])])])]),
+            'data' => new ArrayIterator([
+                1,
+                new ArrayIterator([3, new ArrayIterator([4, new ArrayIterator([3, 4, 5])])]),
+            ]),
             'result' => [1, new ArrayIterator([3, new ArrayIterator([4, new ArrayIterator([3, 4, 5])])])],
-            'limit'  => 1,
+            'limit' => 1,
         ];
 
         yield [
-            'data'   => new ArrayIterator([1, new ArrayIterator([3, new ArrayIterator([4, new ArrayIterator([3, 4, 5])])])]),
+            'data' => new ArrayIterator([
+                1,
+                new ArrayIterator([3, new ArrayIterator([4, new ArrayIterator([3, 4, 5])])]),
+            ]),
             'result' => [1, [3, [4, new ArrayIterator([3, 4, 5])]]],
-            'limit'  => 3,
+            'limit' => 3,
         ];
 
         yield [
-            'data'   => '1',
+            'data' => '1',
             'result' => new UnexpectedValueException('Limit value should be positive number'),
-            'limit'  => -1,
+            'limit' => -1,
         ];
 
         yield [
-            'data'   => '1',
+            'data' => '1',
             'result' => new UnexpectedValueException('Limit value should be positive number'),
-            'limit'  => 0,
+            'limit' => 0,
         ];
     }
 }