refactor: コードのリズムを整える

hirokinoue · Mar 5, 2024 · 5a846e7 · 5a846e7
1 parent eed4759
commit 5a846e7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/DiagramUnit.php b/src/DiagramUnit.php
@@ -71,7 +71,7 @@ public function subClasses(): array {
 
     public function shouldStopTraverse(): bool
     {
-        return $this->isEndOfAnalysis() || $this->layer === Config::maxDepth();
+        return $this->isEndOfAnalysis() || $this->hasReachedMaxDepth() || $this->hasBeenVisited();
     }
 
     private function isEndOfAnalysis(): bool
@@ -85,6 +85,11 @@ private function isEndOfAnalysis(): bool
         return false;
     }
 
+    private function hasReachedMaxDepth(): bool
+    {
+        return $this->layer === Config::maxDepth();
+    }
+
     private function hasBeenPushed(DiagramUnit $other): bool
     {
         foreach ($this->classesDirectlyDependsOn as $diagramUnit) {
@@ -95,7 +100,7 @@ private function hasBeenPushed(DiagramUnit $other): bool
         return false;
     }
 
-    public function hasBeenVisited(): bool
+    private function hasBeenVisited(): bool
     {
         if (in_array($this->fullyQualifiedClassName, self::$visitedClasses)) {
             return true;

diff --git a/src/Visitor/ClassVisitor.php b/src/Visitor/ClassVisitor.php
@@ -47,7 +47,7 @@ public function enterNode(Node $node) {
             );
             $this->diagramUnit->push($subClass);
 
-            if ($stmts === [] || $classFile->notLoaded() || $subClass->hasBeenVisited() || $subClass->shouldStopTraverse()) {
+            if ($stmts === [] || $classFile->notLoaded() || $subClass->shouldStopTraverse()) {
                 return $node;
             }
 

diff --git a/tests/DiagramUnitTest.php b/tests/DiagramUnitTest.php
@@ -94,14 +94,14 @@ public function test解析したことのあるクラスを再び解析しない
         );
 
         // when1
-        $shouldStop = $sut->hasBeenVisited();
+        $shouldStop = $sut->shouldStopTraverse();
 
         // then1
         $this->assertFalse($shouldStop);
 
         // when2
         $sut->registerVisitedClass();
-        $shouldStop = $sut->hasBeenVisited();
+        $shouldStop = $sut->shouldStopTraverse();
 
         // then2
         $this->assertTrue($shouldStop);