Don't explode when asking for a value from a bound array that isn't set

adamwathan · Mar 25, 2016 · c6ccd41 · c6ccd41
1 parent 5fc21cb
commit c6ccd41
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/AdamWathan/Form/Binding/BoundData.php b/src/AdamWathan/Form/Binding/BoundData.php
@@ -31,8 +31,8 @@ protected function dataGet($target, $keyParts, $default)
 
         $key = array_shift($keyParts);
 
-        if (is_array($target) && isset($target[$key])) {
-            return $this->dataGet($target[$key], $keyParts, $default);
+        if (is_array($target)) {
+            return isset($target[$key]) ? $this->dataGet($target[$key], $keyParts, $default) : $default;
         }
 
         if (property_exists($target, $key) || method_exists($target, '__get')) {

diff --git a/tests/BindingTest.php b/tests/BindingTest.php
@@ -155,6 +155,16 @@ public function testBindArray()
         $this->assertEquals($expected, $result);
     }
 
+    public function testBindArrayWithMissingKey()
+    {
+        $array = ['first_name' => 'John'];
+        $this->form->bind($array);
+
+        $expected = '<input type="text" name="last_name">';
+        $result = (string) $this->form->text('last_name');
+        $this->assertEquals($expected, $result);
+    }
+
     public function testBindNestedArray()
     {
         $array = [
@@ -178,6 +188,23 @@ public function testBindNestedArray()
         $this->assertEquals($expected, $result);
     }
 
+    public function testBindNestedArrayWithMissingKey()
+    {
+        $array = [
+            'address' => [
+                'tree' => [
+                    'nested' => 'Bird'
+                ],
+            ],
+        ];
+
+        $this->form->bind($array);
+
+        $expected = '<input type="text" name="address[notSet]">';
+        $result = (string) $this->form->text('address[notSet]');
+        $this->assertEquals($expected, $result);
+    }
+
     public function testBindNestedObject()
     {
         $object = json_decode(json_encode([