Use is_iterable instead of is_array

getsentry · Mar 24, 2020 · 75e5093 · 75e5093
1 parent ca1dffe
commit 75e5093
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Enforce a timeout for connecting to the server and for the requests instead of waiting indefinitely (#979)
 - Add `RequestFetcherInterface` to allow customizing the request data attached to the logged event (#984)
 - Log internal debug and error messages to a PSR-3 compatible logger (#989)
+- Make `AbstractSerializer` to accept `Traversable` values using `is_iterable` instead of `is_array` (#991)
 
 ## 2.3.2 (2020-03-06)
 

diff --git a/src/Serializer/AbstractSerializer.php b/src/Serializer/AbstractSerializer.php
@@ -103,7 +103,7 @@ protected function serializeRecursively($value, int $_depth = 0)
                 return $this->serializeCallableWithoutTypeHint($value);
             }
 
-            if (\is_array($value)) {
+            if (is_iterable($value)) {
                 $serializedArray = [];
 
                 foreach ($value as $k => $v) {

diff --git a/tests/Serializer/SerializerTest.php b/tests/Serializer/SerializerTest.php
@@ -27,6 +27,24 @@ public function testArraysAreArrays(bool $serializeAllObjects): void
         $this->assertSame([1, 2, 3], $result);
     }
 
+    /**
+     * @dataProvider serializeAllObjectsDataProvider
+     */
+    public function testTraversablesAreArrays(bool $serializeAllObjects): void
+    {
+        $serializer = $this->createSerializer();
+
+        if ($serializeAllObjects) {
+            $serializer->setSerializeAllObjects(true);
+        }
+
+        $content = [1, 2, 3];
+        $traversable = new \ArrayIterator($content);
+        $result = $this->invokeSerialization($serializer, $traversable);
+
+        $this->assertSame([1, 2, 3], $result);
+    }
+
     /**
      * @dataProvider serializeAllObjectsDataProvider
      */