remove output dependency

savinmikhail · Jan 3, 2025 · 8c702de · 8c702de
1 parent 2290a54
commit 8c702de
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/src/AnalyzeComments/Analyzer/AnalyzeFileTask.php b/src/AnalyzeComments/Analyzer/AnalyzeFileTask.php
@@ -4,6 +4,7 @@
 
 namespace SavinMikhail\CommentsDensity\AnalyzeComments\Analyzer;
 
+use Psr\Cache\InvalidArgumentException;
 use SavinMikhail\CommentsDensity\AnalyzeComments\Analyzer\DTO\Output\CommentDTO;
 use SavinMikhail\CommentsDensity\AnalyzeComments\Comments\CommentFactory;
 use SavinMikhail\CommentsDensity\AnalyzeComments\Config\DTO\ConfigDTO;
@@ -29,11 +30,11 @@ public function __construct(
         private MissingDocBlockAnalyzer $missingDocBlock,
         private CommentFactory $commentFactory,
         private ConfigDTO $configDTO,
-        private OutputInterface $output,
     ) {}
 
     /**
      * @return array{'lines': int, 'comments': array<array-key, array<string, int>>}
+     * @throws InvalidArgumentException
      */
     public function run(SplFileInfo $file): array
     {
@@ -69,8 +70,6 @@ private function shouldSkipFile(SplFileInfo $file): bool
      */
     private function analyzeFile(string $filename): array
     {
-        $this->output->writeln("<info>Analyzing {$filename}</info>");
-
         $code = file_get_contents($filename);
         $tokens = token_get_all($code);
 

diff --git a/src/AnalyzeComments/Analyzer/Analyzer.php b/src/AnalyzeComments/Analyzer/Analyzer.php
@@ -9,6 +9,7 @@
 use SavinMikhail\CommentsDensity\AnalyzeComments\Analyzer\DTO\Output\Report;
 use SavinMikhail\CommentsDensity\AnalyzeComments\Comments\CommentFactory;
 use SavinMikhail\CommentsDensity\AnalyzeComments\Config\DTO\ConfigDTO;
+use SavinMikhail\CommentsDensity\AnalyzeComments\Exception\CommentsDensityException;
 use SavinMikhail\CommentsDensity\AnalyzeComments\Metrics\MetricsFacade;
 use SavinMikhail\CommentsDensity\AnalyzeComments\MissingDocblock\MissingDocBlockAnalyzer;
 use SavinMikhail\CommentsDensity\Baseline\Storage\BaselineStorageInterface;
@@ -26,7 +27,6 @@ public function __construct(
         private readonly CommentFactory $commentFactory,
         private readonly MissingDocBlockAnalyzer $missingDocBlock,
         private readonly MetricsFacade $metrics,
-        private readonly OutputInterface $output,
         private readonly MissingDocBlockAnalyzer $docBlockAnalyzer,
         private readonly BaselineStorageInterface $baselineStorage,
         private readonly CacheInterface $cache,
@@ -35,6 +35,7 @@ public function __construct(
 
     /**
      * @param SplFileInfo[] $files
+     * @throws CommentsDensityException
      */
     public function analyze(iterable $files): Report
     {
@@ -49,7 +50,6 @@ public function analyze(iterable $files): Report
                 $this->missingDocBlock,
                 $this->commentFactory,
                 $this->configDTO,
-                $this->output,
             );
 
             $response = $task->run($file);

diff --git a/src/AnalyzeComments/Analyzer/AnalyzerFactory.php b/src/AnalyzeComments/Analyzer/AnalyzerFactory.php
@@ -19,7 +19,6 @@
 {
     public function getAnalyzer(
         ConfigDTO $configDto,
-        OutputInterface $output,
         BaselineStorageInterface $baselineStorage,
     ): Analyzer {
         $commentFactory = new CommentFactory($configDto->getAllowedTypes());
@@ -37,7 +36,6 @@ public function getAnalyzer(
             $commentFactory,
             $missingDocBlock,
             $metrics,
-            $output,
             $missingDocBlock,
             $baselineStorage,
             new FilesystemAdapter(directory: $configDto->cacheDir),

diff --git a/src/AnalyzeComments/Commands/AnalyzeCommentCommand.php b/src/AnalyzeComments/Commands/AnalyzeCommentCommand.php
@@ -53,7 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
         $formatter = $formatters[$configDto->output->type] ?? $formatters['console'];
 
-        $analyzer = $this->analyzerFactory->getAnalyzer($configDto, $output, $this->storage);
+        $analyzer = $this->analyzerFactory->getAnalyzer($configDto, $this->storage);
 
         $report = $analyzer->analyze($files);
 

diff --git a/src/Baseline/Commands/BaselineCommand.php b/src/Baseline/Commands/BaselineCommand.php
@@ -41,7 +41,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $configDto = $this->configLoader->getConfigDto();
         $files = $this->getFilesFromDirectories($configDto->directories);
 
-        $analyzer = $this->analyzerFactory->getAnalyzer($configDto, $output, $this->storage);
+        $analyzer = $this->analyzerFactory->getAnalyzer($configDto, $this->storage);
         $report = $analyzer->analyze($files);
 
         $this->storage->setComments($report->comments); // todo create some baseline reporter