Merged master

floriankraemer · floriankraemer · commit be5c947d3dc5 · 2025-10-12T19:53:08.000+02:00
diff --git a/src/Business/Churn/Report/ReportGeneratorInterface.php b/src/Business/Churn/Report/ReportGeneratorInterface.php
@@ -4,9 +4,6 @@
 
 namespace Phauthentic\CognitiveCodeAnalysis\Business\Churn\Report;
 
-/**
- *
- */
 interface ReportGeneratorInterface
 {
     /**
diff --git a/src/Business/Cognitive/Report/CsvReport.php b/src/Business/Cognitive/Report/CsvReport.php
@@ -7,9 +7,6 @@
 use Phauthentic\CognitiveCodeAnalysis\Business\Cognitive\CognitiveMetricsCollection;
 use Phauthentic\CognitiveCodeAnalysis\CognitiveAnalysisException;
 
-/**
- *
- */
 class CsvReport implements ReportGeneratorInterface
 {
     /**
diff --git a/src/Business/Cognitive/Report/JsonReport.php b/src/Business/Cognitive/Report/JsonReport.php
@@ -7,9 +7,6 @@
 use Phauthentic\CognitiveCodeAnalysis\Business\Cognitive\CognitiveMetricsCollection;
 use Phauthentic\CognitiveCodeAnalysis\CognitiveAnalysisException;
 
-/**
- *
- */
 class JsonReport implements ReportGeneratorInterface
 {
     /**
diff --git a/src/Business/Cognitive/Report/ReportGeneratorInterface.php b/src/Business/Cognitive/Report/ReportGeneratorInterface.php
@@ -6,9 +6,6 @@
 
 use Phauthentic\CognitiveCodeAnalysis\Business\Cognitive\CognitiveMetricsCollection;
 
-/**
- *
- */
 interface ReportGeneratorInterface
 {
     public function export(CognitiveMetricsCollection $metrics, string $filename): void;
diff --git a/src/Command/CognitiveMetricsCommand.php b/src/Command/CognitiveMetricsCommand.php
@@ -185,15 +185,21 @@ protected function execute(InputInterface $input, OutputInterface $output): int
      * @param CognitiveMetricsCollection $metricsCollection
      * @throws Exception
      */
-    private function handleBaseLine(CognitiveMetricsCommandContext $context, CognitiveMetricsCollection $metricsCollection): void
-    {
-        if ($context->hasBaselineFile()) {
-            $baselineFile = $context->getBaselineFile();
-            if ($baselineFile !== null) {
-                $baseline = $this->baselineService->loadBaseline($baselineFile);
-                $this->baselineService->calculateDeltas($metricsCollection, $baseline);
-            }
+    private function handleBaseLine(
+        CognitiveMetricsCommandContext $context,
+        CognitiveMetricsCollection $metricsCollection
+    ): void {
+        if (!$context->hasBaselineFile()) {
+            return;
         }
+
+        $baselineFile = $context->getBaselineFile();
+        if ($baselineFile === null) {
+            return;
+        }
+
+        $baseline = $this->baselineService->loadBaseline($baselineFile);
+        $this->baselineService->calculateDeltas($metricsCollection, $baseline);
     }
 
     /**
diff --git a/src/Command/CognitiveMetricsSpecifications/CompositeCognitiveMetricsValidationSpecification.php b/src/Command/CognitiveMetricsSpecifications/CompositeCognitiveMetricsValidationSpecification.php
@@ -32,8 +32,9 @@ public function getErrorMessage(): string
         return 'Validation failed';
     }
 
-    public function getFirstFailedSpecification(CognitiveMetricsCommandContext $context): ?CognitiveMetricsCommandValidationSpecification
-    {
+    public function getFirstFailedSpecification(
+        CognitiveMetricsCommandContext $context
+    ): ?CognitiveMetricsCommandValidationSpecification {
         foreach ($this->specifications as $specification) {
             if (!$specification->isSatisfiedBy($context)) {
                 return $specification;
diff --git a/src/Command/CognitiveMetricsSpecifications/SortFieldValidSpecification.php b/src/Command/CognitiveMetricsSpecifications/SortFieldValidSpecification.php
@@ -4,8 +4,6 @@
 
 namespace Phauthentic\CognitiveCodeAnalysis\Command\CognitiveMetricsSpecifications;
 
-use Phauthentic\CognitiveCodeAnalysis\Business\Cognitive\CognitiveMetricsSorter;
-
 class SortFieldValidSpecification implements CognitiveMetricsCommandValidationSpecification
 {
     private const SORTABLE_FIELDS = [
diff --git a/src/Config/ConfigLoader.php b/src/Config/ConfigLoader.php
@@ -5,7 +5,6 @@
 namespace Phauthentic\CognitiveCodeAnalysis\Config;
 
 use Phauthentic\CognitiveCodeAnalysis\Business\Cognitive\MetricNames;
-use PhpBench\Benchmark\Metadata\Annotations\Subject;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
diff --git a/tests/Command/ChurnSpecifications/ChurnSpecificationPatternTest.php b/tests/Command/ChurnSpecifications/ChurnSpecificationPatternTest.php
@@ -4,7 +4,6 @@
 
 namespace Phauthentic\CognitiveCodeAnalysis\Tests\Command\ChurnSpecifications;
 
-use Phauthentic\CognitiveCodeAnalysis\Command\ChurnCommand;
 use Phauthentic\CognitiveCodeAnalysis\Command\ChurnSpecifications\ChurnCommandContext;
 use Phauthentic\CognitiveCodeAnalysis\Command\ChurnSpecifications\CoverageFormatExclusivitySpecification;
 use Phauthentic\CognitiveCodeAnalysis\Command\ChurnSpecifications\CoverageFileExistsSpecification;
diff --git a/tests/Command/CognitiveMetricsSpecifications/CognitiveMetricsSpecificationPatternTest.php b/tests/Command/CognitiveMetricsSpecifications/CognitiveMetricsSpecificationPatternTest.php
@@ -4,7 +4,6 @@
 
 namespace Phauthentic\CognitiveCodeAnalysis\Tests\Command\CognitiveMetricsSpecifications;
 
-use Phauthentic\CognitiveCodeAnalysis\Command\CognitiveMetricsCommand;
 use Phauthentic\CognitiveCodeAnalysis\Command\CognitiveMetricsSpecifications\CognitiveMetricsCommandContext;
 use Phauthentic\CognitiveCodeAnalysis\Command\CognitiveMetricsSpecifications\CoverageFormatExclusivitySpecification;
 use Phauthentic\CognitiveCodeAnalysis\Command\CognitiveMetricsSpecifications\CoverageFileExistsSpecification;
diff --git a/tests/Fixtures/CustomReporters/ConfigAwareChurnTextReporter.php b/tests/Fixtures/CustomReporters/ConfigAwareChurnTextReporter.php
@@ -44,9 +44,11 @@ private function generateReport(array $classes): string
 
         $totalMethods = 0;
         foreach ($classes as $classData) {
-            if (isset($classData['methods'])) {
-                $totalMethods += count($classData['methods']);
+            if (!isset($classData['methods'])) {
+                continue;
             }
+
+            $totalMethods += count($classData['methods']);
         }
         $output .= "Total Methods: " . $totalMethods . "\n\n";
 
diff --git a/tests/Fixtures/CustomReporters/ConfigAwareTextReporter.php b/tests/Fixtures/CustomReporters/ConfigAwareTextReporter.php
@@ -74,9 +74,11 @@ private function generateTextContent(CognitiveMetricsCollection $metrics): strin
             $totalMethods++;
             $totalScore += $metric->getScore();
 
-            if ($isAboveThreshold) {
-                $methodsAboveThreshold++;
+            if (!$isAboveThreshold) {
+                continue;
             }
+
+            $methodsAboveThreshold++;
         }
 
         $content .= "\n===============================================\n";
diff --git a/tests/Fixtures/CustomReporters/CustomChurnTextReporter.php b/tests/Fixtures/CustomReporters/CustomChurnTextReporter.php
@@ -33,9 +33,11 @@ private function generateReport(array $classes): string
 
         $totalMethods = 0;
         foreach ($classes as $classData) {
-            if (isset($classData['methods'])) {
-                $totalMethods += count($classData['methods']);
+            if (!isset($classData['methods'])) {
+                continue;
             }
+
+            $totalMethods += count($classData['methods']);
         }
         $output .= "Total Methods: " . $totalMethods . "\n\n";
 
diff --git a/tests/Unit/Business/Churn/Report/AbstractReporterTestCase.php b/tests/Unit/Business/Churn/Report/AbstractReporterTestCase.php
@@ -7,9 +7,6 @@
 use Phauthentic\CognitiveCodeAnalysis\Business\Utility\Datetime;
 use PHPUnit\Framework\TestCase;
 
-/**
- *
- */
 class AbstractReporterTestCase extends TestCase
 {
     protected string $filename;
diff --git a/tests/Unit/Business/Churn/Report/ChurnReporterFactoryCustomTest.php b/tests/Unit/Business/Churn/Report/ChurnReporterFactoryCustomTest.php
@@ -10,7 +10,6 @@
 use Phauthentic\CognitiveCodeAnalysis\CognitiveAnalysisException;
 use Phauthentic\CognitiveCodeAnalysis\Config\ConfigService;
 use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 use Phauthentic\CognitiveCodeAnalysis\Tests\Unit\Business\Churn\Report\TestCognitiveConfig;
diff --git a/tests/Unit/Business/Churn/Report/CsvExportTest.php b/tests/Unit/Business/Churn/Report/CsvExportTest.php
@@ -8,9 +8,6 @@
 use Phauthentic\CognitiveCodeAnalysis\CognitiveAnalysisException;
 use PHPUnit\Framework\Attributes\Test;
 
-/**
- *
- */
 class CsvExportTest extends AbstractReporterTestCase
 {
     protected function setUp(): void
diff --git a/tests/Unit/Business/Churn/Report/HtmlReporterTest.php b/tests/Unit/Business/Churn/Report/HtmlReporterTest.php
@@ -7,9 +7,6 @@
 use Phauthentic\CognitiveCodeAnalysis\Business\Churn\Report\CsvReport;
 use PHPUnit\Framework\Attributes\Test;
 
-/**
- *
- */
 class HtmlReporterTest extends AbstractReporterTestCase
 {
     protected function setUp(): void
diff --git a/tests/Unit/Business/Churn/Report/JsonReporterTest.php b/tests/Unit/Business/Churn/Report/JsonReporterTest.php
@@ -7,9 +7,6 @@
 use Phauthentic\CognitiveCodeAnalysis\Business\Churn\Report\JsonReport;
 use PHPUnit\Framework\Attributes\Test;
 
-/**
- *
- */
 class JsonReporterTest extends AbstractReporterTestCase
 {
     protected function setUp(): void
diff --git a/tests/Unit/Business/Churn/Report/MarkdownReporterTest.php b/tests/Unit/Business/Churn/Report/MarkdownReporterTest.php
@@ -7,9 +7,6 @@
 use Phauthentic\CognitiveCodeAnalysis\Business\Churn\Report\MarkdownReport;
 use PHPUnit\Framework\Attributes\Test;
 
-/**
- *
- */
 class MarkdownReporterTest extends AbstractReporterTestCase
 {
     protected function setUp(): void
diff --git a/tests/Unit/Business/Churn/Report/SvgTreemapReporterTest.php b/tests/Unit/Business/Churn/Report/SvgTreemapReporterTest.php
@@ -7,9 +7,6 @@
 use Phauthentic\CognitiveCodeAnalysis\Business\Churn\Report\SvgTreemapReport;
 use PHPUnit\Framework\Attributes\Test;
 
-/**
- *
- */
 class SvgTreemapReporterTest extends AbstractReporterTestCase
 {
     protected function setUp(): void
diff --git a/tests/Unit/Business/Cognitive/Report/CsvReporterTest.php b/tests/Unit/Business/Cognitive/Report/CsvReporterTest.php
@@ -11,9 +11,6 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
-/**
- *
- */
 class CsvReporterTest extends TestCase
 {
     private CsvReport $csvExporter;
diff --git a/tests/Unit/Business/Cognitive/Report/HtmlReporterTest.php b/tests/Unit/Business/Cognitive/Report/HtmlReporterTest.php
@@ -11,9 +11,6 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
-/**
- *
- */
 class HtmlReporterTest extends TestCase
 {
     private HtmlReport $csvExporter;
diff --git a/tests/Unit/Config/CustomExportersConfigTest.php b/tests/Unit/Config/CustomExportersConfigTest.php
@@ -165,12 +165,14 @@ public function testEmptyCustomExporters(): void
         $this->assertArrayHasKey('cognitive', $processedConfig);
 
         // customExporters might not be present if not provided
-        if (isset($processedConfig['cognitive']['customExporters'])) {
-            $this->assertArrayHasKey('cognitive', $processedConfig['cognitive']['customExporters']);
-            $this->assertArrayHasKey('churn', $processedConfig['cognitive']['customExporters']);
-            $this->assertEmpty($processedConfig['cognitive']['customExporters']['cognitive']);
-            $this->assertEmpty($processedConfig['cognitive']['customExporters']['churn']);
+        if (!isset($processedConfig['cognitive']['customExporters'])) {
+            return;
         }
+
+        $this->assertArrayHasKey('cognitive', $processedConfig['cognitive']['customExporters']);
+        $this->assertArrayHasKey('churn', $processedConfig['cognitive']['customExporters']);
+        $this->assertEmpty($processedConfig['cognitive']['customExporters']['cognitive']);
+        $this->assertEmpty($processedConfig['cognitive']['customExporters']['churn']);
     }
 
     #[Test]

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,6 @@`
`4`	`4`
`5`	`5`	`namespace Phauthentic\CognitiveCodeAnalysis\Business\Churn\Report;`
`6`	`6`
`7`		`-/**`
`8`		`- *`
`9`		`- */`
`10`	`7`	`interface ReportGeneratorInterface`
`11`	`8`	`{`
`12`	`9`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@`
`7`	`7`	`use Phauthentic\CognitiveCodeAnalysis\Business\Cognitive\CognitiveMetricsCollection;`
`8`	`8`	`use Phauthentic\CognitiveCodeAnalysis\CognitiveAnalysisException;`
`9`	`9`
`10`		`-/**`
`11`		`- *`
`12`		`- */`
`13`	`10`	`class CsvReport implements ReportGeneratorInterface`
`14`	`11`	`{`
`15`	`12`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,6 @@`
`6`	`6`
`7`	`7`	`use Phauthentic\CognitiveCodeAnalysis\Business\Cognitive\CognitiveMetricsCollection;`
`8`	`8`
`9`		`-/**`
`10`		`- *`
`11`		`- */`
`12`	`9`	`interface ReportGeneratorInterface`
`13`	`10`	`{`
`14`	`11`	`public function export(CognitiveMetricsCollection $metrics, string $filename): void;`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`
`5`	`5`	`namespace Phauthentic\CognitiveCodeAnalysis\Command\CognitiveMetricsSpecifications;`
`6`	`6`
`7`		`-use Phauthentic\CognitiveCodeAnalysis\Business\Cognitive\CognitiveMetricsSorter;`
`8`		`-`
`9`	`7`	`class SortFieldValidSpecification implements CognitiveMetricsCommandValidationSpecification`
`10`	`8`	`{`
`11`	`9`	`private const SORTABLE_FIELDS = [`