implement __isset on Optional (#24031)

laravel · Apr 29, 2018 · b4fdee2 · b4fdee2
1 parent 4a49ba5
commit b4fdee2
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 0 deletions.
diff --git a/src/Illuminate/Support/Optional.php b/src/Illuminate/Support/Optional.php
@@ -59,6 +59,25 @@ public function __call($method, $parameters)
         }
     }
 
+    /**
+     * Dynamically check a property exists on the underlying object.
+     *
+     * @param $name
+     * @return bool
+     */
+    public function __isset($name)
+    {
+        if (is_object($this->value)) {
+            return isset($this->value->{$name});
+        }
+
+        if (is_array($this->value) || $this->value instanceof \ArrayObject) {
+            return isset($this->value[$name]);
+        }
+
+        return false;
+    }
+
     /**
      * Determine if an item exists at an offset.
      *

diff --git a/tests/Support/SupportOptionalTest.php b/tests/Support/SupportOptionalTest.php
@@ -28,6 +28,25 @@ public function testGetNotExistItemOnObject()
         $this->assertNull($optional->item);
     }
 
+    public function testIssetExistItemOnObject()
+    {
+        $targetObj = new \stdClass;
+        $targetObj->item = '';
+
+        $optional = new Optional($targetObj);
+
+        $this->assertTrue(isset($optional->item));
+    }
+
+    public function testIssetNotExistItemOnObject()
+    {
+        $targetObj = new \stdClass;
+
+        $optional = new Optional($targetObj);
+
+        $this->assertFalse(isset($optional->item));
+    }
+
     public function testGetExistItemOnArray()
     {
         $expected = 'test';
@@ -49,4 +68,24 @@ public function testGetNotExistItemOnArray()
 
         $this->assertNull($optional['item']);
     }
+
+    public function testIssetExistItemOnArray()
+    {
+        $targetArr = [
+            'item' => '',
+        ];
+
+        $optional = new Optional($targetArr);
+
+        $this->assertTrue(isset($optional['item']));
+    }
+
+    public function testIssetNotExistItemOnArray()
+    {
+        $targetArr = [];
+
+        $optional = new Optional($targetArr);
+
+        $this->assertFalse(isset($optional['item']));
+    }
 }