Merge pull request #4 from hirokinoue/fix-diagram-drawing-bug

描画に関するバグを修正する
hirokinoue · Feb 25, 2024 · 2d452e3 · 2d452e3
2 parents e929e70 + 5a88266
commit 2d452e3
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/Exporter/PlantUmlExporter.php b/src/Exporter/PlantUmlExporter.php
@@ -72,16 +72,27 @@ private function drawDependency(DiagramUnit $diagramUnit): void
             }
             $this->drawnDependencies[] = $lineForCheck;
 
-            $this->diagram .= "{$this->replaceErrorStr($diagramUnit)} --> {$this->replaceErrorStr($dependent)}" . PHP_EOL;
+            $this->diagram .= "{$this->diagramIdentifier($diagramUnit)} --> {$this->diagramIdentifier($dependent)}" . PHP_EOL;
             $this->drawDependency($dependent);
         }
     }
 
+    private function diagramIdentifier(DiagramUnit $diagramUnit): string
+    {
+        $className = $this->replaceErrorStr($diagramUnit);
+        $namespace = ($diagramUnit->namespace() === '') ? '' : "{$diagramUnit->namespace()}.";
+        return $namespace . $className;
+    }
+
     private function diagramShape(DiagramUnit $diagramUnit): string
     {
-        return $diagramUnit->isNonClassLikeRoot()
-            ? 'circle '
-            : $diagramUnit->declaringElement() . ' ';
+        if ($diagramUnit->isNonClassLikeRoot()) {
+            return 'circle ';
+        }
+        if ($diagramUnit->isTrait()) {
+            return 'abstract ';
+        }
+        return $diagramUnit->declaringElement() . ' ';
     }
 
     private function replaceErrorStr(DiagramUnit $diagramUnit): string