Cleanup dependencies

Author: byWulf

src/Service/PuzzleSolver/ByWulfSolver.php

@@ -16,9 +16,7 @@
 use Bywulf\Jigsawlutioner\Service\PuzzleSolver\ByWulfSolver\Strategy\MergeGroupsStrategy;
 use Bywulf\Jigsawlutioner\Service\PuzzleSolver\ByWulfSolver\Strategy\RemoveBadPiecesStrategy;
 use Bywulf\Jigsawlutioner\Service\PuzzleSolver\ByWulfSolver\Strategy\RemoveSmallGroupsStrategy;
-use Bywulf\Jigsawlutioner\Service\SideMatcher\SideMatcherInterface;
 use Closure;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 
 class ByWulfSolver implements PuzzleSolverInterface
 {
@@ -31,22 +29,17 @@ class ByWulfSolver implements PuzzleSolverInterface
         3 => ['x' => 1, 'y' => 0],
     ];
 
-    private FilesystemAdapter $cache;
+    private ?Closure $stepProgressionCallback = null;
 
-    private bool $allowRemovingWhileMerging = true;
-
-    private bool $outputStepSaving = false;
     private AddBestSinglePieceStrategy $addBestSinglePieceStrategy;
     private MergeGroupsStrategy $mergeGroupsStrategy;
     private FillBlanksWithSinglePiecesStrategy $fillBlanksWithSinglePiecesStrategy;
     private RemoveBadPiecesStrategy $removeBadPiecesStrategy;
     private RemoveSmallGroupsStrategy $removeSmallGroupsStrategy;
     private CreateMissingGroupsStrategy $createMissingGroupsStrategy;
 
-    public function __construct(
-        private SideMatcherInterface $sideMatcher,
-        private ?Closure $stepProgression = null,
-    ) {
+    public function __construct()
+    {
         $this->addBestSinglePieceStrategy = new AddBestSinglePieceStrategy();
         $this->mergeGroupsStrategy = new MergeGroupsStrategy();
         $this->fillBlanksWithSinglePiecesStrategy = new FillBlanksWithSinglePiecesStrategy();
@@ -55,6 +48,11 @@ public function __construct(
         $this->createMissingGroupsStrategy = new CreateMissingGroupsStrategy();
     }
 
+    public function setStepProgressionCallback(Closure $stepProgressionCallback): void
+    {
+        $this->stepProgressionCallback = $stepProgressionCallback;
+    }
+
     /**
      * @param Piece[] $pieces
      * @param array<string, array<string, float>>
@@ -66,7 +64,7 @@ public function findSolution(array $pieces, array $matchingMap): Solution
         $context = new ByWulfSolverContext(
             $pieces,
             $matchingMap,
-            $this->stepProgression
+            $this->stepProgressionCallback
         );
 
         $this->addBestSinglePieceStrategy->execute($context, 0.8, 0.5);