added cycle classe for better cohesion

Author: DeGraciaMathieu

app/Application/Cyclic/CyclicResponseMapper.php

@@ -2,15 +2,16 @@
 
 namespace App\Application\Cyclic;
 
+use App\Domain\Services\Cycle;
 use App\Application\Cyclic\CyclicResponse;
 
 class CyclicResponseMapper
 {
-    public function from(array $cycles): CyclicResponse
+    public function from(Cycle $cycles): CyclicResponse
     {
         return new CyclicResponse(
-            count: count($cycles),
-            cycles: $cycles,
+            count: $cycles->count(),
+            cycles: $cycles->all(),
         );
     }
 }

app/Domain/Aggregators/DependencyAggregator.php

@@ -2,6 +2,7 @@
 
 namespace App\Domain\Aggregators;
 
+use App\Domain\Services\Cycle;
 use App\Domain\Services\CyclicDependency;
 use App\Domain\Entities\ClassDependencies;
 
@@ -69,7 +70,7 @@ public function calculateAbstractness(): void
         }
     }
 
-    public function detectCycles(): array
+    public function detectCycles(): Cycle
     {
         return $this->cyclicDependency->detect($this->classes);
     }

app/Domain/Services/Cycle.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Domain\Services;
+
+class Cycle
+{
+    public array $cycles = [];
+
+    public function add(array $cycle): void
+    {
+        $this->cycles[] = $cycle;
+    }
+
+    public function isEmpty(): bool
+    {
+        return empty($this->cycles);
+    }
+
+    public function count(): int
+    {
+        return count($this->cycles);
+    }
+
+    public function all(): array
+    {
+        return $this->cycles;
+    }
+}

app/Domain/Services/CyclicDependency.php

@@ -3,29 +3,30 @@
 namespace App\Domain\Services;
 
 use App\Domain\Services\Visited;
+use App\Domain\Services\Cycle;
+use App\Domain\Services\Stack;
 
 class CyclicDependency
 {
     public function __construct(
         private Visited $visited,
         private Stack $stack,
+        private Cycle $cycle,
     ) {}
 
-    public function detect(array $classes): array
+    public function detect(array $classes): Cycle
     {
-        $cycles = [];
-
         foreach ($classes as $givenClass => $_) {
 
             if ($this->visited->unknown($givenClass)) {
-                $this->deepDive($givenClass, $classes, $cycles);
+                $this->deepDive($givenClass, $classes);
             }
         }
 
-        return $cycles;
+        return $this->cycle;
     }
 
-    private function deepDive(string $class, array $classes, array &$cycles): void
+    private function deepDive(string $class, array $classes): void
     {
         /**
          * Duplicate class can exist in the array.
@@ -44,7 +45,7 @@ private function deepDive(string $class, array $classes, array &$cycles): void
 
             $cycle = $this->stack->extractCycle($class);
 
-            $cycles[] = $cycle;
+            $this->cycle->add($cycle);
 
             /**
              * Stop the recursion, we can switch to another class.
@@ -58,7 +59,7 @@ private function deepDive(string $class, array $classes, array &$cycles): void
 
         foreach ($classes[$class]->getDependencies() as $dependency) {
             if (isset($classes[$dependency])) {
-                $this->deepDive($dependency, $classes, $cycles);
+                $this->deepDive($dependency, $classes);
             }
         }
 

tests/Unit/Domain/Services/CyclicDependencyTest.php

@@ -14,7 +14,9 @@
 
     $cycles = app(CyclicDependency::class)->detect($dependencyAggregator->classes());
 
-    expect($cycles)->toBe([
+    $this->assertFalse($cycles->isEmpty());
+
+    expect($cycles->all())->toBe([
         ['A', 'B', 'C'],
     ]);
 });
@@ -31,7 +33,9 @@
 
     $cycles = app(CyclicDependency::class)->detect($dependencyAggregator->classes());
 
-    expect($cycles)->toBe([
+    $this->assertFalse($cycles->isEmpty());
+
+    expect($cycles->all())->toBe([
         ['A', 'B'],
         ['A', 'C'],
     ]);