Optimize Exporters.

loophp · Mar 10, 2020 · d03f537 · d03f537
1 parent e43a16c
commit d03f537
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 52 deletions.
diff --git a/spec/loophp/phptree/Exporter/SimpleArraySpec.php b/spec/loophp/phptree/Exporter/SimpleArraySpec.php
@@ -4,9 +4,7 @@
 
 namespace spec\loophp\phptree\Exporter;
 
-use InvalidArgumentException;
 use loophp\phptree\Exporter\SimpleArray;
-use loophp\phptree\Node\Node;
 use loophp\phptree\Node\ValueNode;
 use PhpSpec\ObjectBehavior;
 
@@ -77,21 +75,6 @@ public function it_can_export_to_an_array(): void
             ->shouldReturn($return);
     }
 
-    public function it_can_throw_an_error_when_tree_is_not_a_valuenode(): void
-    {
-        $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(): void
     {
         $this->shouldHaveType(SimpleArray::class);

diff --git a/src/Exporter/Ascii.php b/src/Exporter/Ascii.php
@@ -6,7 +6,6 @@
 
 use CachingIterator;
 use loophp\phptree\Node\NodeInterface;
-use loophp\phptree\Node\ValueNodeInterface;
 use RecursiveArrayIterator;
 use RecursiveTreeIterator;
 
@@ -22,9 +21,11 @@ final class Ascii implements ExporterInterface
      */
     public function export(NodeInterface $node): string
     {
+        $exporter = new SimpleArray();
+
         $tree = new RecursiveTreeIterator(
             new RecursiveArrayIterator(
-                $this->doExportAsArray($node)
+                $exporter->export($node)
             ),
             RecursiveTreeIterator::SELF_FIRST,
             CachingIterator::CATCH_GET_CHILD,
@@ -50,26 +51,4 @@ public function export(NodeInterface $node): string
 
         return $output;
     }
-
-    /**
-     * Export the tree in an array.
-     *
-     * @param \loophp\phptree\Node\NodeInterface $node
-     *   The node
-     *
-     * @return array<int, mixed>
-     *   The tree exported into an array
-     */
-    private function doExportAsArray(NodeInterface $node): array
-    {
-        $children = [];
-        /** @var ValueNodeInterface $child */
-        foreach ($node->children() as $child) {
-            $children[] = $this->doExportAsArray($child);
-        }
-
-        return [] === $children ?
-            [$node->label()] :
-            [$node->label(), $children];
-    }
 }
diff --git a/src/Exporter/Graph.php b/src/Exporter/Graph.php
@@ -83,7 +83,7 @@ private function createVertex(NodeInterface $node): Vertex
      */
     private function createVertexId(NodeInterface $node): string
     {
-        return spl_object_hash($node);
+        return sha1(spl_object_hash($node));
     }
 
     /**

diff --git a/src/Exporter/SimpleArray.php b/src/Exporter/SimpleArray.php
@@ -4,9 +4,7 @@
 
 namespace loophp\phptree\Exporter;
 
-use InvalidArgumentException;
 use loophp\phptree\Node\NodeInterface;
-use loophp\phptree\Node\ValueNodeInterface;
 
 /**
  * Class SimpleArray.
@@ -18,12 +16,9 @@ final class SimpleArray implements ExporterInterface
      */
     public function export(NodeInterface $node)
     {
-        if (!($node instanceof ValueNodeInterface)) {
-            throw new InvalidArgumentException('Must implements ValueNodeInterface');
-        }
-
         $children = [];
-        /** @var ValueNodeInterface $child */
+
+        /** @var NodeInterface $child */
         foreach ($node->children() as $child) {
             $children[] = $this->export($child);
         }

diff --git a/src/Exporter/Text.php b/src/Exporter/Text.php
@@ -5,7 +5,6 @@
 namespace loophp\phptree\Exporter;
 
 use loophp\phptree\Node\NodeInterface;
-use loophp\phptree\Node\ValueNodeInterface;
 
 /**
  * Class Text.
@@ -19,7 +18,7 @@ public function export(NodeInterface $node): string
     {
         $children = [];
 
-        /** @var ValueNodeInterface $child */
+        /** @var NodeInterface $child */
         foreach ($node->children() as $child) {
             $children[] = $this->export($child);
         }

diff --git a/src/Importer/NikicPhpParser.php b/src/Importer/NikicPhpParser.php
@@ -63,7 +63,9 @@ static function (string $subNodeName) use ($astNode): array {
             $astNode->getSubNodeNames()
         );
 
-        return array_merge(...$astNodes);
+        return [] === $astNodes ?
+            [] :
+            array_merge(...$astNodes);
     }
 
     /**