[5.6] Return null if object property is undefined (#23267)

* return null if object property is undefined * add array test
laravel · Feb 23, 2018 · 5acb717 · 5acb717
1 parent 237caed
commit 5acb717
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Illuminate/Support/Optional.php b/src/Illuminate/Support/Optional.php
@@ -37,7 +37,7 @@ public function __construct($value)
     public function __get($key)
     {
         if (is_object($this->value)) {
-            return $this->value->{$key};
+            return $this->value->{$key} ?? null;
         }
     }
 

diff --git a/tests/Support/SupportHelpersTest.php b/tests/Support/SupportHelpersTest.php
@@ -786,15 +786,16 @@ public function something()
 
     public function testOptionalWithArray()
     {
-        $this->assertNull(optional(null)['missing']);
-
         $this->assertEquals('here', optional(['present' => 'here'])['present']);
+        $this->assertNull(optional(null)['missing']);
+        $this->assertNull(optional(['present' => 'here'])->missing);
     }
 
     public function testOptionalReturnsObjectPropertyOrNull()
     {
         $this->assertSame('bar', optional((object) ['foo' => 'bar'])->foo);
         $this->assertNull(optional(['foo' => 'bar'])->foo);
+        $this->assertNull(optional((object) ['foo' => 'bar'])->bar);
     }
 
     public function testOptionalDeterminesWhetherKeyIsSet()