refactor data_has (#57580)

Author: rodrigopedra

src/Illuminate/Collections/helpers.php

@@ -44,19 +44,23 @@ function data_fill(&$target, $key, $value)
      */
     function data_has($target, $key): bool
     {
-        if (Arr::accessible($target)) {
-            return Arr::has($target, $key);
+        if (empty($key)) {
+            return false;
         }
 
         $key = is_array($key) ? $key : explode('.', $key);
 
-        while ($property = array_shift($key)) {
-            if (property_exists($target, $property)) {
-                return $key ? data_has($target->{$property}, $key) : true;
+        foreach ($key as $segment) {
+            if (Arr::accessible($target) && Arr::exists($target, $segment)) {
+                $target = $target[$segment];
+            } elseif (is_object($target) && property_exists($target, $segment)) {
+                $target = $target->{$segment};
+            } else {
+                return false;
             }
         }
 
-        return false;
+        return true;
     }
 }
 

tests/Support/SupportHelpersTest.php

@@ -218,6 +218,34 @@ public function testObjectGetWhenKeyIsNullOrEmpty()
         $this->assertEquals($object, object_get($object, '  '));
     }
 
+    public function testDataHas()
+    {
+        $object = (object) ['users' => ['name' => ['Taylor', 'Otwell']]];
+        $array = [(object) ['users' => [(object) ['name' => 'Taylor']]]];
+        $dottedArray = ['users' => ['first.name' => 'Taylor', 'middle.name' => null]];
+        $arrayAccess = new SupportTestArrayAccess(['price' => 56, 'user' => new SupportTestArrayAccess(['name' => 'John']), 'email' => null]);
+        $sameKeyMultiLevel = (object) ['name' => 'Taylor', 'company' => ['name' => 'Laravel']];
+
+        $this->assertTrue(data_has($object, 'users.name.0'));
+        $this->assertTrue(data_has($array, '0.users.0.name'));
+        $this->assertFalse(data_has($array, '0.users.3'));
+        $this->assertFalse(data_has($array, '0.users.3'));
+        $this->assertFalse(data_has($array, '0.users.3'));
+        $this->assertTrue(data_has($dottedArray, ['users', 'first.name']));
+        $this->assertTrue(data_has($dottedArray, ['users', 'middle.name']));
+        $this->assertFalse(data_has($dottedArray, ['users', 'last.name']));
+        $this->assertTrue(data_has($arrayAccess, 'price'));
+        $this->assertTrue(data_has($arrayAccess, 'user.name'));
+        $this->assertFalse(data_has($arrayAccess, 'foo'));
+        $this->assertFalse(data_has($arrayAccess, 'user.foo'));
+        $this->assertFalse(data_has($arrayAccess, 'foo'));
+        $this->assertFalse(data_has($arrayAccess, 'user.foo'));
+        $this->assertTrue(data_has($arrayAccess, 'email'));
+        $this->assertTrue(data_has($sameKeyMultiLevel, 'name'));
+        $this->assertTrue(data_has($sameKeyMultiLevel, 'company.name'));
+        $this->assertFalse(data_has($sameKeyMultiLevel, 'foo.name'));
+    }
+
     public function testDataGet()
     {
         $object = (object) ['users' => ['name' => ['Taylor', 'Otwell']]];