refactor analyze task

savinmikhail · Jan 3, 2025 · bd747db · bd747db
1 parent 96f4190
commit bd747db
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/AnalyzeComments/Analyzer/Analyzer.php b/src/AnalyzeComments/Analyzer/Analyzer.php
@@ -26,9 +26,8 @@ final class Analyzer
     public function __construct(
         private readonly ConfigDTO $configDTO,
         private readonly CommentFactory $commentFactory,
-        private readonly MissingDocBlockAnalyzer $missingDocBlock,
         private readonly MetricsFacade $metrics,
-        private readonly MissingDocBlockAnalyzer $docBlockAnalyzer,
+        private readonly MissingDocBlockAnalyzer $missingDocBlockAnalyzer,
         private readonly BaselineStorageInterface $baselineStorage,
         private readonly CacheInterface $cache,
         private readonly CommentStatisticsAggregator $statisticsAggregator,
@@ -45,12 +44,11 @@ public function analyze(iterable $files): Report
         $filesAnalyzed = 0;
 
         foreach ($files as $file) {
-            $task = new AnalyzeFileTask(
+            $task = new FileCommentFinder(
                 $this->cache,
-                $this->docBlockAnalyzer,
-                $this->missingDocBlock,
                 $this->commentFactory,
                 $this->configDTO,
+                $this->missingDocBlockAnalyzer,
             );
 
             $response = $task->run($file);
@@ -77,7 +75,7 @@ private function checkThresholdsExceeded(): bool
         if ($this->metrics->hasExceededThreshold()) {
             return true;
         }
-        if ($this->missingDocBlock->hasExceededThreshold()) {
+        if ($this->missingDocBlockAnalyzer->hasExceededThreshold()) {
             return true;
         }
         foreach ($this->commentFactory->getCommentTypes() as $commentType) {

diff --git a/src/AnalyzeComments/Analyzer/AnalyzerFactory.php b/src/AnalyzeComments/Analyzer/AnalyzerFactory.php
@@ -33,7 +33,6 @@ public function getAnalyzer(
         return new Analyzer(
             $configDto,
             $commentFactory,
-            $missingDocBlock,
             $metrics,
             $missingDocBlock,
             $baselineStorage,

diff --git a/...lyzeComments/Analyzer/AnalyzeFileTask.php → ...zeComments/Analyzer/FileCommentFinder.php b/...lyzeComments/Analyzer/AnalyzeFileTask.php → ...zeComments/Analyzer/FileCommentFinder.php
@@ -23,14 +23,13 @@
 use const T_COMMENT;
 use const T_DOC_COMMENT;
 
-final readonly class AnalyzeFileTask
+final readonly class FileCommentFinder
 {
     public function __construct(
         private CacheInterface $cache,
-        private MissingDocBlockAnalyzer $docBlockAnalyzer,
-        private MissingDocBlockAnalyzer $missingDocBlock,
         private CommentFactory $commentFactory,
         private ConfigDTO $configDTO,
+        private MissingDocBlockAnalyzer $missingDocBlockAnalyzer
     ) {}
 
     /**
@@ -76,7 +75,7 @@ private function analyzeFile(string $filename): array
 
         $comments = $this->getCommentsFromFile($tokens, $filename);
         if ($this->shouldAnalyzeMissingDocBlocks()) {
-            $missingDocBlocks = $this->docBlockAnalyzer->getMissingDocblocks($code, $filename);
+            $missingDocBlocks = $this->missingDocBlockAnalyzer->getMissingDocblocks($code, $filename);
             $comments = array_merge($missingDocBlocks, $comments);
         }
 
@@ -88,7 +87,7 @@ private function shouldAnalyzeMissingDocBlocks(): bool
         return
             $this->configDTO->getAllowedTypes() === []
             || in_array(
-                $this->missingDocBlock->getName(),
+                $this->missingDocBlockAnalyzer->getName(),
                 $this->configDTO->getAllowedTypes(),
                 true,
             );