Additional testing, set cannot clobber strings, get should return null if trying to index into a string instead of an array.

Author: simensen

src/Dflydev/DotAccessData/Data.php

@@ -100,6 +100,9 @@ public function set($key, $value = null)
             if (!isset($currentValue[$currentKey])) {
                 $currentValue[$currentKey] = array();
             }
+            if (!is_array($currentValue[$currentKey])) {
+                throw new \RuntimeException("Key path at $currentKey of $key cannot be indexed into (is not an array)");
+            }
             $currentValue =& $currentValue[$currentKey];
         }
         $currentValue[$endKey] = $value;
@@ -144,7 +147,12 @@ public function get($key)
 
         for ( $i = 0; $i < count($keyPath); $i++ ) {
             $currentKey = $keyPath[$i];
-            if (!isset($currentValue[$currentKey]) ) { return null; }
+            if (!isset($currentValue[$currentKey]) ) {
+                return null;
+            }
+            if (!is_array($currentValue)) {
+                return null;
+            }
             $currentValue = $currentValue[$currentKey];
         }
 

tests/Dflydev/Tests/DotAccessData/DataTest.php

@@ -30,6 +30,17 @@ protected function getSampleData()
                 ),
             ),
             'c' => array('c1', 'c2', 'c3'),
+            'f' => array(
+                'g' => array(
+                    'h' => 'FGH',
+                ),
+            ),
+            'h' => array(
+                'i' => 'I',
+            ),
+            'i' => array(
+                'j' => 'J',
+            ),
         );
     }
 
@@ -41,6 +52,7 @@ protected function runSampleDataTests(DataInterface $data)
         $this->assertEquals('D3', $data->get('b.d.d3'));
         $this->assertEquals(array('c1', 'c2', 'c3'), $data->get('c'));
         $this->assertNull($data->get('foo'), 'Foo should not exist');
+        $this->assertNull($data->get('f.g.h.i'));
     }
 
     public function testAppend()
@@ -54,6 +66,8 @@ public function testAppend()
         $data->append('b.d.d4', 'D');
         $data->append('e', 'E');
         $data->append('f.a', 'b');
+        $data->append('h.i', 'I2');
+        $data->append('i.k.l', 'L');
 
         $this->assertEquals(array('A', 'B'), $data->get('a'));
         $this->assertEquals(array('c1', 'c2', 'c3', 'c4'), $data->get('c'));
@@ -62,6 +76,8 @@ public function testAppend()
         $this->assertEquals(array('D'), $data->get('b.d.d4'));
         $this->assertEquals(array('E'), $data->get('e'));
         $this->assertEquals(array('b'), $data->get('f.a'));
+        $this->assertEquals(array('I', 'I2'), $data->get('h.i'));
+        $this->assertEquals(array('L'), $data->get('i.k.l'));
 
         $this->setExpectedException('RuntimeException');
 
@@ -91,6 +107,17 @@ public function testSet()
         $data->set('', 'broken');
     }
 
+    public function testSetClobberStringInPath()
+    {
+        $data = new Data;
+
+        $data->set('a.b.c', 'Should not be able to write to a.b.c.d.e');
+
+        $this->setExpectedException('RuntimeException');
+
+        $data->set('a.b.c.d.e', 'broken');
+    }
+
     public function testRemove()
     {
         $data = new Data($this->getSampleData());
@@ -100,6 +127,7 @@ public function testRemove()
         $data->remove('b.d.d3');
         $data->remove('d');
         $data->remove('d.e.f');
+        $data->remove('empty.path');
 
         $this->assertNull($data->get('a'));
         $this->assertNull($data->get('b.c'));