Update Exporters, remove obsolete AbstractExporter.

Author: drupol

src/Exporter/AbstractExporter.php

@@ -15,7 +15,7 @@
 /**
  * Class Ascii.
  */
-final class Ascii extends AbstractExporter
+final class Ascii implements ExporterInterface
 {
     /**
      * {@inheritdoc}
@@ -69,7 +69,7 @@ private function doExportAsArray(NodeInterface $node): array
         }
 
         return [] === $children ?
-            [$this->getNodeRepresentation($node)] :
-            [$this->getNodeRepresentation($node), $children];
+            [$node->label()] :
+            [$node->label(), $children];
     }
 }

src/Exporter/Ascii.php

@@ -12,7 +12,7 @@
 /**
  * Class Graph.
  */
-final class Graph extends AbstractExporter
+final class Graph implements ExporterInterface
 {
     /**
      * The graph.
@@ -49,7 +49,7 @@ public function export(NodeInterface $node): OriginalGraph
      * @return \Fhaculty\Graph\Vertex
      *   A vertex
      */
-    protected function createVertex(NodeInterface $node): Vertex
+    private function createVertex(NodeInterface $node): Vertex
     {
         /** @var int $vertexId */
         $vertexId = $this->createVertexId($node);
@@ -59,7 +59,7 @@ protected function createVertex(NodeInterface $node): Vertex
 
             $vertex->setAttribute(
                 'graphviz.label',
-                $this->getNodeRepresentation($node)
+                $node->label()
             );
 
             if ($node instanceof AttributeNodeInterface) {
@@ -78,18 +78,18 @@ protected function createVertex(NodeInterface $node): Vertex
      * @param \loophp\phptree\Node\NodeInterface $node
      *   The node
      *
-     * @return int|string|null
+     * @return string
      *   A vertex ID
      */
-    protected function createVertexId(NodeInterface $node)
+    private function createVertexId(NodeInterface $node): string
     {
         return spl_object_hash($node);
     }
 
     /**
      * @return \Fhaculty\Graph\Graph
      */
-    protected function getGraph(): OriginalGraph
+    private function getGraph(): OriginalGraph
     {
         return $this->graph;
     }

src/Exporter/Graph.php

@@ -15,7 +15,7 @@
 /**
  * Class Gv.
  */
-final class Gv extends AbstractExporter
+final class Gv implements ExporterInterface
 {
     /**
      * The graph attributes.
@@ -136,7 +136,7 @@ public function setGraphAttributes(array $attributes): self
      * @return string
      *   The attributes as string.
      */
-    protected function attributesArrayToText(array $attributes): string
+    private function attributesArrayToText(array $attributes): string
     {
         $attributesText = array_filter(
             array_map(
@@ -166,7 +166,7 @@ static function ($key, $value) {
      * @return Generator<NodeInterface, NodeInterface>
      *   Yield the parent and child node.
      */
-    protected function findEdges(NodeInterface $node): iterable
+    private function findEdges(NodeInterface $node): iterable
     {
         foreach ($node->children() as $child) {
             yield $node => $child;
@@ -186,7 +186,7 @@ protected function findEdges(NodeInterface $node): iterable
      * @return string
      *   The content of the .gv file.
      */
-    protected function getGv(string $attributes = '', string $nodes = '', string $edges = ''): string
+    private function getGv(string $attributes = '', string $nodes = '', string $edges = ''): string
     {
         $graphType = $this->getDirected() ?
             'digraph' :
@@ -215,7 +215,7 @@ protected function getGv(string $attributes = '', string $nodes = '', string $ed
      * @return string
      *   The hash of the node.
      */
-    protected function getHash(NodeInterface $node): string
+    private function getHash(NodeInterface $node): string
     {
         return sha1(spl_object_hash($node));
     }
@@ -229,10 +229,10 @@ protected function getHash(NodeInterface $node): string
      * @return array<mixed, mixed>
      *   The attributes as an array.
      */
-    protected function getNodeAttributes(NodeInterface $node): array
+    private function getNodeAttributes(NodeInterface $node): array
     {
         $attributes = [
-            'label' => $this->getNodeRepresentation($node),
+            'label' => $node->label(),
         ];
 
         if ($node instanceof AttributeNodeInterface) {

src/Exporter/Gv.php

@@ -12,7 +12,7 @@
 /**
  * Class Image.
  */
-final class Image extends AbstractExporter
+final class Image implements ExporterInterface
 {
     /**
      * @var string

src/Exporter/Image.php

@@ -11,7 +11,7 @@
 /**
  * Class SimpleArray.
  */
-final class SimpleArray extends AbstractExporter
+final class SimpleArray implements ExporterInterface
 {
     /**
      * {@inheritdoc}
@@ -29,7 +29,7 @@ public function export(NodeInterface $node)
         }
 
         return [] === $children ?
-            ['value' => $this->getNodeRepresentation($node)] :
-            ['value' => $this->getNodeRepresentation($node), 'children' => $children];
+            ['value' => $node->label()] :
+            ['value' => $node->label(), 'children' => $children];
     }
 }

src/Exporter/SimpleArray.php

@@ -10,7 +10,7 @@
 /**
  * Class Text.
  */
-final class Text extends AbstractExporter
+final class Text implements ExporterInterface
 {
     /**
      * {@inheritdoc}
@@ -25,7 +25,7 @@ public function export(NodeInterface $node): string
         }
 
         return [] === $children ?
-            sprintf('[%s]', $this->getNodeRepresentation($node)) :
-            sprintf('[%s%s]', $this->getNodeRepresentation($node), implode('', $children));
+            sprintf('[%s]', $node->label()) :
+            sprintf('[%s%s]', $node->label(), implode('', $children));
     }
 }