feat: Update filter method in Relationships class to use TraitUsage for trait handling

tasuku43 · tasuku43 · commit 8affea9f3f31 · 2025-08-15T08:00:29.000+09:00
diff --git a/src/ClassDiagramRenderer/Node/Relationship/Relationships.php b/src/ClassDiagramRenderer/Node/Relationship/Relationships.php
@@ -3,9 +3,7 @@
 
 namespace Tasuku43\MermaidClassDiagram\ClassDiagramRenderer\Node\Relationship;
 
-use Tasuku43\MermaidClassDiagram\ClassDiagramRenderer\Node\Trait_;
 use Tasuku43\MermaidClassDiagram\ClassDiagramRenderer\RenderOptions\RenderOptions;
-use Tasuku43\MermaidClassDiagram\ClassDiagramRenderer\TraitRenderMode;
 
 class Relationships
 {
@@ -48,7 +46,7 @@ public function sort(): self
     public function filter(RenderOptions $options): self
     {
         $filtered = array_filter($this->relationships, function (Relationship $relationship) use ($options) {
-            if (!$options->traitRenderMode->isWithTraits() && ($relationship->from instanceof Trait_ || $relationship->to instanceof Trait_)) {
+            if ($relationship instanceof TraitUsage && !$options->traitRenderMode->isWithTraits()) {
                 return false;
             }
             if ($relationship instanceof Dependency && !$options->includeDependencies) {

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Tasuku43\MermaidClassDiagram\ClassDiagramRenderer\Node\Relationship;`
`5`	`5`
`6`		`-use Tasuku43\MermaidClassDiagram\ClassDiagramRenderer\Node\Trait_;`
`7`	`6`	`use Tasuku43\MermaidClassDiagram\ClassDiagramRenderer\RenderOptions\RenderOptions;`
`8`		`-use Tasuku43\MermaidClassDiagram\ClassDiagramRenderer\TraitRenderMode;`
`9`	`7`
`10`	`8`	`class Relationships`
`11`	`9`	`{`
`@@ -48,7 +46,7 @@ public function sort(): self`
`48`	`46`	`public function filter(RenderOptions $options): self`
`49`	`47`	`{`
`50`	`48`	`$filtered = array_filter($this->relationships, function (Relationship $relationship) use ($options) {`
`51`		`- if (!$options->traitRenderMode->isWithTraits() && ($relationship->from instanceof Trait_ \|\| $relationship->to instanceof Trait_)) {`
	`49`	`+ if ($relationship instanceof TraitUsage && !$options->traitRenderMode->isWithTraits()) {`
`52`	`50`	`return false;`
`53`	`51`	`}`
`54`	`52`	`if ($relationship instanceof Dependency && !$options->includeDependencies) {`