Add option to set root name

DASPRiD · Apr 6, 2017 · 52816a4 · 52816a4
1 parent 282ab97
commit 52816a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/TreeReader.php b/src/TreeReader.php
@@ -18,10 +18,10 @@ final class TreeReader
      */
     private $parentKeys;
 
-    public function __construct(array $data, string ...$parentKeys)
+    public function __construct(array $data, string $name = 'root', string ...$parentKeys)
     {
         $this->data = $data;
-        $this->parentKeys = $parentKeys;
+        $this->parentKeys = array_merge($parentKeys, [$name]);
     }
 
     public function hasKey(string $key) : bool
@@ -56,7 +56,7 @@ public function getBool(string $key, bool $default = null) : bool
 
     public function getChildren(string $key, array $default = null) : self
     {
-        return new TreeReader($this->getValue($key, 'array', $default), ...array_merge($this->parentKeys, [$key]));
+        return new TreeReader($this->getValue($key, 'array', $default), $key, ...$this->parentKeys);
     }
 
     private function getValue(string $key, string $expectedType, $default)

diff --git a/test/TreeReaderTest.php b/test/TreeReaderTest.php
@@ -137,7 +137,7 @@ public function testChildrenValidValue(string $method, array $value, array $defa
     {
         $treeReader = new TreeReader(['foo' => $value]);
         $children = $treeReader->{$method}('foo', $default);
-        $this->assertAttributeSame(['foo'], 'parentKeys', $children);
+        $this->assertAttributeSame(['root', 'foo'], 'parentKeys', $children);
         $this->assertAttributeSame($value, 'data', $children);
     }
 
@@ -146,7 +146,16 @@ public function testKeyNotFoundExceptionWithMultipleParents()
         $treeReader = new TreeReader(['foo' => ['bar' => []]]);
 
         $this->expectException(KeyNotFoundException::class);
-        $this->expectExceptionMessage('in tree "foo->bar"');
+        $this->expectExceptionMessage('in tree "root->foo->bar"');
+        $treeReader->getChildren('foo')->getChildren('bar')->getString('baz');
+    }
+
+    public function testKeyNotFoundExceptionWithMultipleParentsAndAlternativeRootName()
+    {
+        $treeReader = new TreeReader(['foo' => ['bar' => []]], 'config');
+
+        $this->expectException(KeyNotFoundException::class);
+        $this->expectExceptionMessage('in tree "config->foo->bar"');
         $treeReader->getChildren('foo')->getChildren('bar')->getString('baz');
     }
 }