Let the MessageBag handle arrayable items

laravel · Aug 16, 2017 · 6f1f4d8 · 6f1f4d8
1 parent cec46b0
commit 6f1f4d8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Illuminate/Support/MessageBag.php b/src/Illuminate/Support/MessageBag.php
@@ -34,7 +34,7 @@ class MessageBag implements Arrayable, Countable, Jsonable, JsonSerializable, Me
     public function __construct(array $messages = [])
     {
         foreach ($messages as $key => $value) {
-            $this->messages[$key] = (array) $value;
+            $this->messages[$key] = $value instanceof Arrayable ? $value->toArray() : (array) $value;
         }
     }
 

diff --git a/tests/Support/SupportMessageBagTest.php b/tests/Support/SupportMessageBagTest.php
@@ -4,6 +4,7 @@
 
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
+use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 
 class SupportMessageBagTest extends TestCase
@@ -49,6 +50,15 @@ public function testMessageBagsCanBeMerged()
         $this->assertEquals(['foo' => ['bar', 'baz'], 'bar' => ['foo']], $container->getMessages());
     }
 
+    public function testMessageBagsCanConvertToArrays()
+    {
+        $container = new MessageBag([
+            Collection::make(['foo', 'bar']),
+            Collection::make(['baz', 'qux']),
+        ]);
+        $this->assertSame([['foo', 'bar'], ['baz', 'qux']], $container->getMessages());
+    }
+
     public function testGetReturnsArrayOfMessagesByKey()
     {
         $container = new MessageBag;