Pass default into recursive call of data_get

laravel · Aug 23, 2024 · e4dec12 · e4dec12
1 parent c50ee30
commit e4dec12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Illuminate/Collections/helpers.php b/src/Illuminate/Collections/helpers.php
@@ -68,7 +68,7 @@ function data_get($target, $key, $default = null)
                 $result = [];
 
                 foreach ($target as $item) {
-                    $result[] = data_get($item, $key);
+                    $result[] = data_get($item, $key, $default);
                 }
 
                 return in_array('*', $key) ? Arr::collapse($result) : $result;

diff --git a/tests/Support/SupportHelpersTest.php b/tests/Support/SupportHelpersTest.php
@@ -208,10 +208,10 @@ public function testDataGetWithNestedArrays()
         ]);
 
         $this->assertEquals(['taylor', 'abigail', 'dayle'], data_get($array, '*.name'));
-        $this->assertEquals(['[email protected]', null, null], data_get($array, '*.email', 'irrelevant'));
+        $this->assertEquals(['[email protected]', 'default', 'default'], data_get($array, '*.email', 'default'));
 
         $this->assertEquals(['taylor', 'abigail', 'dayle'], data_get($arrayIterable, '*.name'));
-        $this->assertEquals(['[email protected]', null, null], data_get($arrayIterable, '*.email', 'irrelevant'));
+        $this->assertEquals(['[email protected]', 'default', 'default'], data_get($arrayIterable, '*.email', 'default'));
 
         $array = [
             'users' => [
@@ -223,7 +223,7 @@ public function testDataGetWithNestedArrays()
         ];
 
         $this->assertEquals(['taylor', 'abigail', 'dayle'], data_get($array, 'users.*.first'));
-        $this->assertEquals(['[email protected]', null, null], data_get($array, 'users.*.email', 'irrelevant'));
+        $this->assertEquals(['[email protected]', 'default', 'default'], data_get($array, 'users.*.email', 'default'));
         $this->assertSame('not found', data_get($array, 'posts.*.date', 'not found'));
         $this->assertNull(data_get($array, 'posts.*.date'));
     }