Check if exact key exists before assuming the dot notation represents…

… segments (#14976)
laravel · Aug 23, 2016 · 39a39b5 · 39a39b5
1 parent 18b0d8e
commit 39a39b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Illuminate/Support/Arr.php b/src/Illuminate/Support/Arr.php
@@ -288,6 +288,10 @@ public static function has($array, $keys)
         foreach ($keys as $key) {
             $subKeyArray = $array;
 
+            if (static::exists($array, $key)) {
+                continue;
+            }
+
             foreach (explode('.', $key) as $segment) {
                 if (static::accessible($subKeyArray) && static::exists($subKeyArray, $segment)) {
                     $subKeyArray = $subKeyArray[$segment];

diff --git a/tests/Support/SupportArrTest.php b/tests/Support/SupportArrTest.php
@@ -221,6 +221,10 @@ public function testGet()
 
     public function testHas()
     {
+        $array = ['products.desk' => ['price' => 100]];
+        $this->assertTrue(Arr::has($array, ['products.desk']));
+        $this->assertFalse(Arr::has($array, ['products.desk', 'missing']));
+
         $array = ['products' => ['desk' => ['price' => 100]]];
         $this->assertTrue(Arr::has($array, 'products.desk'));
         $this->assertTrue(Arr::has($array, 'products.desk.price'));