[5.4] Higher Order Array or Object Bug Fix (#16274)

* Array or Object * Array or Object * Improve array or object
laravel · Nov 6, 2016 · 6c38ec5 · 6c38ec5
1 parent ee385fa
commit 6c38ec5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Illuminate/Support/HigherOrderCollectionProxy.php b/src/Illuminate/Support/HigherOrderCollectionProxy.php
@@ -40,7 +40,7 @@ public function __construct(Collection $collection, $method)
     public function __get($key)
     {
         return $this->collection->{$this->method}(function ($value) use ($key) {
-            return $value->{$key};
+            return is_array($value) ? $value[$key] : $value->{$key};
         });
     }
 

diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -1654,6 +1654,20 @@ public function testHigherOrderCollectionMap()
 
         $this->assertEquals(['TAYLOR', 'TAYLOR'], $collection->each->uppercase()->map->name->toArray());
     }
+
+    public function testHigherOrderCollectionMapFromArrays()
+    {
+        $person1 = ['name' => 'Taylor'];
+        $person2 = ['name' => 'Yaz'];
+
+        $collection = collect([$person1, $person2]);
+
+        $this->assertEquals(['Taylor', 'Yaz'], $collection->map->name->toArray());
+
+        $collection = collect([new TestSupportCollectionHigherOrderItem, new TestSupportCollectionHigherOrderItem]);
+
+        $this->assertEquals(['TAYLOR', 'TAYLOR'], $collection->each->uppercase()->map->name->toArray());
+    }
 }
 
 class TestSupportCollectionHigherOrderItem