Add new method NodeInterface::label() so I can fix the MerkleNode properly.

Author: drupol

spec/drupol/phptree/Node/MerkleNodeSpec.php

@@ -54,10 +54,32 @@ public function it_can_get_a_hash()
 
         $this
             ->add(...$nodes)
-            ->getValue()
+            ->hash()
             ->shouldReturn('c689102cdf2a5b30c2e21fdad85e4bb401085227aff672a7240ceb3410ff1fb6');
     }
 
+    public function it_can_get_its_label()
+    {
+        $this
+            ->label()
+            ->shouldReturn('root');
+
+        $nodes = [
+            new MerkleNode(null, 2, new DummyHasher()),
+            new MerkleNode(null, 2, new DummyHasher()),
+            new MerkleNode('a', 2, new DummyHasher()),
+            new MerkleNode('b', 2, new DummyHasher()),
+            new MerkleNode('c', 2, new DummyHasher()),
+        ];
+
+        $this
+            ->add(...$nodes);
+
+        $this
+            ->label()
+            ->shouldReturn('abcc');
+    }
+
     public function it_can_get_the_value_of_a_tree_with_a_single_node()
     {
         $this
@@ -83,7 +105,7 @@ public function it_can_get_the_value_of_a_tree_with_four_nodes()
             ->shouldReturn(5);
 
         $this
-            ->getValue()
+            ->hash()
             ->shouldReturn('abcc');
 
         $this
@@ -100,7 +122,7 @@ public function it_can_get_the_value_of_a_tree_with_three_nodes()
 
         $this
             ->add(...$nodes)
-            ->getValue()
+            ->hash()
             ->shouldReturn('ab');
     }
 
@@ -110,7 +132,7 @@ public function it_can_get_the_value_of_a_tree_with_two_nodes()
 
         $this
             ->add($node)
-            ->getValue()
+            ->hash()
             ->shouldReturn('aa');
     }
 
@@ -134,6 +156,10 @@ public function it_can_handle_null_values()
 
         $this
             ->getValue()
+            ->shouldReturn('root');
+
+        $this
+            ->hash()
             ->shouldReturn('abcc');
 
         $this

src/Exporter/AbstractExporter.php

@@ -5,7 +5,6 @@
 namespace drupol\phptree\Exporter;
 
 use drupol\phptree\Node\NodeInterface;
-use drupol\phptree\Node\ValueNodeInterface;
 
 /**
  * Class AbstractExporter.
@@ -23,10 +22,6 @@ abstract class AbstractExporter implements ExporterInterface
      */
     protected function getNodeRepresentation(NodeInterface $node): string
     {
-        if ($node instanceof ValueNodeInterface) {
-            return (string) $node->getValue();
-        }
-
-        return sha1(spl_object_hash($node));
+        return $node->label();
     }
 }

src/Node/MerkleNode.php

@@ -49,10 +49,18 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getValue()
+    public function hash(): string
+    {
+        return $this->hasher->unpack($this->doHash($this->normalize()));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function label(): string
     {
         if (true === $this->isLeaf()) {
-            return parent::getValue();
+            return $this->getValue();
         }
 
         return $this->hash();
@@ -79,7 +87,7 @@ private function doHash(MerkleNodeInterface $node): string
     {
         // If node is a leaf, then compute its hash from its value.
         if (true === $node->isLeaf()) {
-            return $this->hasher->hash((string) $node->getValue());
+            return $this->hasher->hash($node->getValue());
         }
 
         $hash = '';
@@ -90,12 +98,4 @@ private function doHash(MerkleNodeInterface $node): string
 
         return $this->hasher->hash($hash);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    private function hash(): string
-    {
-        return $this->hasher->unpack($this->doHash($this->normalize()));
-    }
 }

src/Node/MerkleNodeInterface.php

@@ -9,6 +9,11 @@
  */
 interface MerkleNodeInterface extends ValueNodeInterface
 {
+    /**
+     * @return string
+     */
+    public function hash(): string;
+
     /**
      * @return \drupol\phptree\Node\MerkleNodeInterface
      */

src/Node/Node.php

@@ -229,6 +229,14 @@ public function isRoot(): bool
         return null === $this->parent;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function label(): string
+    {
+        return sha1(spl_object_hash($this));
+    }
+
     /**
      * {@inheritdoc}
      */

src/Node/NodeInterface.php

@@ -138,6 +138,11 @@ public function isLeaf(): bool;
      */
     public function isRoot(): bool;
 
+    /**
+     * @return string
+     */
+    public function label(): string;
+
     /**
      * @param int $level
      *

src/Node/ValueNode.php

@@ -42,4 +42,12 @@ public function getValue()
     {
         return $this->value;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function label(): string
+    {
+        return (string) $this->getValue();
+    }
 }