Improve the Ascii exporter.

loophp · Jun 27, 2019 · 6215ceb · 6215ceb
1 parent 36f7be7
commit 6215ceb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 58 deletions.
diff --git a/spec/drupol/phptree/Exporter/AsciiSpec.php b/spec/drupol/phptree/Exporter/AsciiSpec.php
@@ -5,7 +5,6 @@
 namespace spec\drupol\phptree\Exporter;
 
 use drupol\phptree\Exporter\Ascii;
-use drupol\phptree\Node\Node;
 use drupol\phptree\Node\ValueNode;
 use PhpSpec\ObjectBehavior;
 
@@ -96,21 +95,6 @@ public function it_can_export_to_ascii()
             ->shouldReturn($expected);
     }
 
-    public function it_can_throw_an_error_when_tree_is_not_a_valuenode()
-    {
-        $tree = new Node();
-
-        foreach (\range('A', 'Z') as $key => $value) {
-            $nodes[$value] = new Node();
-        }
-
-        $tree->add(...\array_values($nodes));
-
-        $this
-            ->shouldThrow(\InvalidArgumentException::class)
-            ->during('export', [$tree]);
-    }
-
     public function it_is_initializable()
     {
         $this->shouldHaveType(Ascii::class);

diff --git a/src/Exporter/Ascii.php b/src/Exporter/Ascii.php
@@ -21,7 +21,7 @@ public function export(NodeInterface $node): string
             new \RecursiveArrayIterator(
                 $this->doExportAsArray($node)
             ),
-            \RecursiveTreeIterator::BYPASS_KEY,
+            \RecursiveTreeIterator::SELF_FIRST,
             \CachingIterator::CATCH_GET_CHILD,
             \RecursiveTreeIterator::SELF_FIRST
         );
@@ -46,6 +46,24 @@ public function export(NodeInterface $node): string
         return $output;
     }
 
+    /**
+     * Get a string representation of the node.
+     *
+     * @param \drupol\phptree\Node\NodeInterface $node
+     *   The node.
+     *
+     * @return string
+     *   The node representation.
+     */
+    protected function getNodeRepresentation(NodeInterface $node): string
+    {
+        if ($node instanceof ValueNodeInterface) {
+            return $node->getValue();
+        }
+
+        return \sha1(\spl_object_hash($node));
+    }
+
     /**
      * Export the tree in an array.
      *
@@ -57,10 +75,6 @@ public function export(NodeInterface $node): string
      */
     private function doExportAsArray(NodeInterface $node): array
     {
-        if (!$this->isValidNode($node)) {
-            throw new \InvalidArgumentException('Must implements ValueNodeInterface');
-        }
-
         $children = [];
         /** @var ValueNodeInterface $child */
         foreach ($node->children() as $child) {
@@ -71,32 +85,4 @@ private function doExportAsArray(NodeInterface $node): array
             [$this->getNodeRepresentation($node)] :
             [$this->getNodeRepresentation($node), $children];
     }
-
-    /**
-     * Check if a node is valid for being exported.
-     *
-     * @param \drupol\phptree\Node\NodeInterface $node
-     *   The node.
-     *
-     * @return bool
-     *   True if it's valid, false otherwise.
-     */
-    protected function isValidNode(NodeInterface $node): bool
-    {
-        return $node instanceof ValueNodeInterface;
-    }
-
-    /**
-     * Get a string representation of the node.
-     *
-     * @param \drupol\phptree\Node\NodeInterface $node
-     *   The node.
-     *
-     * @return string
-     *   The node representation.
-     */
-    protected function getNodeRepresentation(NodeInterface $node): string
-    {
-        return $node->getValue();
-    }
 }
diff --git a/src/Exporter/Gv.php b/src/Exporter/Gv.php
@@ -34,14 +34,6 @@ public function export(NodeInterface $node): string
     {
         $attributes = \array_map(
             function ($key, $data) {
-                if (\is_string($data)) {
-                    return \sprintf(
-                        '  %s = %s',
-                        $key,
-                        $data
-                    );
-                }
-
                 if (\is_array($data)) {
                     return \sprintf(
                         '  %s %s',
@@ -50,7 +42,11 @@ function ($key, $data) {
                     );
                 }
 
-                return null;
+                return \sprintf(
+                    '  %s = %s',
+                    $key,
+                    $data
+                );
             },
             \array_keys($this->attributes),
             $this->attributes