Merge pull request #29205 from staudenmeir/collection

[5.8] Fix collections with JsonSerializable items and mixed values
laravel · Jul 18, 2019 · 7e9a7c6 · 7e9a7c6
2 parents 99522fc + 0fbd751
commit 7e9a7c6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Illuminate/Support/Collection.php b/src/Illuminate/Support/Collection.php
@@ -2127,7 +2127,7 @@ protected function getArrayableItems($items)
         } elseif ($items instanceof Jsonable) {
             return json_decode($items->toJson(), true);
         } elseif ($items instanceof JsonSerializable) {
-            return $items->jsonSerialize();
+            return (array) $items->jsonSerialize();
         } elseif ($items instanceof Traversable) {
             return iterator_to_array($items);
         }

diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -178,6 +178,10 @@ public function testGetArrayableItems()
         $array = $method->invokeArgs($collection, [$items]);
         $this->assertSame(['foo' => 'bar'], $array);
 
+        $items = new TestJsonSerializeWithScalarValueObject;
+        $array = $method->invokeArgs($collection, [$items]);
+        $this->assertSame(['foo'], $array);
+
         $items = new Collection(['foo' => 'bar']);
         $array = $method->invokeArgs($collection, [$items]);
         $this->assertSame(['foo' => 'bar'], $array);
@@ -3297,6 +3301,14 @@ public function jsonSerialize()
     }
 }
 
+class TestJsonSerializeWithScalarValueObject implements JsonSerializable
+{
+    public function jsonSerialize()
+    {
+        return 'foo';
+    }
+}
+
 class TestCollectionMapIntoObject
 {
     public $value;