Merge pull request #12975 from thomasruiz/fix_arr_get

[5.2] Fix Arr::get($array, null) when $array is empty
laravel · Apr 2, 2016 · 3a46589 · 3a46589
2 parents cb5423c + 42f21b9
commit 3a46589
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Illuminate/Support/Arr.php b/src/Illuminate/Support/Arr.php
@@ -262,7 +262,7 @@ public static function forget(&$array, $keys)
      */
     public static function get($array, $key, $default = null)
     {
-        if (! $array) {
+        if (! static::accessible($array)) {
             return value($default);
         }
 

diff --git a/tests/Support/SupportArrTest.php b/tests/Support/SupportArrTest.php
@@ -182,8 +182,13 @@ public function testGet()
         $this->assertNull(Arr::get($array, 'bar.baz', 'default'));
 
         // Test $array not an array
-        $this->assertEquals('default', Arr::get(null, 'foo', 'default'));
-        $this->assertEquals('default', Arr::get(false, 'foo', 'default'));
+        $this->assertSame('default', Arr::get(null, 'foo', 'default'));
+        $this->assertSame('default', Arr::get(false, 'foo', 'default'));
+        $this->assertSame('default', Arr::get(null, null, 'default'));
+
+        // Test $array is empty and key is null
+        $this->assertSame([], Arr::get([], null));
+        $this->assertSame([], Arr::get([], null, 'default'));
     }
 
     public function testHas()